mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-26 19:23:07 +00:00
Code Issues Releases Wiki Activity
openmw/apps/opencs/view/world
History
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
..
cellcreator.cpp
cellcreator.hpp
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
dialoguesubview.cpp Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
dialoguesubview.hpp Resolve merge issues and fix typos. 2015-04-25 09:39:37 +10:00
dragrecordtable.cpp Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05: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 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05: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
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
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
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 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
regionmapsubview.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
regionmapsubview.hpp
scenesubview.cpp Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
scenesubview.hpp
scriptedit.cpp Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
scriptedit.hpp stop script editor from eating undo/redo shortcuts (Fixes #2506) 2015-05-16 10:18:11 +02:00
scripthighlighter.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
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 OpenCS compiles and runs again (no rendering) 2015-03-19 17:21:15 +01:00
subviews.hpp
table.cpp Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
table.hpp 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
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 Updates to optional horizontal scrollbar. 2015-05-18 07:12:02 +10:00
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 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