Commit Graph

104 Commits

Author SHA1 Message Date
xxalpha fa9dba4e67 Fixed bug that caused duplicate entries. Reduced line changes.
clean
2016-03-05 18:50:40 +00:00
xxalpha e2aca9914b Two batch files to run map merge. Fixed output error when in non-tgm mode. 2016-03-01 23:42:44 +00:00
xxalpha f0c1389787 Fixed mapmerger not using index 0 from map list. 2016-02-27 06:23:25 +00:00
xxalpha be29040b96 parser will now ignore preceding whitespace in var blocks; removed unused
file

penis
2016-02-26 01:06:34 +00:00
xxalpha 1d01666ec7 Added new format function; patched parser to read new format 2016-02-24 04:23:20 +00:00
xxalpha c648d31039 Rewrote parser; added functions for writing in tgm and inflated format. 2016-02-24 00:27:27 +00:00
xxalpha 53735f3343 Improved search_data() speed. 2016-02-22 17:24:10 +00:00
xxalpha 00323d64d1 pythony 2016-02-22 16:52:14 +00:00
xxalpha 1ca98ff016 Fixed bad loop. merge_map() will now find sequence gaps and fill them.. 2016-02-18 17:04:50 +00:00
xxalpha 7883832706 Separated wrapper from map processing functions. 2016-02-17 17:29:27 +00:00
xxalpha 3082d3107d Fixed merging multiple maps causing index error. 2016-02-15 20:16:20 +00:00
xxalpha 02c382bf30 New map merging tool. 2016-02-15 18:36:59 +00:00
Firecage 7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Kyle Spier-Swenson c9e2860777 Fixes github webhook not working on apache 2016-01-19 10:47:41 -08:00
Firecage 754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
Kyle Spier-Swenson 9b8abaee4e Adds pr announcer/changelog generator github webhook script to tools folder. 2016-01-03 11:08:30 -08:00
Tkdrg 553ce69257 Adds the dmitool icon merger from baystation12
Credits to GinjaNinja32@bay12 for developing dmitool and
PsiOmegaDelta@bay12 for some of these scripts. Thanks also to
neersighted for reminding me that we need this.

Basically this is like the map merger, except for icons. You can install
a hook using the instructions in the dmitool folder, and it should
automatically merge your DMIs for you. This means you can solve icon
conflicts effortlessly most of the time.
2015-11-28 03:47:26 -03:00
Razharas c525635c38 Merge pull request #12446 from duncathan/patch-1
makes the condensed hard del logs less spammy
2015-11-07 06:14:10 +03:00
Remie Richards d511984471 Adds a tool, ColonCatcher.py that locates all Colons that are used to avoid typesafety (A:B) or are used in the ternary operator (prob(50) ? "A" : "B") 2015-10-25 00:31:07 +01:00
duncathan 9e8fa0fd7f makes the condensed hard del logs less spammy 2015-10-16 15:09:53 -06:00
Razharas ca0df28f9a Merge pull request #12287 from Jordie0608/equalityforalldmmfiles
Prepare Maps.bat for entire _maps directory
2015-10-12 12:19:04 +03:00
Jordie 5282d88557 changed to use _maps directory 2015-10-10 17:51:12 +11:00
Razharas 0ad7257a52 Merge pull request #12089 from MrStonedOne/maprotation
HOLY FUCKING SHIT, I'VE DONE IT! Map rotation!
2015-10-07 07:53:42 +03:00
MrStonedOne ef4321c62b Fixes added spam in server-tools's copyfromgit.bat 2015-10-06 21:26:53 -07:00
MrStonedOne f83d5c92b8 Fixes typo in batch file. if exists -> if exist 2015-10-06 21:25:04 -07:00
MrStonedOne e27e9e8371 Map rotation fixes:
Fixes mutiple rotate operations from breaking the server, map rotation will properly detect rotation operations as well as update operations and abort.
Fixes max pop being treated as minpop
Adds more feedback to admin verbs.
2015-10-06 21:12:00 -07:00
duncathan 4cacbf216b recompiles RuntimeCondenser.exe 2015-10-06 17:24:53 -06:00
duncathan 983132b61f adds sorting (descending by failures); fixes output 2015-10-05 20:12:05 -06:00
duncathan e2ed83b6a5 adds the del() log to world.log at roundend and allows the runtime condenser to parse and condense it 2015-10-05 18:52:44 -06:00
Razharas 16c8eac8e3 Merge pull request #11826 from optimumtact/cleanuptools
Remove three unused tools
2015-10-01 23:24:04 +03:00
MrStonedOne 9741f1d223 Fixed maprotate batch script having wrong exit codes 2015-10-01 04:10:49 -07:00
oranges 3e6399caa4 Remove two unused tools 2015-10-01 09:35:37 +13:00
MrStonedOne fcc8402f31 map rotation base code 2015-09-30 07:13:38 -07:00
oranges 2155207c8d Add a tool to ensure no excess file dirs are defined
Also plugs script into the travis buildchain
2015-09-17 11:43:18 +12:00
CorruptComputer d27a736f7e Fixes #11301 2015-08-21 16:57:27 -05:00
CorruptComputer c241ce4502 Added the exe 2015-07-28 17:04:07 -05:00
CorruptComputer 4516db6323 IT WORKS 2015-07-26 10:54:16 -05:00
Remie Richards 66689dbb51 Adds a tool to convert the internal structure of a .dmm (or .txt form) of a Byond map into a human readable format, this format is also more suited to automatic fixing of conflicts by Git! 2015-07-14 19:47:46 +01:00
Cheridan 1e28365f4a Merge pull request #10312 from CorruptComputer/morethan1
Selecting Multiple files with new map merger
2015-07-03 09:53:05 -05:00
CorruptComputer 473eaf8918 Edit the default directory with Run Map Merge.bat
If no .dmm files are found there it asks for input
2015-07-02 13:52:37 -05:00
CorruptComputer fbac010212 Compile the jar 2015-07-01 00:58:12 -05:00
CorruptComputer 3365b4df64 Selecting Multiple files with map merger 2015-07-01 00:52:15 -05:00
TheVekter 9e4feab403 Fixes Prepare Maps.bat not making backups properly 2015-06-30 20:22:59 -05:00
Razharas c5b025e24e Merge pull request #9784 from CorruptComputer/MapMergeUpdateThing
[Merge Ready] Updates Map Merge
2015-06-28 15:45:37 +03:00
Razharas 720e22c20b Merge pull request #9247 from CorruptComputer/dmifonts
Adds dmifonts
2015-06-11 03:04:34 +03:00
CorruptComputer 9d35e88452 Whoops 2015-06-04 16:14:27 -05:00
CorruptComputer b61bc08a10 Adds the old source 2015-06-04 16:08:54 -05:00
CorruptComputer fa4f857fdd Adds Source 2015-06-04 15:46:52 -05:00
CorruptComputer 5a7b43dcb6 Update Prepare Maps.bat 2015-06-04 10:23:42 -05:00
CorruptComputer 887f8d86a9 Updates MapMerge 2015-06-04 09:31:00 -05:00