Commit Graph

6 Commits

Author SHA1 Message Date
CitadelStationBot
bcc360d0d9 [MIRROR] Fixes omega detective office + prepare_maps change (#6110)
* Fixes omega detective office + prepare_maps change (#36691)

* Fixes Omega Detectives office

* Mentions mapmerge isntead of run map merge

* Fixes omega detective office + prepare_maps change
2018-03-26 04:31:41 -05:00
Jordan Brown
d1fea8e4f7 Removes Map Merge 1 2018-02-11 13:03:47 -06:00
CitadelStationBot
0bb8649794 [MIRROR] Fix map keys overflowing earlier than expected (#5259)
* Merge pull request #35133 from AutomaticFrenzy/patch/key-overflow-fix

Fix map keys overflowing earlier than expected

* Fix map keys overflowing earlier than expected
2018-02-04 22:35:52 -06:00
Tad Hardesty
f62aa9e21f Add READMEs to hooks and mapmerge2 directories (#34511) 2018-01-18 21:27:04 -06:00
Tad Hardesty
12da7d5dec Fix the batch file method of mapmerge2 and save a .before (#34361) 2018-01-12 09:44:00 -06:00
Tad Hardesty
61f00cbfb0 Add a new and improved mapmerge (#33869)
Key benefits of the new mapmerge include: multi-Z support, effective
reuse of deleted keys, automatic handling of key overflow, and utilizing
a git pre-commit hook to eliminate the need to run batch files manually.
2017-12-29 00:28:25 -06:00