expwnent
|
723d6af9f8
|
Merge https://github.com/Mchl/dfhack into develop. Manually remove trailing whitespace, update NEWS.
Conflicts:
scripts/forum-dwarves.lua
|
2014-11-15 15:33:48 -05:00 |
|
expwnent
|
15194613f5
|
Manually add hobotron's superdwarf fix.
|
2014-11-15 15:23:00 -05:00 |
|
expwnent
|
3021fa47db
|
Merge remote-tracking branches 'jjyg/develop', 'putnam/patch-4' and 'eswald/blank-histories' into develop
Conflicts:
NEWS
|
2014-11-15 15:07:20 -05:00 |
Putnam3145
|
2cc59b44ec
|
Update Contributors.rst
|
2014-11-15 00:06:59 -08:00 |
|
expwnent
|
23b76d4672
|
Update NEWS.
|
2014-11-15 00:24:02 -05:00 |
|
expwnent
|
a04ea52e19
|
Added Putnam's gaydar script.
|
2014-11-15 00:22:58 -05:00 |
|
expwnent
|
ba8b964f8d
|
reaction-trigger-transition.lua should work now.
|
2014-11-15 00:06:10 -05:00 |
|
expwnent
|
59ef4e0cc2
|
It is now possible to remove syndromes by SYN_CLASS.
|
2014-11-14 23:33:49 -05:00 |
|
expwnent
|
5e3bf9a494
|
Make it compile for OSX.
|
2014-11-14 22:21:03 -05:00 |
|
expwnent
|
4464d7318d
|
EventManager: make REPORT events only trigger for new reports, not ones that already exist in the save.
|
2014-11-14 22:07:48 -05:00 |
Eric Wald
|
26ab2165b3
|
Updating NEWS
|
2014-11-14 18:58:57 -07:00 |
|
Eric Wald
|
c85d4994cf
|
Preventing blank history files
|
2014-11-14 17:35:06 -07:00 |
|
expwnent
|
c7e0a13505
|
Merge branch 'adaptation-4015' of https://github.com/hobotron-df/dfhack into develop
Conflicts:
NEWS
|
2014-11-14 19:06:04 -05:00 |
expwnent
|
d120e5aa84
|
Merge pull request #386 from ace13/develop
Missing includes.
|
2014-11-14 18:59:53 -05:00 |
|
expwnent
|
a474bc4dea
|
Merge remote-tracking branch 'dfhack/develop' into develop
Conflicts:
NEWS
|
2014-11-14 18:58:21 -05:00 |
|
expwnent
|
f9985ade7b
|
Update NEWS.
|
2014-11-14 18:57:09 -05:00 |
|
expwnent
|
c40c4460ba
|
Merge remote-tracking branch 'putnam/fullhealfix' into develop
Conflicts:
NEWS
|
2014-11-14 18:56:21 -05:00 |
|
expwnent
|
428fe6a400
|
interaction-trigger tweaks
|
2014-11-14 18:50:19 -05:00 |
|
expwnent
|
e2f4d3e4cb
|
Fix persist-table so that all data is persistently stored properly.
|
2014-11-14 18:49:40 -05:00 |
|
expwnent
|
38c4edf858
|
Merge pull request #388 from Putnam3145/add-thought
Add "add-thought" script to main repo
|
2014-11-14 16:05:38 -05:00 |
|
expwnent
|
0642333f97
|
Merge pull request #343 from PeridexisErrant/exportlegends-sites
exportlegends can do site maps, IDd field
|
2014-11-14 16:05:06 -05:00 |
Yoann Guillot
|
8042c5d342
|
ruby: load arch-specific ruby-autogen
|
2014-11-14 12:49:08 +01:00 |
|
Yoann Guillot
|
696380e749
|
ruby: distinguish ruby-autogen.rb name based on architecture
|
2014-11-14 12:47:42 +01:00 |
|
Yoann Guillot
|
e2229f6a6a
|
ruby: remove DL_RUBY cmake option
|
2014-11-14 12:38:24 +01:00 |
hobotron-df
|
a6b7d6beeb
|
New script for viewing or setting cavern adapation of citizens.
|
2014-11-13 12:13:23 -06:00 |
|
Putnam3145
|
9f6a04db7f
|
Switched subthought and severity in function arg
|
2014-11-12 13:55:38 -08:00 |
|
Putnam3145
|
4ccd4a96be
|
Updated add-thought to allow subthoughts.
Only works in non-gui mode for now, since there's no easy way to tell people what subthought is which with the GUI.
|
2014-11-12 13:54:44 -08:00 |
|
Putnam3145
|
ce09e1a70f
|
Update NEWS.
|
2014-11-10 01:46:23 -08:00 |
|
Putnam3145
|
f980ecf38d
|
Added add-thought to scripts.
I figure that it's useful enough and good enough by this point to be
included.
|
2014-11-10 01:44:30 -08:00 |
|
Putnam3145
|
3a403d8ec6
|
Updated full-heal to properly use args system.
Also updated NEWS.
|
2014-11-10 01:09:15 -08:00 |
|
expwnent
|
828852c36f
|
Made persist-table correctly clear its stuff after exiting a game.
|
2014-11-10 01:09:50 -05:00 |
|
expwnent
|
593424cd6d
|
new Lua library for persistent maps of arbitrary degree.
|
2014-11-10 01:03:20 -05:00 |
|
expwnent
|
6220a21de6
|
More straggling documentation errors in modtools.
|
2014-11-09 18:39:23 -05:00 |
|
expwnent
|
55348e9c80
|
Correct reaction-trigger documentation.
|
2014-11-09 18:37:39 -05:00 |
|
expwnent
|
838bbd97f6
|
New devel scripts for testing interaction-trigger.
|
2014-11-09 18:37:11 -05:00 |
|
expwnent
|
779ac3fd50
|
Updated interaction-trigger to work better.
|
2014-11-09 18:36:21 -05:00 |
Alexander "Ace" Olofsson
|
d2039386b0
|
Add <algorithm> includes and use min/max to get them into global scope
|
2014-11-09 11:20:09 +01:00 |
|
Alexander "Ace" Olofsson
|
be1d411b83
|
Add missing <functional> include for std::greater
|
2014-11-09 11:19:51 +01:00 |
|
Alexander "Ace" Olofsson
|
804aa8d398
|
Add missing <algorithm> include for std::min & std::max
|
2014-11-09 11:19:40 +01:00 |
|
expwnent
|
3f82230685
|
Update NEWS.
|
2014-11-09 01:46:31 -05:00 |
|
expwnent
|
0f5efb47ae
|
Update to 0.40.15.
|
2014-11-09 01:30:43 -05:00 |
|
expwnent
|
1b0a2ecb8a
|
Merge remote-tracking branch 'eswald/tradescreen' into develop
Conflicts:
NEWS
|
2014-11-09 00:42:50 -05:00 |
|
expwnent
|
7549169cd2
|
Merge remote-tracking branch 'dfhack/develop' into develop
|
2014-11-09 00:39:40 -05:00 |
|
expwnent
|
c9cf94128e
|
Merge pull request #376 from lethosor/mousequery-z-level-fix
Fix selection behavior of mousequery on lowest z-level
|
2014-11-09 00:37:46 -05:00 |
|
expwnent
|
f6a281ebc7
|
Merge pull request #379 from Putnam3145/teleport-update
Updated teleport for new args system.
|
2014-11-09 00:35:33 -05:00 |
|
expwnent
|
6167f37e13
|
Merge pull request #380 from lethosor/update-export-dt-ini
Update export-dt-ini.lua
|
2014-11-09 00:35:04 -05:00 |
|
expwnent
|
267d0837ad
|
Merge pull request #381 from lethosor/update-cmakelists
Re-enable rendermax in CMakeLists.txt
|
2014-11-09 00:34:23 -05:00 |
|
expwnent
|
7929d44030
|
Merge pull request #382 from PeridexisErrant/autolabor-fixes
Autolabor fixes
|
2014-11-09 00:33:46 -05:00 |
|
expwnent
|
8e492b1669
|
Merge pull request #384 from lethosor/dwarfmonitor-0.40.14+
Make dwarfmonitor compile for 0.40.14+
|
2014-11-09 00:33:14 -05:00 |
|
expwnent
|
c154404a89
|
Merge pull request #385 from lethosor/automaterial-cursor
Fix automaterial/box-select cursor color
|
2014-11-09 00:32:32 -05:00 |