scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
Marc Zinnschlag
53b4c15d85
Merge remote-tracking branch 'smbas/master'
2015-05-23 16:02:09 +02:00
Marc Zinnschlag
b58b7a89ed
Merge remote-tracking branch 'rohit-n/reorder2'
2015-05-23 09:19:03 +02:00
Stanislav Bas
a5183aefbe
Add record state tracking to the ModifyCommand ( Fix #2555 )
2015-05-22 23:53:25 +03:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
Stanislav Bas
d27b92e9f1
Avoid gaps between local indexes in RefIdData after removal of records ( Fix #2545 )
2015-05-22 00:57:47 +03:00
cc9cii
cfcfb17320
Updates to optional horizontal scrollbar.
...
- move SizeHintWidget out to separate files
- remove redundant logic in view.cpp
- remove sizehint from dialogue subview
- add tooltip hints in user preferences
2015-05-18 07:12:02 +10:00
cc9cii
e9ca022162
Add an optional horizontal scrollbar to the main view window. Should resolve Feature #2549 .
...
- TableSubviews and DialogueSubviews now provide size hints
- Option to stop the growth of the window at the screen boundary for multi-monitor setup with different resolution.
- Three options:
Grow Only: No change to current, except the use of size hints
Scrollbar Only: Simple addition of a scrollbar, the view window does not grow
Grow then Scroll: Window grows as per current behaviour. The scrollbar appears once it cannot grow any further.
2015-05-17 20:45:13 +10:00
Marc Zinnschlag
27000fb36b
don't reject single precision float values in value filters ( Fixes #2533 )
2015-05-15 14:09:35 +02:00
cc9cii
f92d801faf
Jump to the added/cloned record (or undeleted record in case of undo). Should resolve Feature #2541 . Controlled by radio buttons on user preferences settings.
2015-05-15 12:32:29 +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
Marc Zinnschlag
0bf28a6eab
Merge remote-tracking branch 'cc9cii/leveled-list-edit'
2015-05-01 18:44:14 +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
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
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
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
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
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
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
