Commit Graph

6198 Commits (726ffd6417ac67b779adc5a1a390f7b8523a0b57)
 

Author SHA1 Message Date
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
lethosor 70824ade14 Allow shift to extend selection 2015-02-24 15:50:27 -05:00
lethosor e2d7a7395e Add several additional format options
Also set do_refresh_names and call calcIDs() when needed
2015-02-24 15:50:27 -05:00
lethosor c36daa4d7d Fix a few minor StringFormatter issues
* Recognize the end of a format specifier properly
* Make '$' actually work
2015-02-24 15:50:27 -05:00
lethosor 5a92080cc1 Add various ID formatting options, allow editing a single dwarf 2015-02-24 15:50:27 -05:00
lethosor b5797daa8a Allow custom nicknames/profession names to use format specifiers
Also prevent selecting/applying operations to uneditable units
2015-02-24 15:50:27 -05:00
lethosor 21e96ba369 Implement batch operation callbacks and a basic string formatter 2015-02-24 15:50:26 -05:00
lethosor dd17f90dcd Add a flag to allow mouse clicks to select ListColumn items 2015-02-24 15:50:26 -05:00
lethosor 9d600f00a0 Add batch operations menu 2015-02-24 15:50:26 -05:00
lethosor 990ab9c76b Typecast nullptr in ListColumn::getFirstSelectedElem() 2015-02-24 15:50:26 -05:00
lethosor 481e5cc19e Implement dwarf selection 2015-02-24 15:50:25 -05:00
Lethosor 262fe52424 Update luac.py 2015-02-24 15:09:52 -05:00
Fukken-Saved f2628f3814 Create .travis.yml 2015-02-24 13:53:22 -05:00
Warmist 17fda7ffa0 Fixed whitespace. 2015-02-24 20:28:49 +02:00
Warmist e9ab892369 Building hacks changes.
Fixed buildings not consuming correct value of power. Added way to ignore unpowered state. Added setPower/getPower to change how much power building uses on the fly.
2015-02-24 15:37:38 +02:00
Lethosor 62b0573dc2 Update Compile.rst 2015-02-23 22:56:44 -05:00
lethosor d7036775ed Merge branch 'travis-luac' into develop 2015-02-23 19:00:22 -05:00
lethosor 83e175f52b Fix syntax error in devel/light.lua 2015-02-23 18:57:50 -05:00
lethosor 5c09423aea Make luac exit with correct error code 2015-02-23 18:55:34 -05:00
lethosor 0aa9866089 travis: Add luac test 2015-02-23 18:44:36 -05:00
lethosor 3c9431128e travis: Ignore protobuf generated files 2015-02-23 18:44:19 -05:00
lethosor 5a8c4b5eb7 Trigger travis build 2015-02-23 15:05:40 -05:00
lethosor cebfa603e0 Update isoworld, stonesense 2015-02-22 16:51:37 -05:00