scrawl
|
d9d84bd7b2
|
Remove bullet raycasting shapes, to be replaced with OSG ray casts
|
2015-05-01 21:43:21 +02:00 |
|
Marc Zinnschlag
|
0bf28a6eab
|
Merge remote-tracking branch 'cc9cii/leveled-list-edit'
|
2015-05-01 18:44:14 +02:00 |
|
scrawl
|
82c4d01b37
|
Add back resource handling workarounds to the gui code
|
2015-05-01 18:37:24 +02:00 |
|
scrawl
|
bd8f0248f0
|
Player rendering
|
2015-05-01 18:21:50 +02:00 |
|
Marc Zinnschlag
|
efde061c7c
|
Merge remote-tracking branch 'cc9cii/script-dialog'
|
2015-05-01 09:12:39 +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 |
|
scrawl
|
b0804734e5
|
Port VideoWidget
|
2015-05-01 03:03:44 +02:00 |
|
scrawl
|
223e3a53f5
|
Move OEngine::Gui::Layout to MWGui
|
2015-05-01 02:22:51 +02:00 |
|
scrawl
|
6afb0e43ef
|
Port FontLoader - requires MyGUI patch from https://github.com/MyGUI/mygui/pull/69
|
2015-05-01 01:44:21 +02:00 |
|
scrawl
|
a59940a2c7
|
Move MyGUI platform to components
|
2015-05-01 01:44:21 +02:00 |
|
scrawl
|
db7fe1952d
|
Move MyGUI texture to a separate file
|
2015-05-01 01:44:21 +02:00 |
|
scrawl
|
62847f0489
|
Use node masks to separate Scene and GUI
|
2015-05-01 01:44:21 +02:00 |
|
scrawl
|
c90125f936
|
Uninitialized basenode fix
|
2015-05-01 01:44:21 +02:00 |
|
cc9cii
|
081f3ed263
|
Make font setting selection immediate.
|
2015-05-01 06:08:04 +10:00 |
|
scrawl
|
83c6ba97c0
|
Disable skinning updates for actors beyond the AI processing distance
|
2015-04-30 00:10:24 +02:00 |
|
cc9cii
|
7b4a9f1ea1
|
Moved script editor settings to its own section.
|
2015-04-30 06:32:03 +10:00 |
|
cc9cii
|
8e49ccc2f4
|
Added user setting options.
|
2015-04-29 20:24:17 +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 |
|
Rohit Nirmal
|
997347b01e
|
Silence -Wreorder warnings.
|
2015-04-28 18:48:02 -05:00 |
|
scrawl
|
48a6d7c1a0
|
Remove mygui platform libraries from cmake
|
2015-04-28 16:33:30 +02:00 |
|
scrawl
|
a27446c8fb
|
Remove unused headers
|
2015-04-28 16:02:29 +02:00 |
|
cc9cii
|
28048c0bf3
|
Simple line numbering and fixed-width fonts for the script dialogue. Based on Qt examples. Should resolve Bugs #2505 and #2512.
|
2015-04-28 23:07:42 +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 |
|
Marc Zinnschlag
|
ae5de0cb2b
|
implemented additional check before performing replace (make sure data hasn't been changed since the search)
|
2015-04-27 22:43:09 +02:00 |
|
scrawl
|
8971a200f7
|
Sky fix
|
2015-04-26 14:34:14 +02:00 |
|
Marc Zinnschlag
|
6fac4c5dd9
|
made user settings handling in search sub view more consistent
|
2015-04-26 13:31:35 +02:00 |
|
Marc Zinnschlag
|
dab650a3d5
|
remove rows from result table after a successful replace (configurable via user settings)
|
2015-04-26 13:26:20 +02:00 |
|
cc9cii
|
33a8cd245a
|
Fix crash with gcc/linux.
|
2015-04-26 21:02:50 +10:00 |
|
Marc Zinnschlag
|
2ef8103cc7
|
fixed ReportModel::RemoveRows view updates
|
2015-04-26 12:36:05 +02: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
|
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 |
|
scrawl
|
7809caf9dc
|
Dead code removal
|
2015-04-25 15:53:11 +02:00 |
|
scrawl
|
0ff7b2ff11
|
MechanicsManager, frame update
|
2015-04-25 15:19:17 +02:00 |
|
scrawl
|
2db097f80e
|
Fix nested callbacks bug
|
2015-04-25 15:10:37 +02: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 |
|
scrawl
|
372a54bbc7
|
Dead code removal
|
2015-04-25 01:28:01 +02:00 |
|
scrawl
|
a3417a9c49
|
CharacterController compiles
|
2015-04-25 01:20:07 +02:00 |
|
scrawl
|
15164e20f7
|
Cleanup fix
|
2015-04-24 23:30:30 +02: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 |
|
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 |
|
scrawl
|
083c41c950
|
Environment map for enchanted objects
|
2015-04-17 01:23:37 +02: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 |
|