e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
bd3b4c5d81
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-19 21:37:05 +02:00
de9e68cdcd
Merge pull request #11151 from Baystation12/master
...
Dev-freeze
2015-09-19 21:25:15 +02:00
924359d858
Backports map merge fix.
2015-09-19 09:30:08 +02:00
0c56bdd448
Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
...
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
a9dda6cf3f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
...
Conflicts:
.travis.yml
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/ninja/ninja.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/wizard.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/objects/structures/lattice.dm
code/global.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/reagents/Chemistry-Recipes.dm
config/example/config.txt
polaris.dme
2015-09-06 18:26:06 -04:00
c246dece15
Fixes Mapmerge
...
- Changes mapmerge in a way GinjaNinja32 recommended in PR #10899
2015-09-01 03:00:58 +02:00
77d0bbd643
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/gamemodes/changeling/modularchangling.dm
2015-08-13 08:09:28 +02:00
d911badae8
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge
...
Conflicts:
.travis.yml
polaris.dme
2015-08-07 20:25:57 -04:00
03578d4ea3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-06 08:12:38 +02:00
76656a0cf1
Recompile dmitool.jar under Java 7 instead of Java 8
2015-08-05 21:39:59 +01:00
688b8b52f7
Makes it possible to define multiple tag pairs to check for.
2015-07-27 09:32:25 +02:00
1401608553
Steals from KP instead of /tg/. Map merge will now clean all maps.
2015-07-21 09:37:48 -04:00
85cb9c92a0
Makes map merger clean colony maps. Band-aid fix for now.
2015-07-21 09:27:45 -04:00
772488fadc
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/setup.dm
maps/exodus-1.dmm
maps/exodus-5.dmm
2015-06-17 09:33:34 +02:00
641df4a530
Use of invalid prefixes in changelogs no longer silently fail in Travis.
2015-06-16 11:25:56 +02:00
06a1ece4b8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/ZAS/Controller.dm
code/datums/mind.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
90c71d00f1
Travis span matcher script
...
A slightly overkill script to ensure each file contains as many opening span tags as closing.
Almost implemented to allow checking multiple pairs of tags.
2015-06-14 17:37:35 +02:00
0527e4b05f
Adds dmitool import iconstate splicing
...
Adds the ability to splice in specific directions and/or frames when
importing icon states with dmitool.
2015-06-13 12:19:42 -04:00
1cbfff09d7
Adds python wrapper for dmitool
2015-06-12 00:06:58 -04:00
c38d88c06a
Updates dmitool to be able to insert specific directions
...
Adds a direction option to the import command, that causes the imported
icon state is overwrites the specified direction, if nodup is set.
Otherwise, the direction is overwritten on a copy.
2015-06-12 00:01:41 -04:00
864d18caff
Updates the list of valid log prefixes.
2015-06-01 10:12:24 +02:00
c46578c810
AddToChangelog removal.
...
Removes the source for the old changelog tool.
2015-05-25 20:35:08 +02:00
a1ff266981
Updates the event probability sheet with the new events.
2015-05-10 10:58:46 +02:00
3edfbf0040
Moves us to the changelog system used by /vg/, /tg/, and others.
...
Cleans up the HTLM folder, removing unused files.
Will also attempt include /tg/'s "You have unread changelog entries" notification on join.
2015-04-18 13:00:28 +02:00
93ac826f02
Adds more events, misc event changes.
...
Only two more this time:
Random space dust attack.
Random gravity failure.
Moves space vines from moderate to major events, due to its now more dangerous nature.
Removes now irrelevant alien/ninja customized event handlers.
Adds Excel sheet for aiding in event probability calculations.
2015-03-31 13:07:27 +02:00
3ddd0b480f
Merge pull request #8061 from Baystation12/master
...
master -> wiz
2015-02-06 10:41:12 +03:00
f4435503cc
Linux versions of PsiOmegaDelta's git_merge_installer scripts
2015-02-04 10:12:11 +00:00
0673c9179b
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.
2015-02-03 22:02:50 +01:00
aeff099189
Fixes compiled jar being compiled under Java 8
2015-02-03 14:50:39 +00:00
704d668b18
Merge pull request #7732 from GinjaNinja32/dmitool
...
[dmitool] Add importing PNG files as icon_states
2015-01-09 06:41:38 +10:30
cb11a95aa7
Fix clean_map_git.sh
2015-01-07 20:22:55 +00:00
73da1156a2
Various improvements; options, version, info
...
Adds options to PNG importing so that any valid DMI file can be entirely built from PNG files and DMITool.
Adds version string and "version" command
Adds info command to get a list of states easily (the only way previously was to print the descriptor with "dmitool -vvvv verify $file" and parse with e.g. grep/sed)
2015-01-07 17:26:21 +00:00
c49f0f2f89
Add importing PNG files as icon_states
2014-12-02 23:32:05 +00:00
b7032cafca
Update help text, guard against illegal values
2014-11-30 20:15:43 +00:00
9018892947
Update DMI state extraction
2014-11-30 20:05:10 +00:00
6adc68bbd1
Merge pull request #7145 from GinjaNinja32/dmitool
...
DMI tool thingy. Is able to do many things with DMI files.
2014-11-29 09:48:47 +01:00
627626c49d
Automatic DMI merge stuff
2014-11-26 21:28:40 +00:00
a17cb4c7d2
Slightly more sensible defaults for diff output with +q
2014-11-26 20:58:30 +00:00
d9a6b5ad11
DMI tool initial commit
2014-11-26 20:32:24 +00:00
e4127843a6
Z-level split.
...
Splits each individual Z-level into its own map file.
2014-11-24 12:40:12 +01:00
f3091cb215
Updated changelog
2014-07-26 17:52:16 -07:00
281a26b979
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2014-07-18 13:08:12 +00:00
d992c1ee27
updates MapPatcher.jar to use JRE8
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-06-29 01:09:37 +10:00
7a4d0f873d
Fixes #5149
...
also fixes clean_map_git.sh (mloooc)
2014-06-16 10:35:54 +01:00
3450a137d2
tools: fix EOL handling in AddToChangelog.exe
...
AddToChangelog.exe was using a mix of \r\n and \n EOLs.
Fully uses \r\n now.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-12 18:43:48 +01:00
6db1484a80
tools: update MapPatcher.jar, add mapclean helper
...
MapPatcher.jar can now take a user-defined tile line when conflicted.
Added a clean_map_git.sh file that will automatically clean maps
without needing a prepare_map.bat call beforehand. Needs to be run in
git bash, or have .sh associated with something that has git.
Fixed line endings in install.txt to show up right in notepad.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-15 22:00:24 +01:00
073059e0dc
tools: adding the patched/fixed MapPatcher.jar
...
Allows for easier map conflict resolution.
Prompts the user for confirmation on a tile conflict instead of dying.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-07 17:33:05 +01:00
db5e155511
GAH WHICH ONE GOES FIRST
2014-04-22 17:42:27 -04:00
ab982ffd04
FORGOT TO INCLUDE DME, WHOOP DE DOO.
2013-11-03 22:24:47 -08:00
Neerti