Changesets: DarkRadiant
vcs b7bcbb85 26.07.2021 05:26 Details Diff |
0005662: Adjust vcs build settings to correspond to the changes done to the winbuild repository |
Affected Issues 0005662 |
|
mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
mod - tools/msvc/DarkRadiant.sln | Diff File | ||
mod - tools/msvc/post_build_event_x64.cmd | Diff File | ||
mod - tools/msvc/properties/libgit2.props | Diff File | ||
master b099c7d1 25.07.2021 17:43 Details Diff |
Skip specular term for ambient lights | ||
mod - install/gl/interaction_fp.glsl | Diff File | ||
master 31d1c025 22.07.2021 19:22 Details Diff |
Initial implementation of single-axis texture fitting If the button is toggled, a value of -1 will be passed to the implementing code, indicating that a particular axis should not be fitted. Currently the result isn't quite correct: rather than preserving aspect ratio, it is preserving the *current* texture transformation for the non-fitted axis (i.e. it doesn't touch the shift/scale values for the non-fitted axis at all). |
Affected Issues 0005684 |
|
mod - radiant/ui/surfaceinspector/SurfaceInspector.cpp | Diff File | ||
mod - radiant/ui/surfaceinspector/SurfaceInspector.h | Diff File | ||
mod - radiantcore/brush/TextureProjection.cpp | Diff File | ||
vcs eea0c0b0 22.07.2021 17:00 Details Diff |
0005662: Implement git reset --hard when aborting a merge. |
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 | ||
master 996d02d6 21.07.2021 19:04 Details Diff |
Initial "Preserve aspect" toggle button in Surface Inspector The aim of this button is to allow the Fit Texture function to operate on a single axis, while adjusting the other axis to preserve the texture aspect ratio. This will be useful for certain textures like wooden planks which only need an integer number of images on one axis. Currently the button toggles and has an icon, but does not affect the texture fitting behaviour. |
Affected Issues 0005684 |
|
add - install/bitmaps/preserveAspect.png | Diff File | ||
mod - radiant/ui/surfaceinspector/SurfaceInspector.cpp | Diff File | ||
mod - radiant/ui/surfaceinspector/SurfaceInspector.h | Diff File | ||
vcs dbe535ee 21.07.2021 18:31 Details Diff |
0005662: UI tweaks |
Affected Issues 0005662 |
|
mod - install/ui/vcsstatusbar.fbp | Diff File | ||
mod - install/ui/vcsstatusbar.xrc | Diff File | ||
mod - plugins/vcs/Algorithm.h | Diff File | ||
mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
vcs aba24b63 21.07.2021 17:24 Details Diff |
0005662: Creating merge commits is working now |
Affected Issues 0005662 |
|
mod - libs/gamelib.h | Diff File | ||
mod - plugins/vcs/Algorithm.h | Diff File | ||
mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
mod - radiantcore/map/ArchivedMapResource.cpp | Diff File | ||
mod - radiantcore/map/MapResource.cpp | Diff File | ||
mod - radiantcore/map/MapResource.h | Diff File | ||
mod - radiantcore/map/VcsMapResource.cpp | Diff File | ||
mod - tools/msvc/vcs.vcxproj | Diff File | ||
vcs 81c28355 21.07.2021 16:54 Details Diff |
0005662: Work on completing the merge operation and creating the merge commit. This is not quite working yet. |
Affected Issues 0005662 |
|
mod - plugins/vcs/Algorithm.h | Diff File | ||
mod - plugins/vcs/Index.cpp | Diff File | ||
mod - plugins/vcs/Index.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 d291a24b 21.07.2021 14:14 Details Diff |
0005662: Introduce new map events to know when the user is done merging |
Affected Issues 0005662 |
|
mod - include/imap.h | Diff File | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
master 743ea1a7 20.07.2021 20:23 Details Diff |
Fit Texture spinboxes apply changes immediately Save a few clicks when experimenting with different fit values by updating the surface every time the value changes, rather than requiring a separate click on the Fit button. |
Affected Issues 0005684 |
|
mod - radiant/ui/surfaceinspector/SurfaceInspector.cpp | Diff File | ||
mod - radiant/ui/surfaceinspector/SurfaceInspector.h | Diff File | ||
master deaa9ae3 20.07.2021 20:04 Details Diff |
Increase size of Fit Texture spinboxes in SurfaceInspector The minimum size of 8 times the character width is too small on GTK, since the spin buttons are apparently included in the size allocation. This was resulting in the boxes appearing as small text entries with no spin buttons available. Unlike with wxTextCtrl, setting no minimum size results in a spin box which is too large on GTK, so instead the fixed minimum size is simply doubled from its previous value. |
Affected Issues 0005684 |
|
mod - radiant/ui/surfaceinspector/SurfaceInspector.cpp | Diff File | ||
mod - radiant/ui/surfaceinspector/SurfaceInspector.h | Diff File | ||
master bf7c71c0 20.07.2021 19:47 Details Diff |
Unsquash SurfaceInspector step size entry boxes Step size boxes are too small on GTK, and the "0.05" default value is not fully visible. Instead of guessing at pixel sizes, the explicit minimum size is removed altogether. Hopefully this does not lead to an unreasonable default size on Windows. |
Affected Issues 0005684 |
|
mod - radiant/ui/surfaceinspector/SurfaceInspector.cpp | Diff File | ||
master bd408179 20.07.2021 19:41 Details Diff |
Improve treeView16.png visibility in dark themes Switch from grey/black theme to mid/dark orange, which shows up in both light and dark themes (assuming the user isn't using a bright orange theme). |
||
mod - install/bitmaps/treeView16.png | Diff File | ||
master 8d351342 20.07.2021 19:15 Details Diff |
Remove trailing decimals from Surface Inspector text boxes For some reason the std::to_string standard library function converts floating point values into something like fixed-precision, with multiple trailing zeroes. This makes the displayed values in the Surface Inspector difficult to read. The new code is using the fmt::format function which produces more readable output similar to what std::cout would produce. |
||
mod - radiant/ui/surfaceinspector/SurfaceInspector.cpp | Diff File | ||
mod - radiant/ui/surfaceinspector/SurfaceInspector.h | Diff File | ||
vcs e635e6d6 18.07.2021 19:15 Details Diff |
0005662: Fix crash during shutdown due to queued DispatchEvents that cannot be freed if their std::function targets reside in memory of unloaded modules |
Affected Issues 0005662 |
|
mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
mod - radiant/RadiantApp.cpp | Diff File | ||
vcs a6222a2c 18.07.2021 18:51 Details Diff |
0005662: Use Index::updateAll before committing, which should correspond to git add -u |
Affected Issues 0005662 |
|
mod - plugins/vcs/Algorithm.h | Diff File | ||
mod - plugins/vcs/Index.cpp | Diff File | ||
mod - plugins/vcs/Index.h | Diff File | ||
mod - plugins/vcs/Repository.cpp | Diff File | ||
mod - plugins/vcs/ui/VcsStatus.cpp | Diff File | ||
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 |