Marc Zinnschlag
ceada145ab
Merge remote-tracking branch 'origin/master'
2015-09-12 08:47:21 +02:00
Marc Zinnschlag
2c37731494
Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3'
2015-09-12 08:41:12 +02:00
dteviot
8e2fe1985d
Fixed errors pointed out by Zini.
...
1. Removed "Actor" from name of function isActorNearInactiveCell().
2. Corrected case of CoordinateConverter member function names.
2015-09-12 14:17:46 +12:00
cc9cii
1365b8edd1
Fix typo.
2015-09-12 11:18:07 +10:00
cc9cii
192f01e3ac
Set default creature scale to 1. Partially resolves bug #2880 . (no creature verifier yet)
2015-09-12 10:17:14 +10:00
cc9cii
45aee1b508
Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879 .
2015-09-12 10:15:32 +10:00
cc9cii
5a5e1a3b22
Add missing fields for editing creatures.
...
- Should resolve resolve bugs #2878 (level), #2901 (gold) and #2889 (health).
- Moved Soul, Combat, Magic and Stealth editing to dialogue only (to be consistent with editing NPCs)
2015-09-12 10:00:23 +10:00
cc9cii
c4a900ca2c
Rationalise the use of ColumnIds
2015-09-12 09:33:11 +10:00
cc9cii
258b2ba29a
Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique.
2015-09-12 09:04:43 +10:00
scrawl
5252dbcf1f
Add some comments to ESM::Land
2015-09-11 21:09:54 +02:00
Marc Zinnschlag
0ff786bebd
Merge remote-tracking branch 'origin/master'
2015-09-11 13:22:31 +02:00
Marc Zinnschlag
a445683312
Merge branch 'mergetool'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
2015-09-11 13:22:15 +02:00
Marc Zinnschlag
5be176ee85
disable on-demand loading of land data (for now, maybe)
2015-09-11 13:02:24 +02:00
Marc Zinnschlag
23fde87816
fixed an indexing error
2015-09-11 10:50:19 +02:00
dteviot
10eabc9d51
actorutil.hpp includes mwworld/ptr.hpp
...
As pointed out by Scrawl, fixes compiler error if getPlayer() is called before MWWorld::Ptr is defined, because getPlayer() returns a Ptr by value.
2015-09-11 18:43:06 +12:00
Marc Zinnschlag
584a7a66b9
various minor fixes
2015-09-10 12:41:31 +02:00
dteviot
6f97187bb6
Fix travis warning about no newline at end of file.
2015-09-10 22:26:33 +12:00
dteviot
573a14993a
Moved isActorNearInactiveCell() logic to own function.
...
Also, triggers when actor is near edge of cell, not when less than 1/2 way to edge.
2015-09-10 21:53:31 +12:00
dteviot
e9c796166a
Added MWMechanics::isPlayerInCombat()
2015-09-10 18:48:34 +12:00
scrawl
84e1801bbc
Merge pull request #751 from swick/master
...
adjust FindMyGUI.cmake to correctly handle REQUIRED and QUIETLY
2015-09-09 14:44:43 +02:00
scrawl
cd0f8e556b
Merge pull request #753 from slothlife/thunderstorm-support
...
Improve thunderstorm support.
2015-09-09 14:44:36 +02:00
slothlife
29d74f0249
Improve thunderstorm support.
...
Reversed settings for thunderstorms. Added thunder support to all
weather types. Implemented a simple lightning flash effect similar to
MW.
2015-09-08 22:05:33 -05:00
Marc Zinnschlag
09ec60fe2a
handle missing land texture records properly during merge
2015-09-08 16:01:34 +02:00
Marc Zinnschlag
73f6efddcc
fixed a texture indexing bug (only affects the editor)
2015-09-08 15:33:15 +02:00
Marc Zinnschlag
353d6973e2
Merge remote-tracking branch 'origin/master'
2015-09-08 08:27:00 +02:00
cc9cii
904f9871cc
Merge pull request #9 from cc9cii/master-cherry-pick-2
...
Master cherry pick 2
2015-09-08 07:55:29 +10:00
scrawl
b98a076055
Add documentation for ACTN ess-record (activation flags)
2015-09-07 23:27:14 +02:00
Stanislav Bas
ca14d6a8a8
Add missing includes to columnimp.hpp
2015-09-08 06:48:04 +10:00
Stanislav Bas
859ba93739
Inform about State change (not a whole row) when modifying a table value
2015-09-08 06:47:50 +10:00
Stanislav Bas
b53a77389b
Show race only when mesh type is Skin (in BodyParts table)
2015-09-08 06:47:34 +10:00
Stanislav Bas
3a41fe5024
Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData()
2015-09-08 06:46:32 +10:00
Stanislav Bas
68013bd324
Columns with Display_Boolean use Combobox editor even for non-boolean values
2015-09-08 06:46:21 +10:00
Stanislav Bas
8c07d7f252
Remove enum names for AiWanderRepeat column
2015-09-08 06:46:10 +10:00
Stanislav Bas
214f3e5b9b
ModifyCommand uses a proper name of a modified nested value
2015-09-08 06:45:58 +10:00
Stanislav Bas
29536751f5
Sort tables by ID in the ascending order initially
2015-09-08 06:45:45 +10:00
scrawl
402f1ff5d8
Fix the ESM::LandTexture NAME being discarded on loading
2015-09-08 06:42:45 +10:00
scrawl
d1601feb39
Adjust OpenCS saving stages order to stop vanilla MW complaining about missing records
2015-09-08 06:42:34 +10:00
scrawl
f8f66bffb0
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-09-08 06:40:06 +10:00
scrawl
dae2588c88
Editor: fix a typo in ESM::Light flag mappings
2015-09-08 06:37:31 +10:00
scrawl
1d2f4c8cfe
Editor: remove creature flag of unknown purpose from the UI
2015-09-08 06:35:58 +10:00
scrawl
34561379bc
Editor: fix magic effect magnitudes incorrectly labelled as Min/Max Range
...
Conflicts:
apps/opencs/model/world/columns.hpp
2015-09-08 06:34:56 +10:00
cc9cii
2f372a79b9
Remove additional instance of Display_YesNo (in cc9cii branch but not in master)
2015-09-08 06:31:38 +10:00
scrawl
0442bc98f3
Update sleep interruption formula according to wiki, thanks Hrnchamd
2015-09-07 22:31:11 +02:00
taras.kudryavtsev
0f2ea57648
#2730 and #2725
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
2015-09-08 06:29:25 +10:00
Stanislav Bas
f0982c87ba
Remove check for an empty Particle from Magic effects verifier
2015-09-08 06:20:59 +10:00
Stanislav Bas
11f5a928db
Don't allow empty value of School field in Magic Effects table
2015-09-08 06:20:41 +10:00
Stanislav Bas
ef02bc657f
Add magic effect verifier
2015-09-08 06:20:25 +10:00
Arthur Moore
a7befc1f0a
Removed now unneeded script
2015-09-08 06:19:08 +10:00
Arthur Moore
28bc0cca6c
Cleaned up niftest's output
...
A bad file inside of a bsa archive now looks like:
<game dir>/Data Files/TR_Data.bsa/meshes/tr/x/tr_act_ind_mark_alm.nif
2015-09-08 06:18:51 +10:00
Arthur Moore
8b48fe1cad
niftest now scans BSA files in directories for nif errors
...
The program is explicit so the user knows exactly where the bad file is.
2015-09-08 06:18:35 +10:00
