Commit Graph

5970 Commits (96e5c5d2fdff90ee7834408a87869380427119ec)
 

Author SHA1 Message Date
lethosor 96e5c5d2fd Fix whitespace 2015-03-20 19:55:32 -04:00
lethosor b976053be0 Add Lua JSON library 2015-03-20 19:51:24 -04:00
lethosor f3508f82c1 Add jsonxx to depends/ 2015-03-20 15:45:38 -04:00
lethosor 625be319c9 Re-enable memory range logging on OS X if an environment variable is set 2015-03-19 19:37:10 -04:00
lethosor 51a6d88c5c Merge branch 'travis-ruby' into develop 2015-03-16 16:09:57 -04:00
lethosor be89db5bad Implement ruby syntax checks 2015-03-15 23:29:08 -04:00
Lethosor c9f990b97f Add melkor217 to Contributors.rst 2015-03-15 21:44:58 -04:00
Lethosor 3639920a50 Merge pull request #575 from lethosor/game-type
Add gametype checks to World module
2015-03-13 22:25:37 -04:00
Lethosor 48b7c51027 Merge pull request #574 from melkor217/master
Negative autolabor pool size uses most unskilled dwarves.
2015-03-10 19:58:18 -04:00
lethosor c8200abffb Update NEWS (separate some Lua-related changes) 2015-03-10 16:35:24 -04:00
lethosor e28aabaaa0 Merge branch 'lua-strerror' into develop 2015-03-10 16:33:07 -04:00
lethosor 016f67e83f Expose strerror to Lua 2015-03-10 16:32:43 -04:00
lethosor 0c5b5c691a Use gametype checks in plugins 2015-03-09 20:17:18 -04:00
lethosor afca7419dc Add gametype checks to World.cpp 2015-03-09 20:08:21 -04:00
lethosor 1591e67bf2 Replace backslashes with forward slashes in command names 2015-03-06 16:53:57 -05:00
Lethosor cb0bb4ecbd Update NEWS 2015-03-06 15:41:00 -05:00
lethosor 7abe70feb8 Update clsocket 2015-03-05 17:22:21 -05:00
lethosor c2eba99cb9 Create professions folder if necessary 2015-03-05 16:57:58 -05:00
lethosor efa9224eef Merge remote-tracking branch 'lethosor/manipulator-expansion' into develop 2015-03-05 16:55:30 -05:00
lethosor 6f276ac419 Shorten option width to stay within 80 columns 2015-03-05 16:48:11 -05:00
Daniil Guzanov 4c06e022a6 Negative autolabor pool size uses most unskilled dwarves. 2015-03-06 00:47:18 +03:00
lethosor be2349d67d Revert "Expose manipulator columns to Lua"
This reverts commit 1d8b2d8cea.
2015-03-05 16:32:57 -05:00
lethosor e19123b71b Force rst files to be generated for travis builds 2015-03-04 18:26:59 -05:00
lethosor 52fb1858b2 Fix whitespace issues in rst files 2015-03-04 17:33:12 -05:00
lethosor 284b4832bc Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-03-04 17:27:48 -05:00
lethosor d6c6408950 Merge branch 'travis-fix-texts' into develop 2015-03-04 17:25:20 -05:00
lethosor 423a4f9306 Run pip as root 2015-03-04 17:10:25 -05:00
lethosor 00fd41c24d travis: Run fixTexts.sh 2015-03-04 17:10:15 -05:00
Lethosor 499ac05ad3 Merge pull request #569 from Fukken-Saved/master
Small update (autohauler)
2015-03-04 15:08:52 -05:00
Fukken-Saved 7a26e633e9 Update autohauler.cpp 2015-03-04 07:06:24 -05:00
Fukken-Saved 36cee730f1 Update autohauler.cpp 2015-03-04 06:59:29 -05:00
lethosor 0b912f54be Fix field name in lua/stockflow.lua
From DFHack/df-structures#39
2015-03-01 17:32:25 -05:00
Lethosor 6bfbb93377 Merge pull request #557 from jlogsdon/manipulator-job-view
Add current job as a view mode in manipulator
2015-03-01 17:14:29 -05:00
James Logsdon 061edc4f34 Update news and contributors 2015-02-28 17:09:58 -05:00
James Logsdon 1ebb1f1d11 Add current job as a view mode in manipulator 2015-02-28 17:09:58 -05:00
lethosor 87867b96b9 Add autohauler to plugins/CMakeLists.txt 2015-02-27 23:18:26 -05:00
lethosor fdfebf4d4e Merge remote-tracking branch 'Fukken-Saved/master' (autohauler) into develop 2015-02-27 23:15:49 -05:00
lethosor cdf211d437 Merge remote-tracking branch 'PeridexisErrant/autobutcher-export' into develop 2015-02-27 23:13:06 -05:00
lethosor 64123d8fea Merge remote-tracking branch 'warmist/dev_building_hacks' into develop 2015-02-27 23:09:56 -05:00
lethosor 0c09feae5b Prevent backslashes from being used in command names 2015-02-27 18:46:29 -05:00
lethosor 45acf61b17 Update xml 2015-02-26 16:12:12 -05:00
Fukken-Saved ac5909ad2a Update autohauler.cpp
Some small text changes
2015-02-25 07:47:15 -05:00
Fukken-Saved a228977976 Update autohauler.cpp
Final whitespace fixes?
2015-02-25 07:26:54 -05:00
Fukken-Saved 53c88bab56 Update autohauler.cpp 2015-02-25 07:22:25 -05:00
Fukken-Saved 68d088eeb5 Revert "Add autohauler plugin to cmakelist"
This reverts commit a13c9b0310.
2015-02-25 07:13:29 -05:00
Fukken-Saved 6e0c7d6a4e Revert "whoops"
This reverts commit 5f498b1b78.
2015-02-25 07:13:09 -05:00
Fukken-Saved 0c205b4630 Revert "Create .travis.yml"
This reverts commit f2628f3814.

\
2015-02-25 07:09:25 -05:00
James Logsdon 2549f116a0 Custom Profession Templates in manipulator! 2015-02-24 15:51:24 -05:00
James Logsdon c2c8ae6a44 Add current job as a view mode in manipulator 2015-02-24 15:51:24 -05:00
lethosor 1d8b2d8cea Expose manipulator columns to Lua 2015-02-24 15:50:27 -05:00