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 |
|
scrawl
|
42d6c6140c
|
Add mygui backend by chris
|
2015-04-24 21:55:30 +02:00 |
|
scrawl
|
9f12e53956
|
Scale NPCs by their Weight property (Fixes #814)
|
2015-04-24 14:49:20 +02:00 |
|
scrawl
|
1c0e3a6488
|
rotateObject, scaleObject
|
2015-04-23 23:50:46 +02:00 |
|
scrawl
|
6f3e920f85
|
Animation port complete
|
2015-04-23 23:30:06 +02:00 |
|
scrawl
|
86b4a610cb
|
Movement accumulation works
|
2015-04-23 22:46:07 +02:00 |
|
scrawl
|
09742d5b95
|
Animation playback works, no movement accumulation yet
|
2015-04-23 20:41:31 +02:00 |
|
Marc Zinnschlag
|
6fcf4ea9e3
|
In ModifyCommand replace proxy model with the source model (Fixes #2498)
|
2015-04-23 14:24:43 +02:00 |
|
scrawl
|
1a19cd3607
|
Some cleanup
|
2015-04-22 19:08:56 +02:00 |
|
scrawl
|
460304b069
|
Port bsatool
|
2015-04-22 18:06:29 +02:00 |
|
scrawl
|
8c810e3620
|
Move rng to components
|
2015-04-22 17:58:55 +02:00 |
|
scrawl
|
7a46d4f46a
|
Dead code removal
|
2015-04-22 17:48:06 +02:00 |
|
scrawl
|
04accb7652
|
Add LightController
|
2015-04-22 17:37:39 +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 |
|
scrawl
|
dfd8e08698
|
Dead code removal
|
2015-04-21 23:40:10 +02:00 |
|
scrawl
|
26766b8e0a
|
Dead code removal
|
2015-04-21 23:36:36 +02:00 |
|
scrawl
|
9e177df61b
|
Add fog, view distance, and far plane culling
|
2015-04-21 23:36:36 +02:00 |
|
scrawl
|
c53a56ed6e
|
clear stream errors before attempting the read
|
2015-04-21 16:10:11 +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 |
|
scrawl
|
92ef9b1c57
|
Rename to osg-ffmpeg-videoplayer
|
2015-04-19 20:14:06 +02:00 |
|
scrawl
|
42f6d9e15b
|
Port video player
|
2015-04-19 20:07:18 +02:00 |
|
scrawl
|
68f93294da
|
Port EffectManager
|
2015-04-19 17:55:56 +02:00 |
|
scrawl
|
fcc7aa02ab
|
Port addExtraLight
|
2015-04-19 15:03:08 +02:00 |
|
scrawl
|
c924e64047
|
Port HeadAnimationTime
|
2015-04-19 14:42:47 +02:00 |
|
scrawl
|
f7d2a28930
|
Port BoneOffset
|
2015-04-19 14:25:36 +02: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 |
|
scrawl
|
9c4b2ea61a
|
CreatureAnimation compiles
|
2015-04-19 03:05:47 +02:00 |
|
scrawl
|
27cfe8fb58
|
Crash fix
|
2015-04-19 02:39:10 +02:00 |
|
cc9cii
|
cb3396643b
|
Back to the old layout of dialoguesubview.
|
2015-04-19 10:32:06 +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 |
|
scrawl
|
edc5cad79e
|
Port Animation::addEffect
|
2015-04-19 01:57:52 +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
|
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 |
|