1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 12:49:56 +00:00
openmw-tes3mp/apps/opencs/view/world
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
..
cellcreator.cpp Chaninging variables name to follow our policy. 2014-01-27 13:13:39 +01:00
cellcreator.hpp Cleared whitespaces. 2014-01-27 19:40:05 +01:00
creator.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
creator.hpp focus main input widget when bringing up creator bar (Fixes #2514) 2015-05-02 13:20:42 +02:00
datadisplaydelegate.cpp create modify commands through command dispatcher 2015-01-15 14:24:33 +01:00
datadisplaydelegate.hpp create modify commands through command dispatcher 2015-01-15 14:24:33 +01:00
dialoguecreator.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
dialoguecreator.hpp set dialogue type for newly created dialogue records 2013-10-21 13:39:13 +02:00
dialoguesubview.cpp Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview. 2015-05-01 12:14:09 +10:00
dialoguesubview.hpp Resolve merge issues and fix typos. 2015-04-25 09:39:37 +10:00
dragrecordtable.cpp Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods. 2015-03-14 19:41:55 +11:00
dragrecordtable.hpp Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods. 2015-03-14 19:41:55 +11:00
enumdelegate.cpp Merge branch 'master' into moveref 2015-04-25 06:52:53 +10:00
enumdelegate.hpp create modify commands through command dispatcher 2015-01-15 14:24:33 +01:00
genericcreator.cpp focus main input widget when bringing up creator bar (Fixes #2514) 2015-05-02 13:20:42 +02:00
genericcreator.hpp focus main input widget when bringing up creator bar (Fixes #2514) 2015-05-02 13:20:42 +02:00
idtypedelegate.cpp create modify commands through command dispatcher 2015-01-15 14:24:33 +01:00
idtypedelegate.hpp create modify commands through command dispatcher 2015-01-15 14:24:33 +01:00
idvalidator.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
idvalidator.hpp fixed error detection and improved error reporting in IdValidator 2014-08-15 13:11:55 +02:00
infocreator.cpp focus main input widget when bringing up creator bar (Fixes #2514) 2015-05-02 13:20:42 +02:00
infocreator.hpp focus main input widget when bringing up creator bar (Fixes #2514) 2015-05-02 13:20:42 +02:00
nestedtable.cpp Resolve merge issues and fix typos. 2015-04-25 09:39:37 +10:00
nestedtable.hpp Resolve merge issues and fix typos. 2015-04-25 09:39:37 +10:00
previewsubview.cpp OpenCS: port lighting toolbar, fix multiple context GL objects issue 2015-03-28 20:15:17 +01:00
previewsubview.hpp added new user setting: window/hide-subview (hide subview titlebar if there is only one subview in the window) 2014-10-27 08:57:18 +01:00
recordstatusdelegate.cpp create modify commands through command dispatcher 2015-01-15 14:24:33 +01:00
recordstatusdelegate.hpp create modify commands through command dispatcher 2015-01-15 14:24:33 +01:00
referenceablecreator.cpp fixed referenceable cloning (and as a side-effect enabled showing the type of the refereceable in the clone UI) 2014-09-20 12:48:51 +02:00
referenceablecreator.hpp fixed referenceable cloning (and as a side-effect enabled showing the type of the refereceable in the clone UI) 2014-09-20 12:48:51 +02:00
referencecreator.cpp focus main input widget when bringing up creator bar (Fixes #2514) 2015-05-02 13:20:42 +02:00
referencecreator.hpp focus main input widget when bringing up creator bar (Fixes #2514) 2015-05-02 13:20:42 +02:00
regionmap.cpp Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods. 2015-03-14 19:41:55 +11:00
regionmap.hpp fixing minor issues 2014-05-01 12:34:54 +02:00
regionmapsubview.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
regionmapsubview.hpp added view action to region map 2014-04-13 15:46:31 +02:00
scenesubview.cpp OpenCS: port lighting toolbar, fix multiple context GL objects issue 2015-03-28 20:15:17 +01:00
scenesubview.hpp Fix Subview interface clutter by keeping a map of Scenewidgets. 2014-11-01 08:29:08 +11:00
scriptedit.cpp Make font setting selection immediate. 2015-05-01 06:08:04 +10:00
scriptedit.hpp Make font setting selection immediate. 2015-05-01 06:08:04 +10:00
scripthighlighter.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
scripthighlighter.hpp syntax highlighter modes 2014-08-24 17:56:20 +02:00
scriptsubview.cpp Make font setting selection immediate. 2015-05-01 06:08:04 +10:00
scriptsubview.hpp Moved script editor settings to its own section. 2015-04-30 06:32:03 +10:00
subviews.cpp OpenCS compiles and runs again (no rendering) 2015-03-19 17:21:15 +01:00
subviews.hpp rewrote subview factory system 2012-12-11 13:22:43 +01:00
table.cpp Merge branch 'master' into moveref 2015-04-25 06:52:53 +10:00
table.hpp extended double click functionality in tables 2014-10-25 16:27:36 +02:00
tablebottombox.cpp focus main input widget when bringing up creator bar (Fixes #2514) 2015-05-02 13:20:42 +02:00
tablebottombox.hpp removed needless argument for cloning 2014-01-27 13:08:14 +01:00
tablesubview.cpp silenced a coverity warning 2015-01-15 12:13:53 +01:00
tablesubview.hpp close view when closing last sub-view unless this view is the last view 2014-10-25 18:13:56 +02:00
util.cpp Fix loading moved references. 2015-04-28 08:07:01 +10:00
util.hpp Merge branch 'master' into moveref 2015-04-25 06:52:53 +10:00
vartypedelegate.cpp create modify commands through command dispatcher 2015-01-15 14:24:33 +01:00
vartypedelegate.hpp create modify commands through command dispatcher 2015-01-15 14:24:33 +01:00