Commit Graph

4619 Commits (b76ededc1be566ede7afa77a52e03f8653db532c)
 

Author SHA1 Message Date
Alexander Gavrilov b76ededc1b Merge branch 'undump' of git://github.com/eswald/dfhack into develop 2014-05-04 18:32:29 +04:00
Alexander Gavrilov fb4c402dc0 Merge 'ignore_DS_Store' of git://github.com/tareqak/dfhack into develop 2014-05-04 18:01:02 +04:00
Alexander Gavrilov 6bb57c7b08 Merge gm-editor changes by warmist into develop 2014-05-02 17:57:10 +04:00
Warmist 9733b30ed6 gui/gm-editor: Fixed enum editing. And added free pointer/reinterpret options 2014-05-01 10:59:21 +03:00
Warmist 401c8f3026 gm-editor: Added enum printing and selection.
gm-editor: a bugfix for some entries not having fields
2014-05-01 10:59:21 +03:00
Alexander Gavrilov 415cdad489 Make using new for allocating DF objects with vtables a compile-time error.
When done from plugins, it doesn't correctly initialize the vtable
because of some weird things MSVC does, so the only safe way is to
use df::allocate<df::foo>(). For consistency, it is also enforced
for code in the main library. It reveals the issue in the digging
invaders plugin, first found by warmist.

This change is linked to a modification in df-structures codegen.
2014-04-30 21:28:02 +04:00
Alexander Gavrilov 98325757e2 Fix signed-unsigned mismatch warnings in the new item value code.
Unsigned comparison allows catching negatives in the same check too.
Also, it didn't check the values in getValue.
2014-04-30 20:44:22 +04:00
Quietust 0f4684f29d Add Items::getItemBaseValue and Items::getValue, available from Lua 2014-04-25 11:04:21 -05:00
Quietust 57fbb1004b Assorted cleanup 2014-04-23 08:23:34 -05:00
Quietust c3d45c3a1e Add Job::getName(job *), also available from Lua 2014-04-23 08:03:10 -05:00
Alexander Gavrilov 1d1ede279f Update structures 2014-04-21 09:52:07 +04:00
Timothy Collett e4641c506f Replace a std::string method not implemented until C++11 with a C++0x-valid substitute 2014-04-21 09:34:42 +04:00
Alexander Gavrilov 74429f12d7 Pull the list of libraries to preload into a variable in linux/dfhack.
This is so that the workaround described here can be applied easily:

