From 0673c9179b909b2ff77ac8495ad02ceef5326b25 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Tue, 3 Feb 2015 22:02:50 +0100 Subject: [PATCH 1/4] Git Merge Installers There are now two basic bat scripts in dmitool and mapmerge which painlessly inserts the necessary lines for the commit tools to work into .git/config. --- tools/dmitool/git_merge_installer.bat | 6 ++++++ tools/dmitool/merging.txt | 2 ++ tools/mapmerge/git_merge_installer.bat | 6 ++++++ tools/mapmerge/install.txt | 2 ++ 4 files changed, 16 insertions(+) create mode 100644 tools/dmitool/git_merge_installer.bat create mode 100644 tools/mapmerge/git_merge_installer.bat diff --git a/tools/dmitool/git_merge_installer.bat b/tools/dmitool/git_merge_installer.bat new file mode 100644 index 0000000000..18ab7c8026 --- /dev/null +++ b/tools/dmitool/git_merge_installer.bat @@ -0,0 +1,6 @@ +@echo off +set tab= +echo. >> ../../.git/config +echo [merge "merge-dmi"] >> ../../.git/config +echo %tab%name = iconfile merge driver >> ../../.git/config +echo %tab%driver = ./tools/dmitool/dmimerge.sh %%O %%A %%B >> ../../.git/config diff --git a/tools/dmitool/merging.txt b/tools/dmitool/merging.txt index a9e7776d9b..f4056aa8cf 100644 --- a/tools/dmitool/merging.txt +++ b/tools/dmitool/merging.txt @@ -8,5 +8,7 @@ The easiest way to do merging is to install the merge driver. For this, open `Ba name = iconfile merge driver driver = ./tools/dmitool/dmimerge.sh %O %A %B +You may optionally instead run git_merge_installer.bat which should automatically insert these lines for you at the appropriate location. + After this, merging DMI files should happen automagically unless there are conflicts (an icon_state that both you and someone else changed). If there are conflicts, you will unfortunately still be stuck with opening both versions in the editor, and manually resolving the issues with those states. \ No newline at end of file diff --git a/tools/mapmerge/git_merge_installer.bat b/tools/mapmerge/git_merge_installer.bat new file mode 100644 index 0000000000..59e3a803e9 --- /dev/null +++ b/tools/mapmerge/git_merge_installer.bat @@ -0,0 +1,6 @@ +@echo off +set tab= +echo. >> ../../.git/config +echo [merge "merge-dmm"] >> ../../.git/config +echo %tab%name = mapmerge driver >> ../../.git/config +echo %tab%driver = ./tools/mapmerge/mapmerge.sh %%O %%A %%B >> ../../.git/config diff --git a/tools/mapmerge/install.txt b/tools/mapmerge/install.txt index f9cbc4a022..9ff667f0b1 100644 --- a/tools/mapmerge/install.txt +++ b/tools/mapmerge/install.txt @@ -14,4 +14,6 @@ The easiest way to do merging is to install the merge driver. For this, open `Ba name = mapmerge driver driver = ./tools/mapmerge/mapmerge.sh %O %A %B +You may optionally instead run git_merge_installer.bat which should automatically insert these lines for you at the appropriate location. + After this, merging maps should happen automagically unless there are conflicts(a tile that both you and someone else changed). If there are conflicts, you will unfortunately still be stuck with opening both versions in a map editor, and manually resolving the issues. From f4435503cc00d65ebe0e0807370b536e8a3e6c07 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Wed, 4 Feb 2015 10:12:11 +0000 Subject: [PATCH 2/4] Linux versions of PsiOmegaDelta's git_merge_installer scripts --- tools/dmitool/git_merge_installer.sh | 6 ++++++ tools/dmitool/merging.txt | 4 ++-- tools/mapmerge/git_merge_installer.sh | 6 ++++++ tools/mapmerge/install.txt | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100755 tools/dmitool/git_merge_installer.sh create mode 100755 tools/mapmerge/git_merge_installer.sh diff --git a/tools/dmitool/git_merge_installer.sh b/tools/dmitool/git_merge_installer.sh new file mode 100755 index 0000000000..e0c48823b1 --- /dev/null +++ b/tools/dmitool/git_merge_installer.sh @@ -0,0 +1,6 @@ +F="../../.git/config" + +echo '' >> $F +echo '[merge "merge-dmi"]' >> $F +echo ' name = iconfile merge driver' >> $F +echo ' driver = ./tools/dmitool/dmimerge.sh %O %A %B' >> $F diff --git a/tools/dmitool/merging.txt b/tools/dmitool/merging.txt index f4056aa8cf..639a634bfb 100644 --- a/tools/dmitool/merging.txt +++ b/tools/dmitool/merging.txt @@ -8,7 +8,7 @@ The easiest way to do merging is to install the merge driver. For this, open `Ba name = iconfile merge driver driver = ./tools/dmitool/dmimerge.sh %O %A %B -You may optionally instead run git_merge_installer.bat which should automatically insert these lines for you at the appropriate location. +You may optionally instead run git_merge_installer.bat or git_merge_installer.sh which should automatically insert these lines for you at the appropriate location. After this, merging DMI files should happen automagically unless there are conflicts (an icon_state that both you and someone else changed). -If there are conflicts, you will unfortunately still be stuck with opening both versions in the editor, and manually resolving the issues with those states. \ No newline at end of file +If there are conflicts, you will unfortunately still be stuck with opening both versions in the editor, and manually resolving the issues with those states. diff --git a/tools/mapmerge/git_merge_installer.sh b/tools/mapmerge/git_merge_installer.sh new file mode 100755 index 0000000000..c6d70bc0c9 --- /dev/null +++ b/tools/mapmerge/git_merge_installer.sh @@ -0,0 +1,6 @@ +F="../../.git/config" + +echo '' >> $F +echo '[merge "merge-dmm"]' >> $F +echo ' name = mapmerge driver' >> $F +echo ' driver = ./tools/mapmerge/mapmerge.sh %O %A %B' >> $F diff --git a/tools/mapmerge/install.txt b/tools/mapmerge/install.txt index 9ff667f0b1..943b195b5e 100644 --- a/tools/mapmerge/install.txt +++ b/tools/mapmerge/install.txt @@ -14,6 +14,6 @@ The easiest way to do merging is to install the merge driver. For this, open `Ba name = mapmerge driver driver = ./tools/mapmerge/mapmerge.sh %O %A %B -You may optionally instead run git_merge_installer.bat which should automatically insert these lines for you at the appropriate location. +You may optionally instead run git_merge_installer.bat or git_merge_installer.sh which should automatically insert these lines for you at the appropriate location. After this, merging maps should happen automagically unless there are conflicts(a tile that both you and someone else changed). If there are conflicts, you will unfortunately still be stuck with opening both versions in a map editor, and manually resolving the issues. From 952fd3a373547b769837da8bf9418aeef769b5b1 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Wed, 4 Feb 2015 05:30:56 -0700 Subject: [PATCH 3/4] Fixes supersonic walking with canes. --- code/modules/mob/living/carbon/human/human_movement.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 546ec3ba83..baeffc7948 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -55,7 +55,7 @@ if (bodytemperature < 283.222) tally += (283.222 - bodytemperature) / 10 * 1.75 - tally += 2*stance_damage //damaged/missing feet or legs is slow + tally += min(2 * stance_damage, 0) //damaged/missing feet or legs is slow if(mRun in mutations) tally = 0 From d5c8a6262af9d0b2a434a204ca11648721d90435 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Wed, 4 Feb 2015 10:33:39 -0700 Subject: [PATCH 4/4] Fixes the fix for supersonic walking. --- code/modules/mob/living/carbon/human/human_movement.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index baeffc7948..256fb11138 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -55,7 +55,7 @@ if (bodytemperature < 283.222) tally += (283.222 - bodytemperature) / 10 * 1.75 - tally += min(2 * stance_damage, 0) //damaged/missing feet or legs is slow + tally += max(2 * stance_damage, 0) //damaged/missing feet or legs is slow if(mRun in mutations) tally = 0