cc9cii
|
7494340b66
|
Add the remaining NPC data for editing with dialogue subview. Should resolve Bug #2547.
|
2015-05-18 22:08:36 +10:00 |
|
cc9cii
|
538e550b2b
|
Fix for Bug #2543. Spells magic effect id typo.
|
2015-05-13 10:30:44 +10:00 |
|
cc9cii
|
2b84598e85
|
Remove duplicated but reversed map.
|
2015-05-10 20:52:29 +10:00 |
|
cc9cii
|
ab21c0551c
|
Provide a default encoding when changing to "Function".
|
2015-05-10 13:34:45 +10:00 |
|
cc9cii
|
587efcfe9d
|
Use better initial value type. Fix exception while saving values.
|
2015-05-10 07:49:18 +10:00 |
|
cc9cii
|
5fb269336f
|
Don't use initializer list
|
2015-05-10 07:02:08 +10:00 |
|
cc9cii
|
d6ecc64168
|
Aggregate types can't be static - osx compiler appears to be more strict.
|
2015-05-10 06:17:57 +10:00 |
|
cc9cii
|
69317095be
|
For compiling with osx - try using a different syntax for initializing the static maps.
|
2015-05-10 05:55:50 +10:00 |
|
cc9cii
|
0c461f4424
|
Add TopicInfos special conditions table.
|
2015-05-09 21:21:16 +10:00 |
|
Marc Zinnschlag
|
1c334a01ce
|
one more referenceable that escaped the change into object
|
2015-05-04 19:04:06 +02:00 |
|
scrawl
|
e1f4a7f647
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
|
2015-05-04 02:41:50 +02:00 |
|
Marc Zinnschlag
|
048d7be87c
|
Adjusted terminology for references/referenceables in OpenMW-CS user-interface (Fixes #2516)
|
2015-05-03 16:35:10 +02:00 |
|
cc9cii
|
b04aeb6aad
|
Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview.
|
2015-05-01 12:14:09 +10:00 |
|
cc9cii
|
7f2bd01f79
|
Handle plugins that has 0x00 for levelled list types, for example Ravenloft v5.02d, to use 0x01.
|
2015-04-29 12:08:11 +10:00 |
|
Marc Zinnschlag
|
f1c0847897
|
Merge remote-tracking branch 'cc9cii/moveref'
|
2015-04-28 14:07:18 +02:00 |
|
cc9cii
|
49884f54f7
|
Fix loading moved references.
|
2015-04-28 08:07:01 +10:00 |
|
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
|
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 |
|
cc9cii
|
18162557b0
|
TopicInfos result script are now displayed in dialogue subviews.
|
2015-04-19 13:31:16 +10:00 |
|
scrawl
|
1699759d12
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/view/render/cell.cpp
|
2015-04-19 02:29:16 +02: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
|
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
|
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 |
|
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
|
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 |
|
Marc Zinnschlag
|
3b408b6427
|
sorting out some Display enum mixup
|
2015-04-04 19:55:53 +02:00 |
|
cc9cii
|
8eaf6b068c
|
Adding missing file.
|
2015-04-02 21:02:17 +11:00 |
|
cc9cii
|
83bcc8d451
|
Reorganised class inheritance structure of collections, columns and idtable model.
|
2015-04-02 20:19:15 +11: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
|
416b8165cd
|
moved getColumnId function from IdTable to IdTable base and made it virtual
|
2015-03-29 15:28: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 |
|
scrawl
|
236d628884
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
|
2015-03-27 17:30:48 +01:00 |
|
scrawl
|
99e1720980
|
Add SceneManager and clone utility
|
2015-03-26 18:02:51 +01:00 |
|
scrawl
|
72400747f2
|
OpenCS: preliminary port of cell rendering to OSG
|
2015-03-25 23:35:10 +01:00 |
|
Marc Zinnschlag
|
78c6268891
|
added search class and search box widget
|
2015-03-25 11:56:14 +01:00 |
|
scrawl
|
40fc097722
|
OpenCS: use the new VFS, restored resource tables
|
2015-03-20 16:22:33 +01:00 |
|
scrawl
|
49c2da27b3
|
OpenCS compiles and runs again (no rendering)
|
2015-03-19 17:21:15 +01:00 |
|
Marc Zinnschlag
|
d053c62032
|
setting up global search operation and subview
|
2015-03-17 12:30:47 +01:00 |
|
cc9cii
|
76adb64e20
|
Compilation fix after merging commt e30f24
|
2015-03-16 13:21:02 +11: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 |
|
cc9cii
|
17e6244bd6
|
Yet more warnings suppressed.
|
2015-03-14 12:42:46 +11: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
|
488bc76da5
|
Fix saving land data.
|
2015-03-13 22:06:55 +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 |
|
cc9cii
|
dc9af19dcf
|
Don't use C++11 features.
|
2015-03-12 08:28:26 +11:00 |
|
Scott Howard
|
e2ef8c4022
|
fix -Wnewline-eof warnings
|
2015-03-11 10:54:45 -04:00 |
|
cc9cii
|
28259f914c
|
Remove potential memory leak.
|
2015-03-11 10:49:21 +11:00 |
|
cc9cii
|
43ec933b7b
|
Revert to the original clone() method. Create a new copy method for modified records.
|
2015-03-10 09:45:35 +11:00 |
|
cc9cii
|
8ac7b77d36
|
For RefId's, modify a copy of the base record rather than modifying the record directly.
|
2015-03-10 06:51:54 +11:00 |
|
cc9cii
|
8b3adec3ec
|
Added a missing copy constructor.
|
2015-03-09 21:25:41 +11:00 |
|
cc9cii
|
f90cdec53b
|
Remove default parameters from the implementation.
|
2015-03-09 16:24:35 +11:00 |
|
cc9cii
|
6087a18c94
|
Implement clone() using a new Record constructor.
|
2015-03-09 14:58:07 +11:00 |
|
cc9cii
|
128371c902
|
Copy base data to modified.
|
2015-03-08 15:50:50 +11:00 |
|
cc9cii
|
a54ab153b0
|
Cloned references should be considered "Base" rather than "Modified". Should fix bug #2429.
|
2015-03-08 10:05:10 +11:00 |
|
cc9cii
|
ca21181483
|
Fix typo to get table display working.
|
2015-03-07 11:42:50 +11:00 |
|
cc9cii
|
727b68dd15
|
Reduce difference with the master branch where possible.
|
2015-03-06 19:20:50 +11:00 |
|
cc9cii
|
6d6ff8c6a4
|
Resolved compile issues, but not fully working.
|
2015-03-06 14:36:13 +11:00 |
|
cc9cii
|
fb2ba7610c
|
Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/idtable.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
|
2015-03-04 11:22:42 +11:00 |
|
Marc Zinnschlag
|
4e1c086d6a
|
load start up script records
|
2015-03-03 14:31:59 +01:00 |
|
Alexander "Ace" Olofsson
|
b714e5211d
|
Redefinition of default template argument
Sometimes it's annoying how MSVC casually allows you to break C++ standards
|
2015-02-09 17:25:55 +01:00 |
|
Alexander "Ace" Olofsson
|
f77ae711e4
|
Fix template closer
|
2015-02-09 17:10:09 +01:00 |
|
Alexander "Ace" Olofsson
|
cfcaf4528f
|
Some more forward-declaring for OpenMW-CS
|
2015-02-09 16:50:34 +01:00 |
|
Marc Zinnschlag
|
7f905470fa
|
fixed moved reference loading
|
2015-01-24 15:01:38 +01:00 |
|
scrawl
|
c7d15e6f74
|
Revert "Revert "Light charge handling fix""
This reverts commit b95748d044 .
|
2015-01-23 15:33:39 +01:00 |
|
scrawl
|
b95748d044
|
Revert "Light charge handling fix"
This reverts commit 5e0428243b .
|
2015-01-23 02:32:38 +01:00 |
|
scrawl
|
5e0428243b
|
Light charge handling fix
|
2015-01-21 01:59:45 +01:00 |
|
Marc Zinnschlag
|
9670e0881d
|
update reference's current cell when x/y-coordinates are modified
|
2015-01-16 15:17:52 +01:00 |
|
Marc Zinnschlag
|
561ddfa0c5
|
make column type accessable via the regular table model
|
2015-01-16 11:29:44 +01:00 |
|
Marc Zinnschlag
|
7615cbafce
|
create modify commands through command dispatcher
|
2015-01-15 14:24:33 +01:00 |
|
Marc Zinnschlag
|
320b994aef
|
keep original cell field empty, if reference is in modified
|
2015-01-10 12:35:59 +01:00 |
|
Marc Zinnschlag
|
e32402a040
|
handle moved references on load
|
2015-01-09 12:05:53 +01:00 |
|
Marc Zinnschlag
|
ba7b74217b
|
added original cell column to reference table
|
2015-01-05 15:20:47 +01:00 |
|
Marc Zinnschlag
|
3b534326ff
|
forbid manual editing of the cell field in reference records
|
2015-01-05 15:04:11 +01:00 |
|
Thoronador
|
44e01d0eaa
|
remove redundant initialization statement
See https://github.com/OpenMW/openmw/pull/423#discussion_r22403388
|
2015-01-02 02:23:10 +01:00 |
|
Thoronador
|
91ff536460
|
fix uninit, #2
|
2015-01-02 00:26:45 +01:00 |
|
Thoronador
|
17fb7aa598
|
uninitialized stuff
|
2015-01-01 23:18:30 +01:00 |
|
Marc Zinnschlag
|
3a847732b4
|
abstracted message collection into a class
|
2014-12-07 18:57:47 +01:00 |
|
Marc Zinnschlag
|
f771b95a15
|
Merge remote-tracking branch 'cc9cii/master'
|
2014-12-04 20:04:19 +01:00 |
|
cc9cii
|
6731afc79c
|
Use float for setting skill use values. Should resolve bug #2183.
|
2014-12-05 03:59:16 +11:00 |
|
Marc Zinnschlag
|
f2d991505e
|
handle other Windows-specific path issues regarding OpenCS resources handling
|
2014-12-03 15:31:00 +01:00 |
|
Marc Zinnschlag
|
58b6e757e3
|
fixed another case folding problem regarding OpenCS resources handling
|
2014-12-03 15:24:37 +01:00 |
|
Marc Zinnschlag
|
cbcd6a26d5
|
memory leak fix
|
2014-12-01 22:57:32 +01:00 |
|
Marc Zinnschlag
|
db17dbe324
|
don't store esm readers for non-base content files
|
2014-11-30 18:04:18 +01:00 |
|
Marc Zinnschlag
|
4a9d2038fa
|
load land for non-base content files immediately
|
2014-11-30 14:33:39 +01:00 |
|
scrawl
|
3028141815
|
Set up ESMReader indices in OpenCS (fixes wrong terrain textures when multiple content files are loaded)
|
2014-11-18 11:47:46 +01:00 |
|
Marc Zinnschlag
|
5eb9fd81e1
|
use placeholder icons in OpenCS when no proper icon is available
|
2014-11-13 12:09:10 +01:00 |
|
cc9cii
|
4556eb74fe
|
Fix saving position and rotation.
|
2014-11-03 10:07:21 +11:00 |
|
Marc Zinnschlag
|
843493e90a
|
fixed case-problem in OpenCS script compiler
|
2014-10-21 12:38:18 +02:00 |
|
Marc Zinnschlag
|
a3c894c1e2
|
Merge branch 'cellmarker'
|
2014-10-17 14:26:16 +02:00 |
|
Marc Zinnschlag
|
e23a32c44f
|
some cleanup
|
2014-10-13 15:26:47 +02:00 |
|
Marc Zinnschlag
|
8062faa51a
|
fixed member variable access in OpenCS script compiler (Fixes #2011)
|
2014-10-13 15:25:27 +02:00 |
|
cc9cii
|
809b8c6d5b
|
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
|
2014-10-12 05:54:21 +11:00 |
|
Thoronador
|
51cd2bb5d9
|
remove unused/double variable from CSMWorld::Column class
|
2014-10-11 00:15:36 +02:00 |
|
Marc Zinnschlag
|
21b16f8425
|
Merge branch 'tables'
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/data.cpp
apps/opencs/model/world/data.hpp
|
2014-10-10 16:11:54 +02:00 |
|
cc9cii
|
406135ee96
|
Merge remote-tracking branch 'upstream/master' into terrain
|
2014-10-09 23:47:30 +01:00 |
|
Marc Zinnschlag
|
c85735abed
|
Merge remote-tracking branch 'scrawl/terrain'
|
2014-10-09 12:56:42 +02:00 |
|
cc9cii
|
13f028e27b
|
Avoid out of range exceptions.
|
2014-10-09 07:01:18 +11:00 |
|
scrawl
|
8786fb639f
|
Implement terrain rendering in OpenCS (Fixes #1597)
|
2014-10-08 17:17:31 +02:00 |
|
cc9cii
|
4fd7537155
|
Use default sort until a more generic sort that uses numeric order can be implemented.
|
2014-10-08 07:59:21 +11:00 |
|
cc9cii
|
a161ad3cd5
|
Sort cell id column by numerical order.
|
2014-10-07 20:11:44 +11:00 |
|
Marc Zinnschlag
|
be3b229a5f
|
fixed pathgrid loading
|
2014-10-04 15:36:52 +02:00 |
|
Marc Zinnschlag
|
f4c9897bbd
|
Merge branch 'master' into tables
|
2014-10-02 15:49:36 +02:00 |
|
Marc Zinnschlag
|
d64127106b
|
load and save pathgrid records
|
2014-10-02 12:30:15 +02:00 |
|
Marc Zinnschlag
|
ce52735df6
|
Merge remote-tracking branch 'cc9cii/Bug-No-1750'
|
2014-10-02 08:43:59 +02:00 |
|
Marc Zinnschlag
|
850a40d4e2
|
fixed resources table drag source problem
|
2014-09-30 13:15:15 +02:00 |
|
Marc Zinnschlag
|
ff530a2e19
|
added missing magic effect table columns
|
2014-09-30 12:33:48 +02:00 |
|
cc9cii
|
d790b8edfa
|
Revert old fix.
|
2014-09-27 23:39:22 +10:00 |
|
cc9cii
|
a2d043f43a
|
Re-check unknown record id after loading.
|
2014-09-27 23:36:27 +10:00 |
|
Marc Zinnschlag
|
e47f9c7268
|
added first batch of magic effect columns (re-using existing columns)
|
2014-09-27 12:51:46 +02:00 |
|
cc9cii
|
810ba61909
|
While loading overwrite records with the same id. Should resolve bug #1750.
|
2014-09-27 17:46:48 +10:00 |
|
Marc Zinnschlag
|
c321f2c252
|
load and save magic effect records
|
2014-09-26 13:05:51 +02:00 |
|
Marc Zinnschlag
|
33cd04b37d
|
added missing sound gen table columns
|
2014-09-25 11:40:45 +02:00 |
|
Marc Zinnschlag
|
7ab4881661
|
added sound gen table
|
2014-09-23 13:21:54 +02:00 |
|
Marc Zinnschlag
|
02247fe712
|
load and save sound gen records
|
2014-09-23 12:20:02 +02:00 |
|
Marc Zinnschlag
|
9d316a8745
|
Merge branch 'records'
|
2014-09-20 13:59:45 +02:00 |
|
Marc Zinnschlag
|
7733df239e
|
made CloneCommand a subclass of CreateCommand
|
2014-09-20 10:36:43 +02:00 |
|
Marc Zinnschlag
|
e93ab383ea
|
set refnum and increment refnum counter when creating a new reference
|
2014-09-18 12:25:17 +02:00 |
|
Marc Zinnschlag
|
33243c8c16
|
move code for storing old value from ModifyCommand constructor to redo function (allows use of the command on records that haven't been created at the time of construction)
|
2014-09-18 11:37:23 +02:00 |
|
Marc Zinnschlag
|
41275b0af3
|
Merge remote-tracking branch 'cc9cii/Bug-No-1869'
|
2014-09-17 09:20:59 +02:00 |
|
Marc Zinnschlag
|
90b45e09f7
|
added refnum column to references tables
|
2014-09-16 12:48:10 +02:00 |
|
Marc Zinnschlag
|
f5483e76cf
|
added refnum counter column to cells table
|
2014-09-16 12:30:17 +02:00 |
|
Marc Zinnschlag
|
d1d861e1be
|
Merge branch 'run'
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/CMakeLists.txt
|
2014-09-14 11:59:54 +02:00 |
|
cc9cii
|
724ed807c8
|
Let the filterbox of the receiving side of the drag&drop to decide whether to add referenceable type. Only added if the table has "Referenceable ID" column AND the UniversalId type is referenceable.
|
2014-09-08 23:14:04 +10:00 |
|
cc9cii
|
4a8fe39b2c
|
For bug #1710. Change the ID type of mime data for filterbox drop events to Referenceable rather than using the ID's native type.
|
2014-09-07 06:29:09 +10:00 |
|
Rohit Nirmal
|
e315a72582
|
Remove extra semicolons at the end of some lines.
|
2014-09-06 13:04:52 -05:00 |
|
cc9cii
|
ab8403192c
|
Fix typo.
|
2014-09-06 08:00:48 +10:00 |
|
Marc Zinnschlag
|
cf05d3c69f
|
added run log
|
2014-09-05 13:49:34 +02:00 |
|
cc9cii
|
fd5f814218
|
Trivial change from "Musics" to "Music Files"
|
2014-09-03 20:06:43 +10:00 |
|
Marc Zinnschlag
|
03c0cbc65a
|
added owner global column to references table (Fixes #1695)
|
2014-08-30 10:13:34 +02:00 |
|
Marc Zinnschlag
|
5c536d571b
|
added script column to debug profile table (dialogue only)
|
2014-08-24 13:15:18 +02:00 |
|
Marc Zinnschlag
|
232c6c9ad3
|
Merge branch 'scriptedit' into run
|
2014-08-22 13:20:02 +02:00 |
|
Marc Zinnschlag
|
4e521d1aca
|
fixed resources collection access
|
2014-08-17 14:21:23 +02:00 |
|
Marc Zinnschlag
|
fd3842d726
|
added flag columns to debug profile table
|
2014-08-15 13:22:20 +02:00 |
|
Marc Zinnschlag
|
a5ecf2e9f0
|
hide record type column in resources tables
|
2014-08-12 11:32:38 +02:00 |
|
Marc Zinnschlag
|
fa9c6b19c2
|
removed OpenCS-specific custom Filter record struct (default ESM struct will do from now on)
|
2014-08-10 21:03:45 +02:00 |
|
Marc Zinnschlag
|
2df1079dd4
|
removed mScope field from Filter record (redundant now)
|
2014-08-10 20:49:14 +02:00 |
|
Marc Zinnschlag
|
828536e999
|
generalised the concept of record scope
|
2014-08-06 09:53:10 +02:00 |
|
Marc Zinnschlag
|
4d49924025
|
added debug profile record table
|
2014-08-04 13:36:01 +02:00 |
|
Marek Kochanowicz
|
40edf15ab0
|
cleaning up the code
|
2014-07-31 12:18:24 +02:00 |
|
Marek Kochanowicz
|
c6194e7ea3
|
inserted additional class for nested collections
|
2014-07-30 22:08:55 +02:00 |
|
Marek Kochanowicz
|
13ee469b70
|
saving progress
|
2014-07-30 17:07:11 +02:00 |
|
Marek Kochanowicz
|
ade27293be
|
handling destination for guides
|
2014-07-25 17:11:18 +02:00 |
|
Marek Kochanowicz
|
39545670a8
|
Added spells table (and it works!)
|
2014-07-25 12:09:25 +02:00 |
|