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
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
cebfa603e0
Update isoworld, stonesense
2015-02-22 16:51:37 -05:00
lethosor
100fce0419
Update submodules
2015-02-21 23:06:15 -05:00
lethosor
6a64525284
Include a ruby library for OS X
...
See #560
2015-02-21 21:53:08 -05:00
lethosor
d7897caec7
Display a more user-friendly error message when the ruby library is not available
2015-02-21 21:50:25 -05:00
lethosor
0f77a1a578
Move DFHack version to a separate (static) library
...
This allows the DFHack version to be changed without recompiling
everything
2015-02-19 12:08:23 -05:00
lethosor
c80fbbc397
Remove AS prefixes from add-spatter.cpp
...
The actual cause of this crash was fixed in #558
See #205
2015-02-19 12:05:32 -05:00
lethosor
2921879be8
Improve error detection and only list creatures when necessary
2015-02-17 14:33:58 -05:00
lethosor
645c2a7f86
Make catsplosion work on any specified creature(s)
...
Also add a "list" option
2015-02-17 14:16:50 -05:00
lethosor
3750b8c589
Add "DFHack" indicator to trackstop menus
2015-02-17 14:13:53 -05:00
lethosor
661eacf223
Always show trackstop menus when visible
2015-02-17 14:13:37 -05:00
Japa
f2461254d4
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-02-17 22:52:39 +05:30
Japa
8423710c2f
Made remotefortressreader.cpp return a specified number of map blocks, spiraling out from the center.
2015-02-17 22:51:33 +05:30
PeridexisErrant
bc505952a3
Change autobutcher export format a little
2015-02-17 14:15:33 +11:00
lethosor
b7f15ef2d6
Update xml, stonesense for 0.40 ui_advmode_menu changes
...
Closes #552
2015-02-16 19:10:15 -05:00
lethosor
9ef25f33a9
Update submodules (whitespace changes)
2015-02-14 23:28:16 -05:00
lethosor
10cfef0553
Fix whitespace issues
2015-02-14 22:53:06 -05:00
lethosor
3f9d3dc110
Use unix line endings in isoworldremote.proto
2015-02-13 15:14:31 -05:00
Japa
5dab36948a
Merge branch 'master' of https://github.com/JapaMala/dfhack into develop
2015-02-13 19:55:00 +05:30
Japa
6e7b543414
Added liquids
2015-02-13 18:38:02 +05:30
lethosor
8e8f88f3db
initflags: Remove debug output
2015-02-09 22:01:12 -05:00
Lethosor
f287a99a37
Merge pull request #542 from scamtank/fix-armory
...
fix-armory: Substitute removed jobtypes with working ones
2015-02-09 11:07:51 -05:00
scamtank
9c4dbea392
Re-enabled fix-armory plugin
2015-02-09 00:22:19 +02:00
scamtank
35d357776c
Substitute removed jobtypes with working ones
...
Replaced StoreItemInChest with StoreItemInHospital and StoreItemInCabinet with StoreOwnedItem. Seem to work on the basic level with waterskins and uniform cloaks.
2015-02-08 23:41:22 +02:00
lethosor
43d6a7b5d4
tradereq-pet-gender: Fix MSVC build error
2015-02-08 09:33:37 -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
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
5a93de3f31
New tweak (tradereq-pet-gender): Displays pet genders on trade agreement screen
...
Closes #515
2015-02-02 10:04:31 -05:00
expwnent
e5e0d93ef1
Added modtools/reaction-product-trigger.
2015-02-02 02:39:05 -05:00
lethosor
e34178e367
Fix add-spatter crash
...
Hopefully fixes #205
2015-02-01 21:31:05 -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
1d8fd55a4a
Merge remote-tracking branch 'cdombroski/dfhack-484' into develop
...
Conflicts:
NEWS
2015-01-31 20:22:17 -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
ab01e7d102
Eventful no longer requires LUA_HOOK to do reaction events.
2015-01-31 20:10:06 -05:00
Chris Dombroski
f608235b1e
Fix some Lua things
2015-01-29 19:56:50 -05:00
Chris Dombroski
f2eec3198c
Rename findPenPitAtCoord
2015-01-29 15:02:54 -05:00
Chris Dombroski
48b6cf1beb
Export functions to Buildings.h
2015-01-29 13:57:50 -05:00
Chris Dombroski
4199728ba6
Cleanup building methods before extracting to Buildings.h
2015-01-29 13:57:50 -05:00
Chris Dombroski
c179f5b913
Extract some stuff from zone.cpp to plugins/Units.{h,cpp}
2015-01-28 21:28:32 -05:00
Chris Dombroski
789cc01e93
Remove gcc warnings
2015-01-28 21:28:32 -05:00
Chris Dombroski
10ec5f1330
Use auto to reduce vector iteration redundancy
2015-01-28 21:17:37 -05:00
Chris Dombroski
5f9fe871b3
Add isGelded() to the priority butcher checks
...
Fixes #484
2015-01-28 21:17:37 -05:00
Chris Dombroski
26ad797c43
isGelded function
2015-01-28 21:17:37 -05:00
Lethosor
58f896d569
Create `stocksettings` directory on startup
2015-01-26 16:28:57 -05:00