cc9cii
889749a493
Allow non-empty mOriginalCell (case where a moved ref is moved again)
2015-04-26 15:44:40 +10:00
cc9cii
b54e5714c9
Revert rebasing the moved refs to the new cell, because the original ref may still be referred by a mod.
2015-04-26 14:55:40 +10:00
cc9cii
e0d061c37b
Implemented a workaround for saving moved refs.
2015-04-26 12:32:07 +10:00
cc9cii
7673be6d0f
Loading of moved refs complete.
2015-04-26 12:18:23 +10:00
cc9cii
74b98f7178
Fixed initial loading of moved refs.
2015-04-26 11:35:46 +10:00
cc9cii
2e2d6e04fe
gcc friendly version.
2015-04-25 17:43:29 +10:00
cc9cii
dcce59f76c
Pass MovedCellRef info to RefCollection. Still has debugging code.
2015-04-25 17:20:02 +10:00
cc9cii
932f1f9fbd
Alternative way of finding UniversalId without bloating IdTree.
2015-04-25 15:26:32 +10:00
cc9cii
acb800b8f9
Resolve merge issues and fix typos.
2015-04-25 09:39:37 +10:00
cc9cii
f1a58994c6
Merge branch 'master' into moveref
...
Conflicts:
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/ref.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
components/esm/cellref.hpp
2015-04-25 06:52:53 +10:00
cc9cii
8aaa74a983
Undo for delete operation in referenceables table. Implemented by saving UniversalId::Type in DeleteCommand.
2015-04-25 06:06:11 +10:00
cc9cii
a6925683c6
Off by one error - can't delete the last element of a refid collection.
2015-04-25 06:04:39 +10:00
Marc Zinnschlag
6fcf4ea9e3
In ModifyCommand replace proxy model with the source model ( Fixes #2498 )
2015-04-23 14:24:43 +02:00
cc9cii
82bc666e00
Make AI package items to be editable when a new row is added.
2015-04-22 09:25:55 +10:00
scrawl
e49b8fe690
Fix persuasion mechanics using player stats instead of NPC's ( Fixes #2475 )
2015-04-22 01:17:34 +02:00
Marc Zinnschlag
f7c7aeecb3
fixed missing state update when starting a global search
2015-04-21 14:44:51 +02:00
cc9cii
f326b14604
Allow Qt to cleanup its signals.
2015-04-21 10:25:19 +10:00
cc9cii
a836446d22
Fix assert() triggering due to bad index being passed.
2015-04-19 21:07:45 +10:00
cc9cii
18162557b0
TopicInfos result script are now displayed in dialogue subviews.
2015-04-19 13:31:16 +10:00
cc9cii
cb3396643b
Back to the old layout of dialoguesubview.
2015-04-19 10:32:06 +10:00
cc9cii
8b1ac451ac
More warning fixes.
2015-04-19 09:42:44 +10:00
cc9cii
dd1e4e8b69
Remove gcc/clang warnings.
2015-04-19 08:58:52 +10:00
cc9cii
7561b195ab
Revert auto expansion of enums as it was interfering with row based operations. Fix default values of magic effect skill & attributes.
2015-04-18 15:28:34 +10:00
cc9cii
48a6006202
Prevent enum delegates from auto expanding when opening a dialogue subview.
2015-04-18 14:16:55 +10:00
cc9cii
5e84858c0b
Change the cell edit selection behaviour of the nested tables. Also auto-expand the enum delegate selections (both main table as well as nested table in the dialogue subview)
2015-04-18 10:07:53 +10:00
cc9cii
f88be67556
Convert AI package type and AI wander repeat columns in the nested tables to use enum delegate
2015-04-18 09:37:19 +10:00
cc9cii
e241fb0104
Convert clothing/armour part reference type column in the nested tables to use enum delegates.
2015-04-18 08:31:08 +10:00
cc9cii
e00d7f72ac
Convert magic effects ID and Range columns in the nested tables to use enum delegate
2015-04-18 08:09:14 +10:00
cc9cii
befd6fe658
Convert magic effects Skills column in the nested tables to use enum delegates.
2015-04-18 07:15:40 +10:00
cc9cii
0aff188d8d
Fix enum delegate from adding a command to the undo stack when the value has not changed.
2015-04-18 07:13:02 +10:00
cc9cii
d6c2cff381
Convert magic effects Attribute column in the nested tables to use enum delegates.
2015-04-17 21:33:25 +10:00
cc9cii
c41b4b84a6
Cleanup post merge.
2015-04-17 13:45:45 +10:00
cc9cii
47d5eac290
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/idtable.hpp
2015-04-17 12:37:34 +10:00
cc9cii
32e73c3deb
Add creature/item levelled lists (non table items) to dialogue subview.
2015-04-17 11:50:19 +10:00
Marc Zinnschlag
38ce074a62
Merge branch 'replace'
2015-04-16 20:11:25 +02:00
Marc Zinnschlag
b939fd440e
added replace all button
2015-04-16 20:11:14 +02:00
Marc Zinnschlag
36ce2d61f4
consider lock mode when replacing
2015-04-16 19:02:03 +02:00
Marc Zinnschlag
4951fc477c
added replace function
2015-04-16 18:50:22 +02:00
cc9cii
a2d824bfa6
Changes to support dialogue only items but in a list view via QDataWidgetMapper.
2015-04-17 01:27:36 +10:00
cc9cii
1c7ed795c2
Add creature/item levelled lists to dialogue subview.
2015-04-13 22:21:27 +10:00
cc9cii
513c3a47cb
Add clothing/armor part reference table to dialogue subview.
2015-04-13 21:08:23 +10:00
cc9cii
526b53fce0
Add AI packages table to dialogue subview. Also minor bug fixes.
2015-04-13 14:14:00 +10:00
cc9cii
60e5ff8811
Remove duplicated checks and exceptions.
2015-04-13 08:03:30 +10:00
cc9cii
221c57adee
Fix template syntax and travis warnings.
2015-04-13 07:05:06 +10:00
cc9cii
a976dca27b
Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key...
2015-04-13 06:39:38 +10:00
cc9cii
7ccf53e750
Changed over inventory adapters. Fixed a few places where modified records were not set properly.
2015-04-12 20:03:55 +10:00
cc9cii
25261a60e5
Add potion magic effects table to dialogue subview. Integration of the adapters to RefIdCollection is incomplete.
2015-04-12 18:29:42 +10:00
cc9cii
ef84e553be
Renamed some stuff.
2015-04-12 13:48:23 +10:00
cc9cii
41b368a759
Moved templated code around a bit.
2015-04-12 10:52:01 +10:00
cc9cii
4b9c9bf095
Simplify and relocate nested column definitions.
2015-04-12 08:52:09 +10:00
cc9cii
8dab2f9b14
Use human friendly strings in magic effects subtable.
2015-04-12 07:46:32 +10:00
cc9cii
a460409555
Add Spells and Enchantment magic effects table to dialogue subview. The numbers are not yet converted to strings.
2015-04-11 21:43:25 +10:00
cc9cii
49fd5afdf6
Add birthsign spells table to dialogue subview.
2015-04-11 19:17:17 +10:00
cc9cii
f939648736
Add race spells table to dialogue subview.
2015-04-11 19:05:03 +10:00
cc9cii
9c75dad1ac
Why is gcc so unkind?
2015-04-11 18:21:08 +10:00
cc9cii
ea9563ad92
Add faction reactions table to dialogue subview. Fix gcc compile issues. Change nested columns to generic ones where possible.
2015-04-11 17:51:30 +10:00
cc9cii
88bc62e054
Add Region sounds table to dialogue subview.
2015-04-11 15:55:26 +10:00
cc9cii
5da2f53bec
Code reorganisation to prepare for nested sound table in regions.
2015-04-11 13:54:05 +10:00
cc9cii
ce7e2e06c1
Fix editor being created for a non-editable item.
2015-04-11 13:11:20 +10:00
cc9cii
a632b2cfeb
Fix editing "ID" column within nested tables in dialogue subview.
2015-04-11 11:27:48 +10:00
cc9cii
1220369da3
Changes as per feedback comments.
2015-04-11 11:26:29 +10:00
Marc Zinnschlag
3f4f008c51
another fix to display type handling
2015-04-10 13:27:34 +02:00
cc9cii
7990fab708
Fix crash when exiting via window manager on some systems.
2015-04-10 18:09:33 +10:00
cc9cii
9a564f5062
Fix undo for pathgrid points add/remove.
2015-04-10 15:28:09 +10:00
cc9cii
bc9dad3ff2
Add index columns and fix edge indexing for point deletion.
2015-04-10 07:31:01 +10:00
cc9cii
330920daa8
Fix off by one error(s).
2015-04-09 21:41:46 +10:00
cc9cii
be9f94b766
Adjust edge indexes when adding/removing points. Fix some travis warnings.
2015-04-09 21:23:02 +10:00
cc9cii
23db79ebab
Fix for more gcc differences.
2015-04-09 20:53:41 +10:00
cc9cii
3a46512b7f
Attempt to account for gcc differences.
2015-04-09 20:15:38 +10:00
cc9cii
787cef1386
DialogueSubView layout update for dialogues with nested tables only.
2015-04-09 19:39:09 +10:00
cc9cii
860754e460
Minor formatting cleanup and comments.
2015-04-09 19:33:42 +10:00
cc9cii
05210d7f21
Nested table support for Pathgrids.
2015-04-09 19:29:03 +10:00
cc9cii
bdf0d8db22
Re-organise the inheritance structure once more in preparation for adding Pathgrid tables.
2015-04-09 19:11:19 +10:00
dteviot
0a5de33a1a
fireEquipmentChangedEvent() updates the InventoryWindow. ( Fixes #2424 )
2015-04-06 15:13:09 +12:00
dteviot
fe69dc2863
Made LineInfo a struct, as requested by Scrawl.
2015-04-05 14:56:29 +12:00
Marc Zinnschlag
3b408b6427
sorting out some Display enum mixup
2015-04-04 19:55:53 +02:00
dteviot
52de622e97
provide incremental update of SpellWindow ( Fixes #2411 )
...
When SpellWindow is visible, every 0.5 seconds update the cost/changes for spells/enchanted items shown.
Also, check to see if more substantial update of the window is required.
2015-04-03 17:59:13 +13:00
cc9cii
745eae9c10
Tweak DialogueSubView layout for nested tables.
2015-04-03 12:44:32 +11:00
dteviot
6b6bed520d
removed redundant calls.
2015-04-03 13:45:13 +13:00
cc9cii
8eaf6b068c
Adding missing file.
2015-04-02 21:02:17 +11:00
cc9cii
851effb0e3
Merge branch 'master' into NonTableFields
2015-04-02 20:43:48 +11:00
cc9cii
83bcc8d451
Reorganised class inheritance structure of collections, columns and idtable model.
2015-04-02 20:19:15 +11:00
Marc Zinnschlag
a9a8b5ad47
improved performance of CSVRender::Cell::addObjects by bypassing Qt model
2015-03-31 14:25:27 +02:00
Marc Zinnschlag
66c866aec9
fixed search result formatting
2015-03-31 13:02:12 +02:00
Marc Zinnschlag
cb6caf5e39
added search-related user settings
2015-03-30 22:30:33 +02:00
Marc Zinnschlag
4928e3705f
highlight (bold) search string in results
2015-03-30 12:52:08 +02:00
cc9cii
ece34a1baa
Workaround for crash while exiting the application.
2015-03-30 18:14:07 +11:00
cc9cii
619b5206cd
More consistency nit pick.
2015-03-30 16:41:55 +11:00
cc9cii
29ef08bb75
Spelling and other consistencies nit pick.
2015-03-30 11:53:33 +11:00
cc9cii
3d280a6ba5
Fixed the display issues of the nested tables in the dialogue subview. Needs further work but usable for now.
2015-03-30 11:19:37 +11:00
Marc Zinnschlag
6d165dabb6
improved layout of report table
2015-03-29 18:21:18 +02:00
Marc Zinnschlag
46ccd27a6d
improved find result text
2015-03-29 18:16:43 +02:00
Marc Zinnschlag
e8091c4e7e
added field column to report table
2015-03-29 15:28:31 +02:00
Marc Zinnschlag
416b8165cd
moved getColumnId function from IdTable to IdTable base and made it virtual
2015-03-29 15:28:11 +02:00
Marc Zinnschlag
a8cdd30124
added ID column to report table
2015-03-29 13:55:31 +02:00
Marc Zinnschlag
4042b12013
changed data structure for report model
2015-03-29 13:43:11 +02:00
Marc Zinnschlag
1ec0db231c
add a separate display type for ID column
2015-03-28 14:48:06 +01:00
Marc Zinnschlag
c5f1c2127d
extend global search to all record and reference tables
2015-03-28 14:36:28 +01:00
Marc Zinnschlag
13a4fb3fdc
make return key press in search input trigger a new search
2015-03-28 13:05:18 +01:00
Marc Zinnschlag
8e9365741f
make search sub-views re-usable (clear before starting a new search)
2015-03-28 12:53:01 +01:00
Marc Zinnschlag
eaaf816dd3
simplified search rules
2015-03-28 12:05:49 +01:00
Marc Zinnschlag
128ccd8151
improved search type naming
2015-03-28 11:54:32 +01:00
dteviot
be6ee927b9
AiWander, use closest two points if distance is too small ( Fixes #1317 )
...
In AiWander, if wander distance is set too small to get two points, take the closest two points.
2015-03-28 20:05:54 +13:00
Marc Zinnschlag
babefacbfa
improved message text in search results
2015-03-27 19:10:45 +01:00
Marc Zinnschlag
705ee67265
fixed hints getting mixed up with message text
2015-03-27 18:55:48 +01:00
Marc Zinnschlag
23cf859fee
added search stages (cell table only for now)
2015-03-27 16:33:54 +01:00
Marc Zinnschlag
78c6268891
added search class and search box widget
2015-03-25 11:56:14 +01:00
dteviot
63ab856024
Removed duplicated code.
2015-03-23 20:57:36 +13:00
dteviot
eb1090a1b6
Waypoint check only considers X & Y distance ( Fixes #2423 )
...
When pathfinder checks if actor has reached a waypoint, ignore actor's altitude.
2015-03-23 20:09:46 +13:00
scrawl
5cb61fa01c
Don't mark gold as stolen, adjust stolen tooltip ( Fixes #2465 )
2015-03-22 17:28:27 +01:00
Marc Zinnschlag
413b35de6c
moved search menu item from view to edit
2015-03-19 21:03:24 +01:00
Marc Zinnschlag
47bac13749
Merge remote-tracking branch 'scrawl/master'
2015-03-18 12:07:40 +01:00
Marc Zinnschlag
d053c62032
setting up global search operation and subview
2015-03-17 12:30:47 +01:00
Marc Zinnschlag
c032113247
Merge remote-tracking branch 'sandstranger/release-jni-memory'
2015-03-17 11:41:41 +01:00
scrawl
d573458896
Fix case sensitivity bug in default head/hair selection ( Fixes #2453 )
2015-03-16 17:42:15 +01:00
scrawl
19e8280f45
OpenCS window title unicode fixes
2015-03-16 15:45:41 +01:00
sylar
db10c87b89
release jni memory
2015-03-16 18:21:38 +04:00
Marc Zinnschlag
545ca9c9b4
Merge remote-tracking branch 'sandstranger/fix-bad-code-in-command-line'
2015-03-16 08:42:22 +01:00
Marc Zinnschlag
fc6c9d7ff2
Merge remote-tracking branch 'scrawl/opencs-hint-fix'
2015-03-16 08:41:36 +01:00
Marc Zinnschlag
79339ebff1
Merge remote-tracking branch 'scrawl/opencs-crashfix'
2015-03-16 08:40:02 +01:00
sylar
bd4e832cf3
fix memory leaks in emulating command line
2015-03-16 07:41:51 +04:00
cc9cii
76adb64e20
Compilation fix after merging commt e30f24
2015-03-16 13:21:02 +11:00
scrawl
6ff2523d8a
Fix for line focus when clicking on a verifier script error
...
- setFocus() on the script editor, otherwise setting the text cursor has no effect.
- setFocus() must be done after the widgets are created/shown, or the newly created widgets will "steal" the focus again.
- Missing useHint in case subviews are reused.
2015-03-16 03:07:37 +01:00
scrawl
295ca86ac1
OpenCS FileDialog crash fix
...
The file dialog would crash when no game file is selected and an addon file with no dependency is checked, then unchecked.
2015-03-16 02:43:02 +01:00
scrawl
4d0bb6329a
Fix incorrect reference check
...
This check was broken for exterior cells (empty cell id).
It was superfluous anyway. A CellRef is owned by the cell it is in, so the cell must always exist.
2015-03-16 01:50:57 +01:00
cc9cii
5eefcd862f
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/tools/tools.cpp
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/idtable.hpp
apps/opencs/model/world/refidadapter.cpp
apps/opencs/model/world/refidadapter.hpp
apps/opencs/view/world/dialoguesubview.hpp
2015-03-16 10:30:54 +11:00
Marc Zinnschlag
e6e02714a0
Merge remote-tracking branch 'sandstranger/command-line-support-for-Android'
2015-03-15 22:52:34 +01:00
Marc Zinnschlag
86d39cede9
Merge remote-tracking branch 'dteviot/Rng'
2015-03-15 22:04:26 +01:00
sylar
a418b70937
command line support for Android
2015-03-15 21:15:58 +04:00
dteviot
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
2015-03-15 14:07:47 +13:00
dteviot
1d7f3474fa
Fixed more MSVC 2013 warnings.
2015-03-15 08:49:03 +13:00
dteviot
2ef7fc4e2c
Installer work for Windows ( Fixes #1621 )
...
1. Correctly reads Windows registry for vanilla MW install location.
2. Populates existing installation page with location of vanilla, when found.
3. On Windows, installer wizard now gets to Import page.
2015-03-15 08:08:55 +13:00
Marc Zinnschlag
cf077dcf5d
Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn'
2015-03-14 14:25:49 +01:00
Marc Zinnschlag
55bd0c728e
Merge branch 'threadfix'
2015-03-14 12:00:35 +01:00
Marc Zinnschlag
c0dfad23b3
Fixed editor operation multi-threading ( Fixes #923 )
2015-03-14 12:00:24 +01:00
cc9cii
15b9a628ac
Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods.
2015-03-14 19:41:55 +11:00
cc9cii
17e6244bd6
Yet more warnings suppressed.
2015-03-14 12:42:46 +11:00
Rohit Nirmal
2540a901d5
Remove unused variable.
2015-03-13 20:04:47 -05:00
cc9cii
fd86076db3
More warning fixes.
2015-03-14 08:09:19 +11:00
cc9cii
4f6c772437
Fix more warnings.
2015-03-14 06:36:35 +11:00
cc9cii
4d46d7ba72
Fix some compiler warnings.
2015-03-14 06:07:12 +11:00
Marc Zinnschlag
f0a7b202b9
Merge branch 'openmw-35-1'
2015-03-13 17:33:08 +01:00
cc9cii
488bc76da5
Fix saving land data.
2015-03-13 22:06:55 +11:00
cc9cii
589b0b9171
Add saving land and land textures. Should resolve Bug #2447 .
2015-03-13 08:01:48 +11:00
Marc Zinnschlag
8e37e9a14a
removed redundant functions
2015-03-12 10:51:50 +01:00
Marc Zinnschlag
8a8db8bc24
Merge remote-tracking branch 'cc9cii/editor-clone-fix'
2015-03-12 10:45:51 +01:00
Marc Zinnschlag
26955dc6d3
Merge remote-tracking branch 'cc9cii/editor-var-edit'
2015-03-12 10:44:55 +01:00
Marc Zinnschlag
056bc66c6c
Merge remote-tracking branch 'scrawl/master'
2015-03-12 10:29:39 +01:00
cc9cii
418025e0a2
Add missing editor type to the dialogue. Should resolve Bug #2437 .
2015-03-12 13:10:25 +11:00
scrawl
767624f518
Combat mechanic fixes
2015-03-12 03:08:58 +01:00
