cc9cii
|
6542ff111d
|
Fix merge issues.
|
2015-06-27 08:50:53 +10:00 |
|
cc9cii
|
2612a91f8d
|
Merge branch 'master' into autocalc
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.hpp
apps/opencs/view/world/dialoguesubview.cpp
|
2015-06-27 07:46:36 +10:00 |
|
Marc Zinnschlag
|
6d5823e8aa
|
killed some tabs
|
2015-06-26 18:54:49 +02:00 |
|
Marc Zinnschlag
|
fdf6645dbc
|
Merge remote-tracking branch 'smbas/fix-info-tables'
|
2015-06-26 18:47:16 +02:00 |
|
Marc Zinnschlag
|
654e7428aa
|
Merge remote-tracking branch 'smbas/master'
|
2015-06-26 18:39:40 +02:00 |
|
Marc Zinnschlag
|
2dada1a162
|
Merge branch 'meta'
|
2015-06-26 18:37:39 +02:00 |
|
Marc Zinnschlag
|
4487bda702
|
size limits for meta data strings
|
2015-06-26 18:19:00 +02:00 |
|
Marc Zinnschlag
|
a4c2c75d1f
|
fixed overwriting of meta data when loading project file
|
2015-06-26 16:22:06 +02:00 |
|
Marc Zinnschlag
|
1e033fa8fe
|
added meta data dialogue sub view
|
2015-06-26 16:11:00 +02:00 |
|
Marc Zinnschlag
|
57015f3666
|
fixed handling of numeric read-only fields in dialogue sub views
|
2015-06-26 15:50:36 +02:00 |
|
Marc Zinnschlag
|
10fbe6aada
|
split DialogueSubView in SimpleDialogueSubView and DialogueSubView
|
2015-06-26 15:17:47 +02:00 |
|
Marc Zinnschlag
|
5a37530c1c
|
added missing MetaData table UniversalId type
|
2015-06-26 15:17:18 +02:00 |
|
Marc Zinnschlag
|
1870b087e7
|
ported setting of meta data for saving to the new mechanism
|
2015-06-26 13:13:22 +02:00 |
|
Marc Zinnschlag
|
f3ff90e1fd
|
moved meta data into a new single-row table
|
2015-06-26 13:01:25 +02:00 |
|
cc9cii
|
3e29bb8a86
|
Fix undo for NPC autocalc changes. Fix the lack of refresh after race powers subtable.
|
2015-06-26 16:10:50 +10:00 |
|
cc9cii
|
78457a8234
|
Simplify npc data update and fix data copy when autocal flag changed.
|
2015-06-26 13:50:09 +10:00 |
|
cc9cii
|
8c39f2b376
|
Fix dereferencing a null pointer.
|
2015-06-26 08:52:39 +10:00 |
|
cc9cii
|
273ff1cccb
|
Address review comments.
|
2015-06-26 07:48:48 +10:00 |
|
Stanislav Bas
|
ea97b0a20c
|
Refine InfoTableProxyModel::getFirstInfoRow() code
|
2015-06-25 20:08:42 +03:00 |
|
Stanislav Bas
|
844e5c504d
|
Fix conversion to QString
|
2015-06-25 19:41:26 +03:00 |
|
Stanislav Bas
|
867ce686ae
|
Proper conversion to QString for DropLineEdit::dropEvent()
|
2015-06-25 19:30:53 +03:00 |
|
Marc Zinnschlag
|
8fbc799655
|
Merge remote-tracking branch 'cc9cii/master'
|
2015-06-25 14:06:22 +02:00 |
|
Marc Zinnschlag
|
69db0179ca
|
update refresh menu item on stateChanged signal instead of when opening the menu
|
2015-06-25 13:05:57 +02:00 |
|
cc9cii
|
67b6c86a59
|
Fix initialisation order - properly this time.
|
2015-06-25 20:34:27 +10:00 |
|
cc9cii
|
c0f3d70f06
|
Use the new severity message attribute.
|
2015-06-25 20:23:43 +10:00 |
|
cc9cii
|
71f3b7ed4f
|
Fix crash when user preference is missing.
|
2015-06-25 20:21:51 +10:00 |
|
Marc Zinnschlag
|
6fbdbb11d5
|
added refrash menu item to report table (Fixes #2620)
|
2015-06-25 12:03:40 +02:00 |
|
cc9cii
|
705253e456
|
Fix initialisation order.
|
2015-06-25 19:54:07 +10:00 |
|
cc9cii
|
58923591cb
|
Remove extra qualification.
|
2015-06-25 19:25:47 +10:00 |
|
cc9cii
|
b1f07ba4fb
|
Resolve merge issues and change the getSpells() interface.
|
2015-06-25 18:57:32 +10:00 |
|
Stanislav Bas
|
d282bead23
|
InfoCreator accepts drops of Topic/Journal ID
|
2015-06-25 11:24:19 +03:00 |
|
Stanislav Bas
|
5b82b9d9d0
|
ReferenceCreator accepts drops of Cell ID
|
2015-06-25 11:20:35 +03:00 |
|
cc9cii
|
66877cbfe7
|
Merge branch 'master' into autocalc
Conflicts:
apps/opencs/view/world/nestedtable.cpp
apps/opencs/view/world/util.cpp
|
2015-06-25 13:39:59 +10:00 |
|
cc9cii
|
7af43a1155
|
Address review feedback.
|
2015-06-25 13:32:22 +10:00 |
|
Stanislav Bas
|
21f0b586ec
|
Rows with the same topic but in different letter case can be reordered
|
2015-06-24 20:01:29 +03:00 |
|
Marc Zinnschlag
|
e29d9bcc8e
|
use a namespace instead of a class with only static functions
|
2015-06-24 17:29:47 +02:00 |
|
Marc Zinnschlag
|
b0aad9c8cb
|
Merge remote-tracking branch 'smbas/feature-improved-dragndrop'
|
2015-06-24 17:20:43 +02:00 |
|
Stanislav Bas
|
270c17faa7
|
Prevent drops on non-editable table cells
|
2015-06-24 16:36:09 +03:00 |
|
cc9cii
|
e5e4a04f8b
|
Remove more c++11 dependencies.
|
2015-06-24 22:19:27 +10:00 |
|
Stanislav Bas
|
d1339a643a
|
Fix for NestedTableProxyModel::forwardDataChanged()
|
2015-06-24 15:07:09 +03:00 |
|
cc9cii
|
0cf9832017
|
Add missing files for autocalc. Remove c++11 dependency.
|
2015-06-24 21:58:28 +10:00 |
|
cc9cii
|
91b9ad399f
|
Include <cmath> for fmod() and floor()
|
2015-06-24 21:38:38 +10:00 |
|
cc9cii
|
18ec0d3e65
|
Add missing files for autocalc.
|
2015-06-24 21:21:35 +10:00 |
|
cc9cii
|
8af12788a4
|
Merge branch 'master' into autocalc
Conflicts:
apps/opencs/view/world/util.cpp
|
2015-06-24 21:16:48 +10:00 |
|
cc9cii
|
6b00d4ad91
|
Move NPC autocalc to a separate component so that it can be shared between OpenMW and OpenCS.
- Vanilla behaviour mimic'd where possible, except copying over autocalc spells to the npc's spell list when the status changes
|
2015-06-24 21:05:59 +10:00 |
|
scrawl
|
6f34a0501a
|
Attempting to make a potion with no effects removes the ingredients (Fixes #2722)
|
2015-06-24 05:17:45 +02:00 |
|
scrawl
|
33a3dabc31
|
An alchemy effect listed more than once in the same ingredient should not automatically create a potion of that effect (Bug #2722)
|
2015-06-24 05:17:45 +02:00 |
|
scrawl
|
d3ef075952
|
Fix an uninitialized variable
|
2015-06-23 05:06:49 +02:00 |
|
Marc Zinnschlag
|
83961e9109
|
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
|
2015-06-22 15:20:58 +02:00 |
|
scrawl
|
3f54f77647
|
essimporter build fix
|
2015-06-21 22:17:06 +02:00 |
|