http://www.bay12games.com/dwarves/mantisbt/view.php?id=2688
2014-04-21 09:33:13 +04:00
Alexander Gavrilov 6bef167f83 Add a couple of useful scripts and fix two missing NULL checks.
- A script to unstick jobs trying to build walls from the same tile.
- A devel script for viewing the path a unit is currently following.
2014-04-21 09:24:05 +04:00
Alexander Gavrilov 4b8760815d Merge branch 'siege-reports' into develop 2014-04-21 09:05:12 +04:00
Alexander Gavrilov 63d256c1e9 Adjust siege engine targeting weights.
Stop shooting at leaving caravan guards for one.
2014-04-17 22:10:43 +04:00
Alexander Gavrilov c27c38e4c0 Remove tired or hungry siege operators from duty when at peace.
The threshold is set at the level when they start to blink - normally
they would continue on with the job until they get a thirsty/hungry
thought, but immediately run off to eat if they lose the job (thus
refusing to load the engine after firing it). The code checks for
active sieges and whether there is a free replacement unit.
2014-04-15 21:52:39 +04:00
Alexander Gavrilov fc9826389b Account for meandering movement when predicting unit path in siege engine.
The movement is random, but there is an average slowdown coefficient.
2014-04-15 19:50:23 +04:00
Alexander Gavrilov 55cea36c76 Use the new API to produce combat reports for aimed siege engine attacks.
This requires exposing the actual operator unit to lua code.
2014-04-15 19:50:23 +04:00
Alexander Gavrilov ee4e3a6168 Use the new official gamelog output function in soundsense-season. 2014-04-15 19:50:23 +04:00
Alexander Gavrilov 7844907204 Add new API functions for creating announcements and combat reports.
Allow specifying the announcement flags directly, and adding unit
combat reports. Also, make announcement functions write the message
to the game log.
2014-04-15 19:50:23 +04:00
Alexander Gavrilov b56c3a95a6 Fix some signed/unsigned mismatch warnings and whitespace in Job module. 2014-04-15 19:50:23 +04:00
Quietust 22dab5d807 Update XML, fix several scripts that were broken by field name changes 2014-04-14 12:30:34 -05:00
Eric Wald 2391d11097 Minimal Readme documentation for the undump-buildings command 2014-04-13 16:16:33 -06:00
Alexander Gavrilov ddd56d8ea6 Update the structures. 2014-04-12 17:21:35 +04:00
Alexander Gavrilov 412ba8e98a Generate html files. 2014-04-12 17:21:10 +04:00
Alexander Gavrilov 508fcae758 Merge OSX build docs from git://github.com/lethosor/dfhack into develop 2014-04-12 17:03:21 +04:00
Alexander Gavrilov 65d361cad8 Merge a mod-manager fix from 'warmist/develop' into develop 2014-04-12 17:02:18 +04:00
warmist fccdbb010d Update mod-manager.lua
Fixes fileExists not working.
2014-04-08 09:07:49 +03:00
Alexander Gavrilov 7aecffe0cd Update structures and fix broken things. 2014-04-04 22:34:39 +04:00
Alexander Gavrilov 788bc55096 Fix a mistake in the lua resize() method of BitArray. 2014-04-04 22:33:05 +04:00
jj eac126c884 ruby: use placement-new instead of hack 2014-04-01 15:12:52 +02:00
Alexander Gavrilov a09e132107 Support using multiple lua init scripts per save.
This should make it easier to add and remove init script code by
automated means, or install multiple mods that need such code.
2014-03-31 16:00:55 +04:00
Alexander Gavrilov f26a943d26 Merge branch 'lua-5.2.3' into develop 2014-03-31 14:49:13 +04:00
Alexander Gavrilov 7ea8e25cd3 Rename the LUA_PATH/LUA_CPATH environment variables to avoid conflicts.
If a user has a standalone lua installation with these variables
configured, it should not confuse dfhack into looking for things
in wrong places.
2014-03-31 14:15:57 +04:00
Alexander Gavrilov a70fbf41d4 Reapply dfhack-specific lua build configuration. 2014-03-31 14:15:50 +04:00
Alexander Gavrilov 1132bea917 Update to Lua 5.2.3 2014-03-31 14:15:09 +04:00
Quietust 837da8ae98 Fix siege-engine to compile on Windows - don't have C++11, and pow() is picky about arg types 2014-03-25 13:30:45 -05:00
Quietust e620ae765c Add missing import/export info for MersenneRNG::unitvector<> 2014-03-25 13:30:21 -05:00
Quietust 2ca34b9353 Recompress images 2014-03-25 11:54:17 -05:00
Alexander Gavrilov a8716c157d Fix some rst syntax error messages and refresh html docs. 2014-03-25 11:36:47 +04:00
Warmist 69b279e553 readme fixes and image additions 2014-03-25 11:30:04 +04:00
jj 47ccecc7dc scripts/lever: allow commands without calling "list" first 2014-03-24 17:53:10 +01:00
Alexander Gavrilov 9c0fb61fd1 Fix the default submodule paths to point at the DFHack organization. 2014-03-24 20:28:35 +04:00
Alexander Gavrilov 36b069e981 Merge remote-tracking branch 'warmist/dev-cmdprompt' into develop 2014-03-24 20:10:58 +04:00
Alexander Gavrilov ec14b2d1e9 Merge remote-tracking branch 'warmist/dev-modmanager' into develop 2014-03-24 20:07:02 +04:00
Alexander Gavrilov a01939fce6 Sync structures. 2014-03-24 19:45:27 +04:00
Alexander Gavrilov dde0f194e8 Add a script that clones the currently selected military uniform.
To be precise, it applies to the entity uniform templates, not
uniforms for specific squad positions.
2014-03-24 19:39:34 +04:00
Alexander Gavrilov 827dd121d8 Make createitem default to the controlled unit in adventure mode. 2014-03-24 19:35:34 +04:00
Alexander Gavrilov 6e338d96e9 Merge branch 'siege-quality' into develop 2014-03-24 19:33:52 +04:00