krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
openmw-tes3coop/apps/opencs/model/doc
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
..
blacklist.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
blacklist.hpp consider script blacklist in OpenCS verifier 2014-07-21 12:15:21 +02:00
document.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-04 02:41:50 +02:00
document.hpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-04-19 02:29:16 +02:00
documentmanager.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-04 02:41:50 +02:00
documentmanager.hpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-03-27 17:30:48 +01:00
loader.cpp abstracted message collection into a class 2014-12-07 18:57:47 +01:00
loader.hpp display record count in loading window 2014-06-26 11:41:21 +02:00
messages.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
messages.hpp abstracted message collection into a class 2014-12-07 18:57:47 +01:00
operation.cpp Fixed editor operation multi-threading (Fixes #923) 2015-03-14 12:00:24 +01:00
operation.hpp Fixed editor operation multi-threading (Fixes #923) 2015-03-14 12:00:24 +01:00
operationholder.cpp Fixed editor operation multi-threading (Fixes #923) 2015-03-14 12:00:24 +01:00
operationholder.hpp Fixed editor operation multi-threading (Fixes #923) 2015-03-14 12:00:24 +01:00
runner.cpp Fixed editor operation multi-threading (Fixes #923) 2015-03-14 12:00:24 +01:00
runner.hpp Fixed editor operation multi-threading (Fixes #923) 2015-03-14 12:00:24 +01:00
saving.cpp Add saving land and land textures. Should resolve Bug #2447. 2015-03-13 08:01:48 +11:00
saving.hpp text encoding configuration (was using hardcoded settings before) 2014-05-12 10:32:57 +02:00
savingstages.cpp Fix crash with gcc/linux. 2015-04-26 21:02:50 +10:00
savingstages.hpp More warning fixes. 2015-03-14 08:09:19 +11:00
savingstate.cpp fixed ref num saving in non-wide format 2015-01-22 13:41:09 +01:00
savingstate.hpp fixed ref num saving in non-wide format 2015-01-22 13:41:09 +01:00
stage.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
stage.hpp abstracted message collection into a class 2014-12-07 18:57:47 +01:00
state.hpp setting up global search operation and subview 2015-03-17 12:30:47 +01:00