Changesets: DarkRadiant
|
vcs 4b9275ef 18.07.2021 14:56 Details Diff |
0005662: Committing is working now |
Affected Issues 0005662 |
|
| mod - plugins/vcs/Commit.h | Diff File | ||
| add - plugins/vcs/Index.cpp | Diff File | ||
| mod - plugins/vcs/Index.h | Diff File | ||
| mod - plugins/vcs/Repository.cpp | Diff File | ||
| mod - plugins/vcs/Tree.h | Diff File | ||
| mod - plugins/vcs/ui/CommitDialog.h | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
| mod - tools/msvc/vcs.vcxproj | Diff File | ||
| mod - tools/msvc/vcs.vcxproj.filters | Diff File | ||
|
vcs 7dfe9e22 18.07.2021 12:28 Details Diff |
0005662: Fill in the user name and email from git's config store |
Affected Issues 0005662 |
|
| mod - plugins/vcs/Repository.cpp | Diff File | ||
| mod - plugins/vcs/Repository.h | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
|
vcs 64bedf46 18.07.2021 12:20 Details Diff |
0005662: Add non-functional commit dialog |
Affected Issues 0005662 |
|
| add - install/ui/vcscommitdialog.fbp | Diff File | ||
| add - install/ui/vcscommitdialog.xrc | Diff File | ||
| add - plugins/vcs/CommitMetadata.h | Diff File | ||
| mod - plugins/vcs/Repository.cpp | Diff File | ||
| mod - plugins/vcs/Repository.h | Diff File | ||
| add - plugins/vcs/ui/CommitDialog.h | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.h | Diff File | ||
| mod - tools/msvc/vcs.vcxproj | Diff File | ||
| mod - tools/msvc/vcs.vcxproj.filters | Diff File | ||
|
vcs 201fdbf1 18.07.2021 07:43 Details Diff |
0005662: More regular status updates |
Affected Issues 0005662 |
|
| mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.h | Diff File | ||
|
vcs 5ac648b4 18.07.2021 04:43 Details Diff |
0005662: Detect whether a merge is already in progress |
Affected Issues 0005662 |
|
| mod - plugins/vcs/Algorithm.h | Diff File | ||
| mod - plugins/vcs/Repository.cpp | Diff File | ||
| mod - plugins/vcs/Repository.h | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.h | Diff File | ||
|
vcs a7664797 18.07.2021 04:21 Details Diff |
0005662: Display the VCS revision in the merge dialog |
Affected Issues 0005662 |
|
| mod - include/imapmerge.h | Diff File | ||
| mod - libs/scene/merge/MergeOperation.cpp | Diff File | ||
| mod - libs/scene/merge/MergeOperation.h | Diff File | ||
| mod - libs/scene/merge/ThreeWayMergeOperation.cpp | Diff File | ||
| mod - libs/scene/merge/ThreeWayMergeOperation.h | Diff File | ||
| mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
| mod - radiantcore/map/VcsMapResource.cpp | Diff File | ||
| mod - radiantcore/map/VcsMapResource.h | Diff File | ||
|
vcs 5dacca81 18.07.2021 03:29 Details Diff |
0005662: Show the merge dialog once the map switches to merge mode |
Affected Issues 0005662 |
|
| mod - radiant/ui/UserInterfaceModule.cpp | Diff File | ||
| mod - radiant/ui/UserInterfaceModule.h | Diff File | ||
| mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
| mod - radiant/ui/merge/MergeControlDialog.h | Diff File | ||
|
vcs 190209d7 18.07.2021 03:16 Details Diff |
0005662: EntityInspector needs to release any strong references to merge actions to not crash after aboorting the merge |
Affected Issues 0005662 |
|
| mod - radiant/ui/einspector/EntityInspector.cpp | Diff File | ||
| mod - radiant/ui/einspector/EntityInspector.h | Diff File | ||
|
vcs a00a3476 17.07.2021 18:55 Details Diff |
0005662: Implementation fixup, VCS loading now working |
Affected Issues 0005662 |
|
| mod - plugins/vcs/Repository.cpp | Diff File | ||
| mod - plugins/vcs/Tree.h | Diff File | ||
|
vcs f7b9da19 17.07.2021 18:29 Details Diff |
0005662: First implementation of loading maps from VCS |
Affected Issues 0005662 |
|
| mod - include/iversioncontrol.h | Diff File | ||
| add - libs/VcsMapResourceStream.h | Diff File | ||
| mod - libs/VersionControlLib.h | Diff File | ||
| mod - libs/stream/BufferInputStream.h | Diff File | ||
| add - libs/stream/VcsMapResourceStream.h | Diff File | ||
| mod - plugins/vcs/Algorithm.h | Diff File | ||
| add - plugins/vcs/GitArchiveTextFile.h | Diff File | ||
| mod - plugins/vcs/GitModule.cpp | Diff File | ||
| mod - plugins/vcs/GitModule.h | Diff File | ||
| mod - plugins/vcs/Repository.cpp | Diff File | ||
| mod - plugins/vcs/Repository.h | Diff File | ||
| mod - plugins/vcs/Tree.h | Diff File | ||
| mod - radiantcore/map/Map.cpp | Diff File | ||
| mod - radiantcore/map/VcsMapResource.cpp | Diff File | ||
| mod - radiantcore/map/VcsMapResource.h | Diff File | ||
| mod - tools/msvc/libs.vcxproj | Diff File | ||
| mod - tools/msvc/libs.vcxproj.filters | Diff File | ||
| mod - tools/msvc/vcs.vcxproj | Diff File | ||
| mod - tools/msvc/vcs.vcxproj.filters | Diff File | ||
|
vcs e21e2f11 17.07.2021 16:57 Details Diff |
0005662: More infrastructure code to request files from VCS |
Affected Issues 0005662 |
|
| mod - libs/VersionControlLib.h | Diff File | ||
| mod - radiantcore/map/VcsMapResource.cpp | Diff File | ||
| mod - radiantcore/map/VcsMapResource.h | Diff File | ||
|
vcs 2b2f5a13 17.07.2021 16:44 Details Diff |
0005662: Scaffolding code to be able to load maps from VCS |
Affected Issues 0005662 |
|
| add - libs/VersionControlLib.h | Diff File | ||
| mod - radiantcore/CMakeLists.txt | Diff File | ||
| mod - radiantcore/map/MapResourceManager.cpp | Diff File | ||
| add - radiantcore/map/VcsMapResource.cpp | Diff File | ||
| add - radiantcore/map/VcsMapResource.h | Diff File | ||
| mod - tools/msvc/DarkRadiantCore.vcxproj | Diff File | ||
| mod - tools/msvc/DarkRadiantCore.vcxproj.filters | Diff File | ||
| mod - tools/msvc/libs.vcxproj | Diff File | ||
| mod - tools/msvc/libs.vcxproj.filters | Diff File | ||
|
vcs 8ae868e4 17.07.2021 16:27 Details Diff |
0005662: Start merge operation in case the map needs to be resolved |
Affected Issues 0005662 |
|
| mod - plugins/vcs/Algorithm.h | Diff File | ||
| mod - plugins/vcs/Commit.h | Diff File | ||
| mod - plugins/vcs/Reference.h | Diff File | ||
|
vcs ae463f25 17.07.2021 16:07 Details Diff |
0005662: Register the git module at startup |
Affected Issues 0005662 |
|
| mod - plugins/vcs/GitModule.cpp | Diff File | ||
| mod - plugins/vcs/GitModule.h | Diff File | ||
|
vcs 877b1a88 17.07.2021 15:17 Details Diff |
0005662: Add global version control interfaces |
Affected Issues 0005662 |
|
| mod - include/imodule.h | Diff File | ||
| add - include/iversioncontrol.h | Diff File | ||
| mod - radiantcore/CMakeLists.txt | Diff File | ||
| add - radiantcore/versioncontrol/VersionControlManager.cpp | Diff File | ||
| add - radiantcore/versioncontrol/VersionControlManager.h | Diff File | ||
| mod - tools/msvc/DarkRadiantCore.vcxproj | Diff File | ||
| mod - tools/msvc/DarkRadiantCore.vcxproj.filters | Diff File | ||
| mod - tools/msvc/include.vcxproj | Diff File | ||
|
vcs b346c5af 17.07.2021 14:49 Details Diff |
0005662: Add Index wrapper class |
Affected Issues 0005662 |
|
| mod - plugins/vcs/Algorithm.h | Diff File | ||
| mod - plugins/vcs/Commit.h | Diff File | ||
| add - plugins/vcs/Index.h | Diff File | ||
| mod - plugins/vcs/Repository.cpp | Diff File | ||
| mod - plugins/vcs/Repository.h | Diff File | ||
| mod - tools/msvc/vcs.vcxproj | Diff File | ||
| mod - tools/msvc/vcs.vcxproj.filters | Diff File | ||
|
vcs 496cbe95 17.07.2021 09:03 Details Diff |
0005662: Implement fast-forward to upstream. |
Affected Issues 0005662 |
|
| mod - plugins/vcs/Algorithm.h | Diff File | ||
| mod - plugins/vcs/Reference.h | Diff File | ||
| mod - plugins/vcs/Repository.cpp | Diff File | ||
| mod - plugins/vcs/Repository.h | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
|
vcs f51e893a 16.07.2021 17:31 Details Diff |
0005662: Add push algorithm |
Affected Issues 0005662 |
|
| mod - plugins/vcs/Algorithm.h | Diff File | ||
| mod - plugins/vcs/GitModule.cpp | Diff File | ||
| mod - plugins/vcs/Remote.h | Diff File | ||
| mod - plugins/vcs/Repository.cpp | Diff File | ||
| mod - plugins/vcs/Repository.h | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.h | Diff File | ||
|
vcs 4121212a 16.07.2021 11:16 Details Diff |
0005662: More pre-merge analysis |
Affected Issues 0005662 |
|
| mod - plugins/vcs/Algorithm.h | Diff File | ||
| mod - plugins/vcs/Repository.cpp | Diff File | ||
| mod - plugins/vcs/Repository.h | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.h | Diff File | ||
|
vcs abdb29e8 16.07.2021 04:34 Details Diff |
0005662: Refactoring to move algorithm out of UI classes |
Affected Issues 0005662 |
|
| add - plugins/vcs/Algorithm.h | Diff File | ||
| mod - plugins/vcs/Repository.cpp | Diff File | ||
| mod - plugins/vcs/Repository.h | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.h | Diff File | ||
| mod - tools/msvc/vcs.vcxproj | Diff File | ||
| mod - tools/msvc/vcs.vcxproj.filters | Diff File | ||
|
vcs 28c77f8d 15.07.2021 17:43 Details Diff |
0005662: Add fly-out menu |
Affected Issues 0005662 |
|
| mod - install/ui/vcsstatusbar.fbp | Diff File | ||
| mod - install/ui/vcsstatusbar.xrc | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.h | Diff File | ||
|
vcs 244b1eba 15.07.2021 17:28 Details Diff |
0005662: Add some icons, and show commit count to be synced |
Affected Issues 0005662 |
|
| add - install/bitmaps/incoming_commits.png | Diff File | ||
| add - install/bitmaps/outgoing_commits.png | Diff File | ||
| mod - install/ui/vcsstatusbar.fbp | Diff File | ||
| mod - install/ui/vcsstatusbar.xrc | Diff File | ||
| mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
|
master 50d683d6 14.07.2021 19:55 Details Diff |
Brightness adjustment now supports undo Start an undo command when the drag begins, and finish it when the mouse is released (i.e. at the same time the colour picker is updated). This avoids flooding the undo queue with lots of useless tiny adjustment commands. The incremental drag event is now wxEVT_SCROLL_THUMBTRACK, since an extra wxEVT_SLIDER is emitted *after* the final wxEVT_SCROLL_CHANGED event, resulting in a spurious new undo command being initiated which in turn prevents the previous command from being undone. |
||
| mod - radiant/ui/lightinspector/LightInspector.cpp | Diff File | ||
| mod - radiant/ui/lightinspector/LightInspector.h | Diff File | ||
|
master 39efc2ec 14.07.2021 19:14 Details Diff |
Add slight non-linearity to the brightness slider Use a gentle power law (exponent 1.25) to give slightly more slider control over the darker colours without being too confusing. This maps the 25% position to around 18%, 50% to 42% and 75% to 70%. |
||
| mod - radiant/ui/lightinspector/LightInspector.cpp | Diff File | ||
|
master c0d54c7c 13.07.2021 19:31 Details Diff |
Adjust brightness of all lights in correct proportion Instead of setting each light to the brightness defined by the current slider position (which causes dim lights to jump in brightness when selected along with a bright light), modify each light's starting colour in proportion to the adjustment delta. This means that dimming two or more lights together gives the expected result, even if some of them are much brighter than others. |
||
| mod - radiant/ui/lightinspector/LightInspector.cpp | Diff File | ||