Japa
8917892473
Merge branch 'master' of https://github.com/peterix/dfhack
...
Conflicts:
library/xml
plugins/CMakeLists.txt
2013-11-19 04:15:04 +05:30
Quietust
5c51f7dd2a
Merge branch 'master' of git://github.com/angavrilov/dfhack
2013-11-10 14:04:48 -06:00
Alexander Gavrilov
7ce5831257
Get rid of the std exception.
2013-11-07 11:58:11 +04:00
Quietust
4d2e5b80bf
Use df::allocate here for proper compatibility with 40d and earlier
2013-11-04 14:55:31 -06:00
jj
883d89bb68
plants: move all commands as "plant" subcommands, update NEWS/Readme
2013-11-02 18:54:29 +01:00
Quietust
463bb8d498
Update plugins to use CR_WRONG_USAGE where appropriate
2013-10-30 15:58:14 -05:00
Quietust
ff939e36bb
Missed parameter in plugin command init
2013-10-30 14:25:35 -05:00
Quietust
b97a13fa63
Update "plants" plugin
...
* Add "createplant" command, creates a shrub or sapling at the cursor.
* Put help text in command definitions so CR_WRONG_USAGE works properly
2013-10-30 14:19:52 -05:00
expwnent
8ccb04236f
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
2013-10-25 11:47:03 -04:00
Alexander Gavrilov
54b45349c5
Improve pre-embark prospect using new knowledge about soil depth.
2013-10-25 14:37:37 +04:00
Alexander Gavrilov
e4978a1da7
Relax 3dveins preconditions to account for soil quirks and volcanoes.
2013-10-25 12:51:06 +04:00
expwnent
329741f235
EventManager: added EQUIPMENT_CHANGE event and exposed it to lua.
2013-10-24 19:32:52 -04:00
expwnent
c409289ee4
EventManager: TICK events should unregister correctly when requested and after they fire, other tweaks.
...
- fixed unregister to allow unregistering individual TICK events
- make registerTick return the resulting freq you have to put back in to the handler in order for it to be unregisterable
- when TICK events fire, they now automatically remove themselves from handlers[TICK], as they should
- make sure manageTickEvent fires once per tick
2013-10-20 22:54:25 -04:00
expwnent
a0ee74b3a5
eventful: no longer possible to disable an event type, event frequency is the minimum request frequency (most frequent), added array of event handler function pointers to simplify code
2013-10-20 19:56:48 -04:00
expwnent
e81c060627
Added EVENT_MAX just in case someone wants it.
2013-10-20 15:24:31 -04:00
expwnent
d4542b32fa
eventful: removed extra EventManager::unregisterAll.
2013-10-20 15:24:04 -04:00
expwnent
6ef360f4d6
Merge remote-tracking branch 'warmist/dev-EventManager-lua' into 0.34.11-r4
2013-10-20 14:52:40 -04:00
Warmist
d179812c22
Small bug fix for autolabor crashing on script created creatures.
2013-10-20 21:50:22 +03:00
Warmist
0dff26aa23
Added lua interface (in eventful) for EventManager module.
2013-10-20 21:44:07 +03:00
expwnent
39553cfb6d
EventManager: fixed a problem with constructionHandler.
2013-10-20 14:14:02 -04:00
expwnent
ee056f4422
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
...
Conflicts:
NEWS
2013-10-20 11:09:40 -04:00
Alexander Gavrilov
b2d2a074c8
Validate vein types in the scan phase and leave unexpected ones alone.
2013-10-20 12:33:17 +04:00
expwnent
6805656dd0
Added enable/disable functionality to diggingInvaders.
2013-10-19 21:42:24 -04:00
expwnent
9d3ee11349
Merge branch 'diggingInvaders' into 0.34.11-r4
...
Conflicts:
scripts/devel/invasion-now.lua
2013-10-19 21:26:50 -04:00
expwnent
0bf427c689
Added enable/disable functionality to new plugins.
2013-10-19 21:19:39 -04:00
expwnent
ef9d3b1521
Merge remote-tracking branch 'jjyg/master' into 0.34.11-r4
2013-10-19 20:28:30 -04:00
expwnent
57fc0f3e89
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
...
Conflicts:
NEWS
library/xml
plugins/CMakeLists.txt
plugins/autoSyndrome.cpp
2013-10-19 20:19:29 -04:00
jj
1bd6d5f96d
ruby: add FEATURE/ice map tile materials
2013-10-14 01:58:55 +02:00
jj
3d7661e7e9
ruby: fix map tile material reading
2013-10-14 00:01:26 +02:00
Alexander Gavrilov
78de739d75
Update aquifers when generating 3D vein layout.
2013-10-11 19:23:32 +04:00
Alexander Gavrilov
5bcae49249
Implement generation of 3D veins that match the existing mineral counts.
...
Vein distributions may need some improvement.
2013-10-10 12:50:52 +04:00
Alexander Gavrilov
86d0022c58
Implement reading and writing the map for 3D veins plugin.
...
This should completely erase all veins from the map when run.
2013-10-10 12:15:50 +04:00
Alexander Gavrilov
a273327c6a
Remove "using namespace std" from MiscUtils.h.
2013-10-10 12:15:50 +04:00
Alexander Gavrilov
6852adbd91
Expose new MapCache features in probe and tiletypes.
2013-10-10 12:15:50 +04:00
jj
4ba4f90147
ruby: add support for enable/disable plugin
2013-10-07 13:58:28 +02:00
jj
a18347608a
ruby: vectors default to int32_t
2013-10-07 13:33:21 +02:00
Alexander Gavrilov
32a6073dad
Remove lambdas from dwarfmonitor and resume.
2013-10-03 16:30:06 +04:00
Alexander Gavrilov
f3be0ee187
Remove the use of lambdas in buildingplan.
2013-10-02 19:55:48 +04:00
Alexander Gavrilov
599af0a4d9
Fix linux and windows build issues.
...
- Linux makefile overrides and removes the optimization flags.
- Old linux gcc doesn't understand lambdas.
- MSVC doesn't like extern and explicit instantiation in same file.
2013-09-30 22:51:29 +04:00
Alexander Gavrilov
d7e35c2d23
Add built-in enable and disable commands.
2013-09-30 13:19:51 +04:00
jj
a487ede2b9
autodump: typo in errmsg
2013-09-23 21:28:27 +02:00
Alexander Gavrilov
b885123d4e
Fix a crash in beehive code if bees die with yet uncollected products.
...
http://www.bay12games.com/dwarves/mantisbt/view.php?id=6368
2013-08-26 16:55:30 +04:00
Alexander Gavrilov
896cd11fe9
Track readable names of vmethod hooks for diagnostic messages.
...
Note that this changes the ABI of all plugins that use hooks.
2013-08-22 12:14:45 +04:00
Alexander Gavrilov
70a2ab9141
Fix crash due to incorrect loop bounds in add-spatter.
...
This caused a buffer overrun bug if an ADD_SPATTER
reaction had any non-improvement outputs.
2013-08-22 11:22:18 +04:00
jj
308e7b6820
fix renamed pregnancy_ptr/mystery to pregnancy_genes/caste
2013-08-10 01:57:11 +02:00
Japa
279c4a48dc
Started work on ramp generation, still needs work.
2013-07-22 19:05:09 +05:30
Japa
0bd627a6f6
Got basic mesh generation working for a unity Visualizer, as well as a block editor for the same.
2013-07-21 10:28:46 +05:30
jj
297fa86c34
follow df-structures change to drawBuilding
2013-07-07 17:40:28 +02:00
Warmist
34e5716cc0
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-28 23:52:51 +03:00
Warmist
647b14b471
Fixed potential error with building getting transparent on un-powering.
2013-06-28 23:51:52 +03:00
Warmist
269a2680c8
Added occlusionON|occlusionOFF commands
2013-06-28 23:34:47 +03:00
Japa
102b2ed450
Fixed broken buildings, also added floodgate functionality.
2013-06-28 23:47:54 +05:30
Warmist
368a326b40
Fix for gems not getting right color.
2013-06-28 17:22:24 +03:00
Warmist
26d557fc68
Fixed bug with buildings and added gems to material definition.
2013-06-27 18:11:50 +03:00
Warmist
e2db468d3d
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-27 16:18:46 +03:00
Warmist
7c190cd3f0
Added antialiased lights. They kind of suck. So I disabled them.
2013-06-27 16:11:29 +03:00
Japa
67859ada0a
Changed sun calculation direction.
2013-06-27 02:49:18 +05:30
Warmist
7c9f0fd781
Added day colors and day speed parameters.
2013-06-27 00:14:03 +03:00
Warmist
e1daa16d9e
Added sun time manipulation, updated helpstring.
2013-06-26 22:05:22 +03:00
Warmist
b7f28877a2
Added building size. Removed material flags (on by default)
2013-06-26 20:19:30 +03:00
Japa
d90a7bfb88
removed something I had for testing.
2013-06-26 19:26:11 +05:30
Japa
dc42fa2fa3
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-26 19:14:55 +05:30
Japa
689caa5039
Made the lighting engine multithreaded.
2013-06-26 19:12:14 +05:30
expwnent
c1fef35b52
Renamed digSmart to digFlood.
2013-06-25 19:57:17 -04:00
Warmist
fbbae3e900
Implemented building support.
2013-06-26 01:18:26 +03:00
Warmist
1d2accbe94
fixed (?) ice and made dragon blood glow a little.
2013-06-25 22:49:52 +03:00
Japa
539abff49a
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-25 23:23:52 +05:30
Japa
f4923d6974
added square light volume, and automatic light radius.
2013-06-25 23:13:55 +05:30
Warmist
588ca8b8dd
MAXIMUM SPEED UPDATE!!!!!
2013-06-25 20:36:53 +03:00
Warmist
3957fac531
Added citizen lights(only lights, no oclusion might change later). Added custom dim level (for darker nights and tunnels).
2013-06-25 19:34:38 +03:00
Japa
57e68aaee9
Added cmake info for the config lua.
2013-06-25 16:44:44 +05:30
Japa
5265f107b0
Added more advanced sun light calculation
2013-06-25 16:33:01 +05:30
Warmist
ef7abaee14
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-25 01:25:56 +03:00
Warmist
87f151f441
Plantfix, viewport height fix, and fov viewport fix.
2013-06-25 01:25:38 +03:00
Warmist
4d9b7bd23d
Major rewrite of opacity calculation.
2013-06-25 00:59:32 +03:00
Warmist
cb767531cf
Made light plugin read configuration file (rendermax.lua)
2013-06-24 18:18:57 +03:00
Japa
8271725320
Some performance fixes and tweaks. Opaque blocks can now emit light.
2013-06-24 14:20:22 +05:30
Warmist
8dcff9bc5d
Merge branch 'rendermax' of git://github.com/jjyg/dfhack
2013-06-24 10:34:03 +03:00
Warmist
5a82270aa6
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-24 10:19:10 +03:00
Warmist
abc9dc300e
Prelimenary work on advmode
2013-06-24 03:47:42 +03:00
jj
19952b9139
rendermax: lights off when sleeping
2013-06-24 02:27:43 +02:00
jj
b95683adb2
rendermax: sunlight travels down stairs
2013-06-24 02:22:30 +02:00
Japa
ec913c2c5e
Merge branch 'rendermax' of https://github.com/jjyg/dfhack
2013-06-24 05:37:59 +05:30
Japa
b8d2ceb23b
Made the low water check actually use floats.
2013-06-24 05:35:16 +05:30
jj
1a5169c70c
Merge branch 'master' of git://github.com/JapaMala/dfhack into rendermax
2013-06-24 01:56:32 +02:00
jj
fb5d248720
rendermax: basic daylight
2013-06-24 01:54:09 +02:00
Japa
2da136116d
Added some fast checking for obstacles around lights, resulting in a huge speedup outside.
2013-06-24 05:10:01 +05:30
jj
50073ae406
rendermax: make citizen glow
2013-06-24 00:45:45 +02:00
Japa
30697ee115
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-24 03:58:23 +05:30
Japa
a2cef2d86a
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-24 03:58:07 +05:30
Warmist
736f9e85fc
Fixed skylight
2013-06-24 01:26:25 +03:00
Warmist
8c9de79812
Small fixes
2013-06-24 00:53:39 +03:00
Warmist
f5f1328678
Merge branch 'master' of git://github.com/JapaMala/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-24 00:53:03 +03:00
Japa
fe41504952
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
Still broken. Needs boundary checking.
2013-06-24 03:11:46 +05:30
Warmist
3d6f4d3478
Added transparency to ice walls
2013-06-24 00:36:43 +03:00
Warmist
6cd926b67e
fix for map_block lights, fix for gem window color, dimmed the plant lights.
2013-06-24 00:10:52 +03:00
Japa
c675ca467a
Made sky light be more realistic, decreasing through water, and ignoring tile designations otherwise.
2013-06-24 02:35:03 +05:30
Warmist
06915aeded
Fixed unload/disable crash. Added glowing plants.
2013-06-23 23:56:01 +03:00
Warmist
82deeafe89
Torches for statues, candles on the tables.
2013-06-23 22:28:26 +03:00
Warmist
0473f89fa2
Update water a bit.
2013-06-23 21:49:17 +03:00