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

..

.gitignore

directory structure reorganisation (still missing the mangle stuff)

2010-06-25 22:28:59 +02:00

animation.cpp

Restore animation text key handling

2015-05-22 04:36:33 +02:00

animation.hpp

Restore animation text key handling

2015-05-22 04:36:33 +02:00

bulletdebugdraw.cpp

Add bullet debug drawer

2015-05-03 00:39:01 +02:00

bulletdebugdraw.hpp

Add bullet debug drawer

2015-05-03 00:39:01 +02:00

camera.cpp

New game crash fix

2015-05-23 05:40:24 +02:00

camera.hpp

Port MWRender::Camera

2015-05-22 00:29:27 +02:00

cell.hpp

implemented take action

2010-08-07 20:25:17 +02:00

characterpreview.cpp

Inventory item picking

2015-05-20 04:09:21 +02:00

characterpreview.hpp

Minor cleanup

2015-05-22 04:36:33 +02:00

creatureanimation.cpp

Minor cleanup

2015-05-22 04:36:33 +02:00

creatureanimation.hpp

CreatureAnimation compiles

2015-04-19 03:05:47 +02:00

effectmanager.cpp

Port EffectManager

2015-04-19 17:55:56 +02:00

effectmanager.hpp

Port EffectManager

2015-04-19 17:55:56 +02:00

globalmap.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-05-23 20:33:44 +02:00

globalmap.hpp

Global map base layer

2015-05-16 14:48:20 +02:00

localmap.cpp

Silence -Wreorder warnings.

2015-04-28 18:48:02 -05:00

localmap.hpp

fixed warning C4099:

2015-03-06 21:36:42 +13:00

npcanimation.cpp

Readded baseonly parameter to Animation::setObjectRoot

2015-05-21 23:24:22 +02:00

npcanimation.hpp

Minor cleanup

2015-05-20 04:09:21 +02:00

objects.cpp

Restore actor visibility mask

2015-05-23 05:42:37 +02:00

objects.hpp

Minor cleanup

2015-05-22 04:36:33 +02:00

occlusionquery.cpp

fix uninitialized member variables in OcclusionQuery class

2014-10-11 01:35:12 +02:00

occlusionquery.hpp

Get rid of underscore defines. They are reserved by the standard.

2014-01-05 18:22:29 +01:00

pathgrid.cpp

Rename MWRender::Debugging to MWRender::Pathgrid

2015-05-04 17:41:30 +02:00

pathgrid.hpp

Rename MWRender::Debugging to MWRender::Pathgrid

2015-05-04 17:41:30 +02:00

refraction.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

refraction.hpp

Make sure render textures are inactive when in a cell without water

2013-03-03 15:11:45 +01:00

renderinginterface.hpp

Dead code removal

2015-04-21 23:40:10 +02:00

renderingmanager.cpp

Restore getHitContact

2015-05-22 04:36:33 +02:00

renderingmanager.hpp

Restore animation text key handling

2015-05-22 04:36:33 +02:00

rendermode.hpp

Pathgrid rendering

2015-05-02 22:45:39 +02:00

ripplesimulation.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

ripplesimulation.hpp

Fix ripples for D3D - added simpler effect (Fixes #1649)

2015-02-09 19:30:11 +01:00

shadows.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

shadows.hpp

Fix cppcheck issues

2014-09-26 17:48:14 +02:00

sky.cpp

Minor cleanup

2015-05-22 04:36:33 +02:00

sky.hpp

Minor cleanup

2015-05-22 04:36:33 +02:00

terrainstorage.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

terrainstorage.hpp

Terrain refactoring, reduce game startup time and memory usage

2015-01-29 03:39:01 +01:00

util.cpp

Port EffectManager

2015-04-19 17:55:56 +02:00

util.hpp

Port EffectManager

2015-04-19 17:55:56 +02:00

vismask.hpp

Restore actor visibility mask

2015-05-23 05:42:37 +02:00

water.cpp

Silence -Wreorder warnings, and remove -Wno-reorder.

2015-05-21 22:46:44 -05:00

water.hpp

Silence -Wreorder warnings.

2015-04-28 18:48:02 -05:00

weaponanimation.cpp

Fix code duplication

2015-01-31 22:40:43 +01:00

weaponanimation.hpp

NpcAnimation compiles

2015-04-15 22:11:38 +02:00