Commit Graph

9611 Commits (c6f9eb519a166c49d6bb37aecf3948689a71788f)
 

Author SHA1 Message Date
lethosor 24cc1b25a3 Merge branch 'lethosor/zone-cage-owner-scroll-crash' into develop 2015-02-06 19:18:02 -05:00
lethosor 50770f8cdd Clean up whitespace in zone.cpp 2015-02-06 19:13:34 -05:00
lethosor 00072dae1d Fix crash in zone plugin from scrolling when assigning an owner to a cage
Fixes #534
2015-02-06 19:12:10 -05:00
lethosor 7823a14a8f Merge remote-tracking branch 'Putnam3145/patch-10' into develop
Conflicts:
	NEWS
2015-02-06 17:08:00 -05:00
Lethosor 8bc9bcfcb1 Merge pull request #533 from Putnam3145/patch-11
Added subthought properly to add-thought.
2015-02-06 16:58:40 -05:00
Putnam3145 0baf0603ad Update NEWS 2015-02-06 13:53:55 -08:00
Putnam3145 ac318aaee8 Added subthought properly to add-thought.
Not used much, but still very much a problem that it wasn't there.
2015-02-06 13:52:56 -08:00
Lethosor 7ad44fcea8 Clarify that the perl libraries are required on Linux 2015-02-05 21:24:19 -05:00
Lethosor b9910490bf digcircle documentation: radius -> diameter
Fixes #523
2015-02-05 15:33:33 -05:00
Putnam3145 2b438a2970 Update NEWS 2015-02-05 00:26:33 -08:00
Putnam3145 674b9dd5a9 Made hack-wish stack properly. 2015-02-05 00:25:05 -08:00
James Logsdon d15b189e50 Add a note about build targets on OSX Yosemite 2015-02-04 00:47:47 -05:00
Lethosor bcfff161e7 Rename ShowUnitSyndromes.rb to show-unit-syndromes.rb 2015-02-03 21:25:43 -05:00
Lethosor 51b7b1adba Merge pull request #528 from BenLubar/fix-showunitsyndromes
fix ShowUnitSyndromes
2015-02-03 21:23:33 -05:00
Ben Lubar 02a14c6b57 fix ShowUnitSyndromes 2015-02-03 20:05:33 -06:00
Lethosor 7aa82fdbdb Merge pull request #527 from warmist/gm-editor
Add search bar to gui/gm-editor
2015-02-03 12:29:01 -05:00
Warmist ab14eae76c LEAVESCREEN now exits out of search too. 2015-02-03 19:17:33 +02:00
Lethosor 67bf26dbbe Merge pull request #525 from lethosor/tweak-tradereq-pet-gender
New tweak to display pet genders on trade request screen
2015-02-03 08:25:12 -05:00
expwnent 69dfec88cb Merge remote-tracking branch 'dfhack/develop' into develop 2015-02-03 01:12:34 -05:00
Lethosor ec3274f38b Add tradereq-pet-gender to dfhack.init-example 2015-02-02 10:15:03 -05:00
lethosor d2aeffe3bc Add tweak tradereq-pet-gender to documentation 2015-02-02 10:04:43 -05:00
lethosor 5a93de3f31 New tweak (tradereq-pet-gender): Displays pet genders on trade agreement screen
Closes #515
2015-02-02 10:04:31 -05:00
expwnent 710dddc1c0 Update NEWS. 2015-02-02 05:23:16 -05:00
expwnent def4fca175 Tweak anonymous-script. 2015-02-02 05:21:13 -05:00
expwnent 0fa316f6eb Tweak reaction-product-trigger. 2015-02-02 05:20:59 -05:00
expwnent 10f4f94b57 Update documentation. 2015-02-02 05:20:43 -05:00
expwnent e5e0d93ef1 Added modtools/reaction-product-trigger. 2015-02-02 02:39:05 -05:00
expwnent 712892fb71 Only reload and recompile Lua scripts if they have moved or been updated. 2015-02-02 02:24:43 -05:00
lethosor d153786eb4 Merge branch 'add-spatter-crash' into develop 2015-02-01 21:34:12 -05:00
lethosor e34178e367 Fix add-spatter crash
Hopefully fixes #205
2015-02-01 21:31:05 -05:00
Warmist c56d928dae Update search bar after browsing. 2015-02-01 20:07:28 +02:00
Warmist 570381f059 Added search. Access with "s". 2015-02-01 19:58:49 +02:00
expwnent 0f01583972 Fix news 2015-01-31 23:36:34 -05:00
expwnent e006eb21e8 Bump version and update NEWS. 2015-01-31 23:22:42 -05:00
expwnent d7bbde0aa0 Update texts. 2015-01-31 23:15:40 -05:00
expwnent b407044b94 Contributing typo. 2015-01-31 23:06:23 -05:00
expwnent 4c5932c842 Contributing tweaks. 2015-01-31 23:04:35 -05:00
expwnent dfd9bb56aa No tabs! 2015-01-31 22:53:40 -05:00
expwnent bf5e491647 Allow Lua scripts to be used as modules. 2015-01-31 22:43:54 -05:00
expwnent 92bd6349a7 Fix listdir_recursive on Windows. 2015-01-31 22:28:17 -05:00
expwnent 359d739c8d Tweak contributing.rst. 2015-01-31 21:38:42 -05:00
expwnent 5b3e5b533e Make zone compile on Windows. 2015-01-31 21:04:12 -05:00
expwnent e9b4fc513a Merge remote-tracking branch 'cdombroski/zone-plugin-cleanup' into temp
Conflicts:
	NEWS
	plugins/zone.cpp
2015-01-31 21:01:41 -05:00
expwnent f77443d661 Merge remote-tracking branch 'cdombroski/ContributingDoc' into temp 2015-01-31 21:00:01 -05:00
expwnent aa5d7c11bc Merge remote-tracking branches 'lethosor/patch-12' and 'lethosor/fs-expansion' into develop
Conflicts:
	NEWS
2015-01-31 20:25:01 -05:00
expwnent 1d8fd55a4a Merge remote-tracking branch 'cdombroski/dfhack-484' into develop
Conflicts:
	NEWS
2015-01-31 20:22:17 -05:00
expwnent b685aa2729 Merge remote-tracking branch 'peridexis/fix_hfs-pit' into develop
Conflicts:
	NEWS
2015-01-31 20:19:42 -05:00
expwnent 6b2e7cfe3e Merge pull request #511 from lethosor/stocksettings-create-dir
Create `stocksettings` directory on startup
2015-01-31 20:17:22 -05:00
expwnent 1d10298246 Merge remote-tracking branch 'putnam/patch-9' into develop
Conflicts:
	NEWS
2015-01-31 20:16:02 -05:00
expwnent b454985c70 Merge pull request #508 from miffedmap/allow_rc_preload
Allow user to include custom libraries in LD_PRELOAD
2015-01-31 20:13:42 -05:00