49bb468a0d
Added scripts/modtools/interaction-trigger.
2014-07-03 06:02:39 -04:00
d048335a80
Tweaked item-trigger.
2014-07-03 06:01:58 -04:00
ebde2c2094
Update triggers to deal with nonsilent dfhack.run_command.
2014-07-01 02:15:38 -04:00
9a4fd03e42
added anonymous-script.lua so item/reaction-trigger commands do not have to make a file for every trigger for simple operations
2014-07-01 01:38:56 -04:00
2ed7960f96
Tweaked utils.lua::processArgs to allow specification of a table of acceptable argument names.
2014-07-01 00:55:52 -04:00
f4c948054e
Tweaked item-trigger.
2014-07-01 00:02:19 -04:00
f58e659193
item-trigger: trigger scripts based on equipping items, unequipping items, and striking enemies with items. Select item by type, material, or by *contaminant* material.
2014-06-30 08:16:10 -04:00
801d521093
reaction-trigger now uses standard args.
2014-06-30 04:29:42 -04:00
c2890173d0
invasion-now is redundant with force, so I removed it.
2014-06-30 04:07:33 -04:00
cd9abacf34
Made modtools/force use standard argument processing.
2014-06-30 04:06:25 -04:00
5811f07a1f
attackTrigger -> attack-trigger
2014-06-30 03:42:56 -04:00
1a9f9374de
attackTrigger now uses standard arguments.
2014-06-30 03:41:23 -04:00
10c001b1f4
Moved outside-only where it belongs.
2014-06-30 03:18:12 -04:00
0aa2dc149f
Converted outsideOnly plugin to Lua script.
2014-06-30 02:21:58 -04:00
ed90ccf5ea
Added reaction-trigger.lua to replace autoSyndrome.
2014-06-29 06:12:54 -04:00
a54ad7e5a0
Moved attackTrigger where it belongs.
2014-06-28 23:00:40 -04:00
19310c32b3
Merge remote-tracking branch 'origin/scriptOrganization' into scriptOrganization
2014-06-28 22:57:47 -04:00
8a3050a1c0
Notify the user when dfhack.init is missing, and fall back to example.
2014-06-28 17:08:14 +04:00
72acd7bdf6
attackTrigger: call scripts when a unit attacks another with weapons of a given type or weapons of a given material.
2014-06-28 04:39:04 -04:00
f12aa3665b
Removed the temporary lua events because EventManager does them better.
2014-06-28 02:46:08 -04:00
9a8b1d04fa
Added functionality to repeat.lua so that you can make the thing that's repeating not happen right away.
2014-06-27 06:23:04 -04:00
2827861edf
Fixed minor error in growthbug.
2014-06-27 06:09:01 -04:00
0db0244d08
Added add-syndrome script to modtools and fixed syndromeUtil so it actually works. This should make it so that event hooks only have to be able to run scripts instead of run scripts and add syndromes.
2014-06-27 05:47:52 -04:00
0f5bbd5631
Reorganized scripts folder. Deleted digmat.rb because it's redundant with digSmart and it has a higher FPS impact.
2014-06-27 03:46:22 -04:00
187ce3c58b
Fixed the organization of my new lua modules. They now go in library/lua instead of where plugin lua modules go. Updated scripts accordingly.
2014-06-27 02:43:05 -04:00
61d73cc6c2
Prevented infinite loop on incorrect syntax in repeat script.
2014-06-27 01:46:00 -04:00
66098c2bb4
Fixed wrong documentation on repeating scripts.
2014-06-27 01:40:36 -04:00
596ab0e1b8
Added many forum scripts, and a makeshift onReport/onStrike event that will be merged into eventful/EventManager later.
2014-06-26 08:36:57 -04:00
49bbd41bc3
Added a way to change the mod install directory (and changed the default to hack/mods) and added simpler way to add to init.lua
2014-06-02 17:57:59 +03:00
e4a6f13347
Merge branch 'cleanup-needs-porting' into develop
2014-05-12 21:56:23 +04:00
a6d576961d
Merge branch 'add-exportlegends-and-logregion' into develop
2014-05-12 21:51:03 +04:00
01d302efc3
fixed whitespace again to four-space indentations
...
should have read the documentation before trying a style fix...
2014-05-12 10:34:57 +10:00
8a488ec914
actually fixed whitespace
...
to four-space indentations. I should have read the documentation
earlier...
2014-05-12 10:32:46 +10:00
a2f5e971e2
fixed whitespace in dfstatus script
...
all indents now use a uniform eight spaces; fixed from mix of four
spaces and tabs
2014-05-12 10:29:59 +10:00
795325b6ef
replace all tabs with eight spaces
...
apparently an important style thing, which I missed
2014-05-12 10:22:04 +10:00
ae8d630cfa
Merge remote-tracking branch 'warmist/dev-rendermax' into develop
2014-05-11 15:44:29 +04:00
acdf90c1ba
fixed dfstatus script, readme and init entries
...
replaced magic numbers in dfstatus script with `df.item_type.TOKEN`;
added dfstatus to readme and init_example; myself to contributors list,
updated needs_porting notes and removed script
2014-05-07 12:26:18 +10:00
26c2d0e16b
added two scripts
...
Added scripts `exportlegends` and `log-region`, including init and
readme entries. The init file now has a section for legends-mode
keybindings.
2014-05-05 14:59:59 +10:00
13584f08c5
Merge remote-tracking branch 'warmist/dev-buildings' into develop
2014-05-04 19:52:01 +04:00
b76ededc1b
Merge branch 'undump' of git://github.com/eswald/dfhack into develop
2014-05-04 18:32:29 +04:00
9733b30ed6
gui/gm-editor: Fixed enum editing. And added free pointer/reinterpret options
2014-05-01 10:59:21 +03:00
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
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
ee4e3a6168
Use the new official gamelog output function in soundsense-season.
2014-04-15 19:50:23 +04:00
22dab5d807
Update XML, fix several scripts that were broken by field name changes
2014-04-14 12:30:34 -05:00
fccdbb010d
Update mod-manager.lua
...
Fixes fileExists not working.
2014-04-08 09:07:49 +03:00
47ccecc7dc
scripts/lever: allow commands without calling "list" first
2014-03-24 17:53:10 +01:00
ec14b2d1e9
Merge remote-tracking branch 'warmist/dev-modmanager' into develop
2014-03-24 20:07:02 +04:00
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
4ce951f5b9
light.lua: more help, changed screen exit key to '`'. Made it recalculate only when needed.
2014-03-07 19:58:29 +02:00
1ce43c6cc4
Light now fallsoff according to tile contents (water for now only)
2014-03-07 19:58:29 +02:00
446b4b9d50
New line algo for lights
2014-03-07 19:58:28 +02:00
6e57c6446d
Added light script. Can be ran with "static" to recalculate only on '~' press.
2014-03-07 19:58:26 +02:00
64ff24f27f
Added building filter to advfort.
2014-03-07 19:58:21 +02:00
a52451a97a
eventful: added support for custom workshops and a convenience function to interpose side panel generation
2014-03-07 19:41:50 +02:00
ef93f2ea4c
Compute quality of siege engines and use it to extend firing range.
...
Since parts aren't there until it is built, it requires checking that.
2014-03-07 17:34:21 +04:00
b030548156
Added directory listing to lua api (internal category).
...
added mod manager and updated readme/news
2014-03-04 18:01:44 +02:00
dd268d43d9
Merge branch 'master' of https://github.com/jjyg/dfhack
2014-02-27 15:49:18 -06:00
5a158b21cf
Update plugins to match fixed field names in cage/civzone
2014-02-27 14:51:45 -06:00
2e680c4c2c
autounsuspend: check water level, make df recheck jobs on unsuspend
2014-02-27 17:38:34 +01:00
3cd0c3aad0
exterminate: add caste specifier
2014-02-26 23:56:53 +01:00
6af362db39
add scripts/devel/spawn-unit-helper.rb
2014-01-04 01:55:48 +01:00
9dc9a3f33a
digfort: add start() comment
2013-10-30 15:27:51 +01:00
6546ed2d5a
scripts/digfort: better csv handling
2013-10-30 14:31:33 +01:00
237251ce0c
Merge remote-tracking branch 'jjyg/digmat' into 0.34.11-r4
...
Conflicts:
Readme.rst
2013-10-24 19:39:40 -04:00
ee056f4422
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
...
Conflicts:
NEWS
2013-10-20 11:09:40 -04:00
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
a1d54e2074
digmat: ignore map borders and damp/warm stone
2013-10-14 00:39:32 +02:00
2bcd02ce96
add digmat script
2013-10-11 19:20:59 +02:00
3cfbb13afd
Support arbitrary expressions in perlin noise rendering script.
2013-10-10 12:15:50 +04:00
ccc1d936df
Add a Perlin noise test script.
2013-10-02 20:00:03 +04:00
864baa2241
Fix the lua script not printing any errors if executing a file fails.
2013-10-01 18:58:56 +04:00
56e25bfa12
Documented invasion-now, moved it from devel scripts, and documented digSmart in readme.
2013-06-25 19:34:13 -04:00
e15f5c451f
Fix search for cur_season_tick and cur_season in devel/find-offsets.
...
It seems the one-off error is a problem with the original
save I used, and not the result of some general behavior.
2013-06-20 18:18:02 +04:00
21dc3afede
Find cur_year_tick_advmode in devel/find-offsets.lua
2013-06-20 17:20:04 +04:00
5c827beae0
invasion-now: script to trigger invasions.
2013-05-31 15:54:25 -04:00
89d91eddb6
Add & correct offsets for splintermind-attributes
2013-05-11 13:08:01 -04:00
cafa966be4
Subtract the ASLR rebase delta in the export-dt-ini script.
2013-05-09 18:58:52 +04:00
29c77ff85a
Add entries to match splintermind-attributes DT
...
The added address/offset entries correspond to those found in the
splintermind-attributes branch of Dwarf Therapist for Dwarf Fortress v0.34.11
SDL (windows).
These entries can be found the following location:
https://code.google.com/r/splintermind-attributes/source/detail?spec=svneeeac8544d94c133ef2eb7c9a4ef8f2865906b19&r=614f1a76b56a081048626e3acaa5c87bcd313fef
under etc/memory_layouts/windows/v0.34.11_graphics.ini
2013-05-08 15:39:32 -04:00
f415256650
Better way to check for the contained_items field.
2013-05-05 16:48:12 -06:00
c496b9f76a
Translate make-dt.pl from df-structures into lua to avoid lisp dependency.
2013-05-01 14:43:00 +04:00
578b178ac0
scripts/startdwarf
2013-04-30 18:38:51 +02:00
ab4a38415a
Building base material undump script.
...
Based on an idea in https://github.com/peterix/dfhack/issues/119
2013-04-24 11:22:19 -06:00
f5ef1464d8
Merge https://github.com/warmist/dfhack
2013-04-24 17:38:47 +02:00
2e379c4d3f
Merge https://github.com/Falconne/dfhack
...
Conflicts:
plugins/CMakeLists.txt
plugins/stonesense
2013-04-24 17:24:03 +02:00
024a3d766b
Added some more commands to autobutcher UI script.
...
Changed autobutcher behavior a bit:
now protected units count towards the target quota,
units available for adoption are considered as protected.
Added filters for caged, male and female to assignement UI
for cages, pastures and pits.
2013-04-24 23:37:05 +12:00
fd265b37d6
Added lua GUI front-end for autobutcher.
2013-04-24 23:37:05 +12:00
ba4f649b3c
scripts: switch to windows lineendings
2013-04-21 14:21:53 +02:00
d7f5f06d18
fix/stuckdoors: handle prone units + items too
2013-04-21 11:27:35 +02:00
fce4a2d21a
drainaquifer: improved clearing
2013-04-21 10:56:09 +02:00
3d82629da9
rename magmasource to source, add water+drain capabilities
2013-04-16 23:25:53 +02:00
d8c140602b
locate-ore: add message
2013-04-14 02:20:22 +02:00
2375f12fb7
add multicmd script
2013-04-12 15:23:16 +02:00
2776123274
add scripts/devel/unforbidall and scanitemother
2013-04-08 23:16:49 +02:00
3da85a2134
exterminate: add butcher mode
2013-04-03 00:57:50 +02:00
a7bd2e97ab
add scripts/locate-ore
2013-03-31 16:12:42 +02:00
5cce67eca7
changed weapon skill check. Might allow tools too?
2013-03-21 11:50:14 +02:00
216cc7f1e9
Carving of tracks added.
2013-03-19 21:49:35 +02:00
3567bb7299
exterminate: fix gender detection
2013-03-19 18:35:06 +01:00
2c0d88a372
exterminate him: complain if its a she
2013-03-19 11:31:34 +01:00
8733e77245
autofarm enable parameter
2013-03-17 13:47:08 +01:00
101ab2b301
Fix soundsense-season printing error messages in worldgen.
2013-03-16 12:15:55 +04:00
96e7b02127
autofarm: minor tweaks
2013-03-16 03:06:28 +01:00
dad485e5e1
update doc
2013-03-16 01:46:31 +01:00
b74f08c4f8
scripts/masspit
2013-03-16 01:37:06 +01:00
87b8dc137d
scripts/exterminate: nicer error message on invalid race
2013-03-16 01:36:49 +01:00
cc5d354a59
Merge branch 'master' of github:jjyg/dfhack
2013-03-16 01:04:29 +01:00
381247dc39
rename scripts/slayrace -> exterminate
2013-03-16 01:02:28 +01:00
42e9d77e95
scripts/create-items: spawn anvils too
2013-03-15 14:21:01 +01:00
3ed5f06f49
Fix for eventful and a advfort not to show worn items.
2013-03-09 12:54:07 +02:00
5be2ecb080
advfort.lua: added BuildLast for mass building of e.g. walls etc.
2013-03-06 00:22:59 +02:00
54046c74da
advfort: added site name display.
2013-03-03 17:33:07 +02:00
177e45bdd8
Improve fix/cloth-stockpile performance by 30% by reducing garbage.
2013-02-14 13:13:25 +04:00
5df338d167
Merge https://github.com/warmist/dfhack
2013-02-14 09:20:26 +01:00
39dbaf743a
Add a script to fix cloth stockpiles by patching memory objects.
...
This patching needs to be done every time raws are reloaded.
2013-02-13 13:54:49 +04:00
e707d4552f
advfort.lua: small bugfix for butcher.
2013-02-05 07:21:44 +02:00
12c5f9c779
Merge https://github.com/ab9rf/dfhack
2013-02-05 05:34:19 +01:00
99ec3d9841
gm-editor: Fixed bug with arrays with number indexes.
2013-01-13 22:07:10 +02:00
87d79b1119
advfort: is sand bearing fix for glass making, is corpse fix for butchering (todo dissasemble and see how it works really)
2013-01-06 18:58:58 +02:00
838e13a80e
Make monarch script, for changing who is king/queen
2013-01-05 20:06:22 +02:00
4d731d0c28
advfort:
...
added buildings with width/height/direction (TODO better gui)
added farming (planting/harvesting)
added clean job
2013-01-05 01:41:44 +02:00
7debd3d983
Autofarm: correct incorrect logic for determining if a farm is surface or subterranean
2013-01-04 13:20:28 -06:00
8ffafd8a26
advfort:
...
reverted to old way of reseting the menu, added setup for race/civ/group ids and main.fortress_entity.
2013-01-04 00:48:24 +02:00
179c7ae32a
advfort:
...
reset using df button.
2013-01-03 23:53:42 +02:00
e3ca612ed5
many improvements to advfort:
...
fixed being able to engrave soft materials, started using ui_buttons for better workshop functionality, started working on manual item assignment
2013-01-03 23:21:57 +02:00
e4f4943b10
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-12-23 12:34:05 +02:00
4af6b728b7
Small fix to gm-editor. Added proj_itemst and proj_unitst to eventful. Now you can make custom projectiles (e.g. rockets?)
2012-12-15 13:27:16 +02:00
19ff6962bc
slayrace: typo
2012-12-13 01:47:58 +01:00
75ad052ac9
move create-items out of devel/, add Readme entry
2012-12-13 01:00:53 +01:00
723ff7d632
slayrace: target undeads, ignore chained creatures, fix magma column mode going through floors
2012-12-13 01:00:49 +01:00
722ed79a98
stripcaged: allow shortened arguments
2012-12-12 18:11:56 +01:00
ddceabbfb7
Merge branch 'master' of git://github.com/jjyg/dfhack
2012-12-12 18:58:11 +02:00
7315f8cec4
scripts/devel/create-items.rb
2012-12-12 16:43:34 +01:00
662d3101c7
ruby: fix onupdate tick limiting + advmode, add pageprotect, add :script_finished
2012-12-11 17:25:51 +01:00
6bc791d985
follow df-structure rename unit.unknown8 + able_stand_*
2012-12-10 22:50:33 +01:00
0403e008d5
deathcause: show more info for non histfigs
2012-12-10 17:48:53 +01:00
bd4f49598d
Yet again forgot to disable debug spam.
2012-12-10 07:23:05 +02:00
bd368ea81c
Added check for reaction class items
2012-12-10 00:14:05 +02:00
ff4278d04e
Removed debug spam, added support for "HAS_MATERIAL_REACTION_PRODUCT" type reactions.
2012-12-09 23:07:13 +02:00
6c4f163a5e
Merge branch 'master' of https://github.com/angavrilov/dfhack
...
Conflicts:
NEWS
2012-12-09 14:25:31 +02:00
4f5fdebbe9
furnaces added and custom reactions.
2012-12-09 00:53:03 +02:00
10667dfb9e
Make the inspect screen background look more sane on some tilesets.
...
Namely where ' ' is not totally transparent.
2012-12-08 14:45:17 +04:00
6fd306b558
Add tiles colored separately by fg and bg in inspect-screen.
2012-12-08 09:51:09 +04:00
99e9785826
Add a script for inspecting screen tile parameters.
2012-12-07 18:10:24 +04:00
c174998fec
Advfort: added ability to put items on table or in buildings that can hold them.
2012-12-06 18:27:54 +02:00
885059c887
Add a script to expose the correct season to soundsense on world load.
2012-12-06 19:00:48 +04:00
126c31684e
deathcause: ghosts are dead
2012-12-06 13:43:58 +01:00
9a6eff0370
deathcause: allow selection from unitlist screen
2012-12-06 13:00:33 +01:00
3bce3838af
Advfort now supports workshops and siege weapons >:)
2012-12-03 21:49:17 +02:00
d9a5eefb9a
gm-editor fix: cursor remembers its position.
2012-12-03 21:48:23 +02:00
92503db505
Sanity check before showing gui.
2012-12-01 18:42:23 +02:00
397fdb00ae
Work started on adventurer workshops.
2012-12-01 18:20:27 +02:00
58239e97ed
Implement the history graph in the workflow status screen.
2012-12-01 16:50:03 +04:00
e5f509a994
autofarm: sync with changes to structures for df-item.xml
2012-11-30 20:51:40 -06:00
5d8adbc779
Merge branch 'master' of https://github.com/jjyg/dfhack.git
2012-11-30 11:15:15 -06:00
57233cb350
Merge branch 'master' of https://github.com/angavrilov/dfhack.git
...
Conflicts:
scripts/autofarm.rb (resolved with added bug correction)
2012-11-30 11:09:03 -06:00
9e30bf0dff
Autofarm: use player's actual seed stocks as basis for plantable seeds, instead of player entity's hypothetically plantable seeds. Avoids designating a plot for planting with seeds the player doesn't have.
2012-11-30 11:05:37 -06:00
0bfe006016
Try to reimplement the inventory monitor by falconne in lua.
...
For no other reason than to provide a complete example of lua
interface for a native plugin :)
TODO: paint the graph in the right pane.
2012-11-30 19:10:17 +04:00
9ed7a56202
deathcause: handle non-dead units
2012-11-30 15:50:35 +01:00
f8dea0e9f9
Autofarm: only try to plant things that have seeds.
2012-11-29 18:19:53 -06:00
0fb5ad7729
Some readme and bugfixes
2012-11-30 01:17:01 +02:00
c31b320722
Building now respects required items.
2012-11-30 00:02:03 +02:00
49de3fe237
Removed spam yet again...
2012-11-29 20:50:02 +02:00
471d15ba4c
New building selection dialog.
2012-11-29 20:49:16 +02:00
346b402a0f
Allow look up/down, unsuspend job if pressing wait with job.
2012-11-29 18:49:36 +02:00
f617d2844b
Fixed look exit and allow skip messages
2012-11-29 18:33:04 +02:00
184082b379
scripts/lever: fix for links to cage/support
2012-11-29 17:11:29 +01:00
3858fb320d
in Advfort- splint removeconstruction into building/construction removal.
2012-11-29 17:50:22 +02:00
5b53f07905
Real construction removal added.
2012-11-29 17:24:45 +02:00
2d4fc739ed
Removed console spam
2012-11-29 17:16:58 +02:00
7f23c1f55f
Added ability to look in advfort, moved to tiletypes and fixed most of predicates
2012-11-29 17:16:32 +02:00
5ea26d9cae
Only show the advanced new constraint dialog on Shift-Enter.
...
Upon reflection it is a bit too scary to be always shown.
2012-11-29 16:27:51 +04:00
364dd01142
Allowed moving up/down in advfort, now correctly checks for main weapon.
2012-11-29 12:41:27 +02:00
57b69da1f0
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-11-29 12:13:28 +02:00
f4d048526a
Moved advfort to gui subfolder
2012-11-29 12:10:25 +02:00
1226f5c990
Increased speed of adv-fort a lot, now filters keypresses to be more intuitive.
2012-11-29 11:56:05 +02:00
028b535598
removed used minw for labels
2012-11-29 11:13:26 +02:00
fe2fbe347c
Added advfort script, now you can have adventurer forts!!!!!
2012-11-29 02:26:10 +02:00
01966167f6
gm-editor updated to use widgets.
2012-11-28 21:13:42 +02:00
614225cc5f
follow rename itemst.flags.artifact1 -> artifact
2012-11-28 19:48:47 +01:00
3964c8a581
gm-editor, set field to lua return value.
2012-11-28 17:40:37 +02:00
e73274d281
ruby: add description field to onupdate_register
2012-11-24 16:10:55 +01:00
cb06c89698
stripcaged: dont list empty cages individually
2012-11-24 16:10:55 +01:00
b577bcde1a
scripts/lever: show pending jobs
2012-11-24 16:10:55 +01:00
8429f65176
add scripts/stripcaged.rb and documentation
2012-11-24 16:10:55 +01:00
fd9a4ffafa
script/lever: synchronize linked buildings as the game does
2012-11-22 03:17:41 +01:00
5f92561cd9
add scripts/lever, add binary patches section in NEWS file
2012-11-22 02:57:55 +01:00
364030f06b
Add unsuspend and autounsuspend scripts. The latter is especially useful when trying to build near aquifers. :)
2012-11-20 08:41:35 -06:00
79b6a8f9f9
Add autofarm script.
2012-11-20 08:40:42 -06:00
5ac8d3be82
Added option to region-pops script to additively augment populations.
2012-11-20 08:28:06 -06:00
f587d603e8
Allow the workflow goal gap in any range between 1..goal-1
2012-11-19 18:59:58 +04:00
66257cf24d
gm-editor now features alt+o to show field offset
2012-11-18 01:48:02 +02:00
2953e4c386
Implement a dialog to specify a workflow constraint with all features.
2012-11-17 20:32:39 +04:00
342badac98
scripts/superdwarf: advmode support
2012-11-16 17:59:42 +01:00
bbe94c006f
Update for temperaturest
2012-11-12 11:54:21 -06:00
7a3de785ec
Missed a few spots
2012-11-12 08:29:44 -06:00
bd75cad508
Support ! and ~ prefixes in the lua script, and edit readme.
2012-11-12 12:48:17 +04:00
6cf85b4318
Abstract the back-end from the binpatch script, and use in gui/assign-rack.
2012-11-12 12:26:31 +04:00
c32f85d637
Merge remote-tracking branch 'warmist/master'
...
Conflicts:
plugins/Dfusion/include/OutFile.h
2012-11-12 10:50:48 +04:00
ce8ada4419
More bug fixing
2012-11-11 22:14:00 +02:00
expwnent
Alexander Gavrilov
Warmist
PeridexisErrant
Quietust
jj
expwnent
Tareq A Khandaker
Eric Wald
Eric Wald
Petr Mrázek
Robert Heinrich
Kelly Martin