Commit Graph

39 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
Jordie 5282d88557 changed to use _maps directory 2015-10-10 17:51:12 +11: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
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
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
carnie e693ed3e9f Fixes a number of urgent mapping errors with recent shuttle overhaul (on both generic and tg zlevel)
Improves clean_map.bat - will now prompt you for a path relative to the map_files directory, making it easier to use with the new split-zlevel maps
Improves prepare_map.bat - will now automatically backup ALL .dmm files in map_files and subdirectories.
2015-01-06 21:58:05 +00:00
Cheridan ca3235a7cb Merge pull request #6334 from CorruptComputer/mapsource
Moved map merge source to a folder
2014-12-14 11:24:20 -06:00
CorruptComputer 90cbf4bb52 Moved map merge source to a folder 2014-12-12 18:32:34 -06:00
Incoming 1307b1143b Readds the x-mas trees to their traditional locations, the bar and church
Readds the Festivus Pole to the RD's office, since the break room is gone
Makes a wizard robe variation of the santa outfit without all the bonus effects (not spaceworthy, can't hold literally everything) so the crew can experience the joy of meeting and subsiquently killing santa claus

Fixes #6230 as a matter of course (someone needs to generalize it to just work for all maps at once)
2014-12-05 12:41:55 -05:00
Razharas 0d1781c595 Merge pull request #6058 from tkdrg/yes
Adds an easy way to install the map merge driver
2014-11-28 15:54:13 +03:00
Francis Devine fdb9917db1 Add mapmerge source decompiled from the jar 2014-11-26 12:24:18 +13:00
tkdrg dca92f40ef Adds an easy way to install the map merge driver
Fix the mapmerger bat paths
2014-11-25 11:47:28 -03:00
ikarrus 29ebca2b59 Minor Fixes to 2.1.3
Fixed Telescience door name and access.
Added surgical drapes to ghetto surgery so they can get started
Updates the map merger to use 2.1.3
2014-04-02 22:22:28 -06:00
Jordie0608 c9731c8fe8 Updates mapmerger batches to new mapfile system 2014-01-30 01:59:07 +11:00
Cheridan 7506a19073 Nuke Op Gloves: The Blackening
-Removes the yellow gloves on the Nuke Ops shuttle. (They were completely redundant, as the gloves they start with were already insulated (!!!)).
-In return, adds a laundry room to the nuke ops staging area, allowing them to paint their gloves as they please if they want to be stealthy.
-Removes 'SWAT' gloves in favor of the less-weirdly-specific combat gloves. Codewise, they were exactly the same.

Updates spacebattle.dmm, as it had an instance of swat gloves.
Adds a link in the mapmerge tool instructions to assist in setup.
2013-10-20 23:09:22 -05:00
carnie 56a6f19eac Fixes ShowInterface() using usr instead of user. Thanks MrPerson.
Also added a pause to the end of both mapmerge batch files, to stop them autoclosing when doubleclicked (and hence hiding errors).
2013-06-27 03:49:00 +01:00
Pete Goodfellow e8fc135503 Updated the maptools to work with the new directory, and updated install.txt. 2013-05-29 14:41:56 +01:00
Pete Goodfellow d8e5c00edd Moved maptools into the tools directory. 2013-05-29 14:30:46 +01:00