mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-18 13:12:50 +00:00
Code Issues Projects Releases Wiki Activity
c843cfc8e2
OpenMW/apps/opencs/view/world
History
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
cellcreator.hpp
creator.cpp
creator.hpp focus main input widget when bringing up creator bar (Fixes #2514) 2015-05-02 13:20:42 +02:00
datadisplaydelegate.cpp
datadisplaydelegate.hpp
dialoguecreator.cpp
dialoguecreator.hpp
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
dragrecordtable.hpp
enumdelegate.cpp Merge branch 'master' into moveref 2015-04-25 06:52:53 +10:00
enumdelegate.hpp
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
idtypedelegate.hpp
idvalidator.cpp
idvalidator.hpp
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
previewsubview.hpp
recordstatusdelegate.cpp
recordstatusdelegate.hpp
referenceablecreator.cpp
referenceablecreator.hpp
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
regionmap.hpp
regionmapsubview.cpp
regionmapsubview.hpp
scenesubview.cpp
scenesubview.hpp
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
scripthighlighter.hpp
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
subviews.hpp
table.cpp Merge branch 'master' into moveref 2015-04-25 06:52:53 +10:00
table.hpp
tablebottombox.cpp focus main input widget when bringing up creator bar (Fixes #2514) 2015-05-02 13:20:42 +02:00
tablebottombox.hpp
tablesubview.cpp
tablesubview.hpp
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
vartypedelegate.hpp