cc9cii
1365b8edd1
Fix typo.
2015-09-12 11:18:07 +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
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
Marc Zinnschlag
584a7a66b9
various minor fixes
2015-09-10 12:41:31 +02: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
a8dc1c1198
merge land tables
2015-09-03 16:15:00 +02:00
Marc Zinnschlag
85f6bb892b
removed indirection in OpenMW-CS land record
2015-08-31 18:13:27 +02:00
Marc Zinnschlag
69b9eadb52
refactored loading of land data
2015-08-31 16:13:26 +02:00
Marc Zinnschlag
febf611c82
made return type of ESMTerrain::Storage::getLand const
2015-08-31 14:17:11 +02:00
Marc Zinnschlag
69045d7ec9
additional safety check for land texture listing merge stage
2015-08-31 11:10:58 +02:00
Marc Zinnschlag
890bbb6b11
merge land texture tables
2015-08-30 14:27:22 +02:00
Marc Zinnschlag
b7983d08ba
fixed merge stage order; added proper initialisation
2015-08-30 11:08:56 +02:00
Marc Zinnschlag
a97a632aa7
merge references tables
2015-08-26 17:21:24 +02:00
Marc Zinnschlag
845cafd61c
fixed record state issues after merge
2015-08-25 12:40:40 +02:00
Marc Zinnschlag
f95950e8d8
merge referenceables table
2015-08-25 11:54:16 +02:00
Marc Zinnschlag
9cf793c0b5
silenced a warning
2015-08-25 11:39:43 +02:00
Marc Zinnschlag
40753aa9a3
simplifying merge stage
2015-08-25 08:43:03 +02:00
Marc Zinnschlag
16dda281ce
made merge operation more fluent
2015-08-23 13:04:42 +02:00
Marc Zinnschlag
103073150e
added info tables and pathgrid table to merge operation
2015-08-23 12:58:49 +02:00
Marc Zinnschlag
c92898a5bc
flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)
2015-08-23 12:37:45 +02:00
Marc Zinnschlag
e76401d5ea
Merge remote-tracking branch 'smbas/fix-opencs-bugs'
2015-08-23 12:15:19 +02:00
Stanislav Bas
ba4b7df99d
Add missing includes to columnimp.hpp
2015-08-22 16:35:00 +03:00
Stanislav Bas
720aca8f3d
Inform about State change (not a whole row) when modifying a table value
2015-08-22 16:34:57 +03:00
Stanislav Bas
4d24eff859
Show race only when mesh type is Skin (in BodyParts table)
2015-08-22 16:34:54 +03:00
Stanislav Bas
6d81ca07b5
Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData()
2015-08-22 16:34:45 +03:00
scrawl
32ad8c86bf
Fix the ESM::LandTexture NAME being discarded on loading
2015-08-22 13:10:54 +02:00
scrawl
031d64d0d3
Adjust OpenCS saving stages order to stop vanilla MW complaining about missing records
2015-08-22 12:57:39 +02:00
Stanislav Bas
b7295e2632
Columns with Display_Boolean use Combobox editor even for non-boolean values
2015-08-21 22:36:53 +03:00
Stanislav Bas
aeb1acca51
Remove enum names for AiWanderRepeat column
2015-08-21 22:05:40 +03:00
Stanislav Bas
e14aedc7cd
ModifyCommand uses a proper name of a modified nested value
2015-08-21 21:47:29 +03:00
Stanislav Bas
d038ac2da0
Sort tables by ID in the ascending order initially
2015-08-21 21:38:28 +03:00
Marc Zinnschlag
3902513e65
merge id collections
2015-08-21 14:02:32 +02:00
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-08-18 23:06:12 +02:00
scrawl
d1e1c0f38b
Editor: fix a typo in ESM::Light flag mappings
2015-08-16 23:42:08 +02:00
Marc Zinnschlag
47dd9505a9
copy meta data from game file when merging
2015-08-16 18:27:17 +02:00
Marc Zinnschlag
1b663f01af
create merged document and open a view for it (document is still empty at this point)
2015-08-16 15:24:48 +02:00
Marc Zinnschlag
5558962b14
Merge remote-tracking branch 'scrawl/editor_creatureflag'
2015-08-16 10:13:11 +02:00
Marc Zinnschlag
8bb28c3236
Merge remote-tracking branch 'corristo/osx-hidpi'
2015-08-16 10:06:38 +02:00
Nikolay Kasyanov
dbcce482a6
OS X: enable high resolution mode for OpenMW & OpenCS
...
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
2015-08-15 22:37:09 +02:00
scrawl
e36ebc77d5
Editor: remove creature flag of unknown purpose from the UI
2015-08-15 18:39:00 +02:00
scrawl
c07ced4c8f
Editor: fix magic effect magnitudes incorrectly labelled as Min/Max Range
2015-08-13 17:01:25 +02:00
Marc Zinnschlag
d8655f2ff8
forgot to connect merge operation signals
2015-08-13 14:49:32 +02:00
Marc Zinnschlag
e2377396a7
inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan)
2015-08-13 12:53:00 +02:00
Marc Zinnschlag
904ad94952
added merge operation (doesn't do anything yet)
2015-08-13 12:03:20 +02:00