scrawl 0f6fd80294 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics ...

Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwrender/npcanimation.cpp
	files/mygui/openmw_settings_window.layout

2013-03-03 11:02:38 +01:00

..

.gitignore

directory structure reorganisation (still missing the mangle stuff)

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

activatoranimation.cpp

Fix transparency checks

2013-03-01 13:27:25 -08:00

activatoranimation.hpp

Return the movement vector from runAnimation

2013-01-18 16:21:29 -08:00

actors.cpp

NPCs / creatures can now emit ripples

2013-02-27 09:20:42 +01:00

actors.hpp

NPCs / creatures can now emit ripples

2013-02-27 09:20:42 +01:00

animation.cpp

Avoid duplicating skeletons due to casing issues

2013-02-27 12:33:36 -08:00

animation.hpp

Use a separate method to handle animation events

2013-02-23 14:39:01 -08:00

cell.hpp

implemented take action

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

characterpreview.cpp

Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics

2013-02-27 09:25:44 +01:00

characterpreview.hpp

Set the race selection character preview in a valid (idle) pose.

2013-02-25 16:40:08 -08:00

compositors.cpp

fix triangle / batch counts with compositors

2012-06-22 12:56:04 +02:00

compositors.hpp

fix triangle / batch counts with compositors

2012-06-22 12:56:04 +02:00

creatureanimation.cpp

Fix transparency checks

2013-03-01 13:27:25 -08:00

creatureanimation.hpp

Return the movement vector from runAnimation

2013-01-18 16:21:29 -08:00

debugging.cpp

Removing some leftovers of mwRoot node

2013-02-26 14:01:10 +01:00

debugging.hpp

Removing some leftovers of mwRoot node

2013-02-26 14:01:10 +01:00

externalrendering.hpp

added support for out of world rendering

2012-09-14 21:12:16 +02:00

globalmap.cpp

Z-up conversion: global map, shader fix

2013-02-26 13:52:01 +01:00

globalmap.hpp

transparent overlay

2012-11-04 12:13:04 +01:00

localmap.cpp

Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics

2013-03-03 11:02:38 +01:00

localmap.hpp

restored global map

2013-02-05 00:39:56 +01:00

npcanimation.cpp

Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics

2013-03-03 11:02:38 +01:00

npcanimation.hpp

Avoiding holding the InventoryStore in the NpcAnimation class

2013-02-23 08:03:52 -08:00

objects.cpp

Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics

2013-03-03 11:02:38 +01:00

objects.hpp

Removing some leftovers of mwRoot node

2013-02-26 14:01:10 +01:00

occlusionquery.cpp

Supply the new render window to mygui

2013-02-05 20:48:25 +01:00

occlusionquery.hpp

Fixing issues from last commit: restored input and occlusion queries

2013-02-05 20:26:13 +01:00

player.cpp

Z-up conversion: camera

2013-02-26 09:12:35 +01:00

player.hpp

Fix player rendering

2013-01-17 15:48:09 -08:00

refraction.cpp

Merge branch 'z-up' into graphics

2013-02-26 14:54:53 +01:00

refraction.hpp

Cleaning out some old bits

2013-02-13 18:39:36 +01:00

renderconst.hpp

Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics

2013-03-03 11:02:38 +01:00

renderinginterface.hpp

rotateObject() added, input system rewritten

2012-08-09 00:15:52 +04:00

renderingmanager.cpp

NPCs / creatures can now emit ripples

2013-02-27 09:20:42 +01:00

renderingmanager.hpp

NPCs / creatures can now emit ripples

2013-02-27 09:20:42 +01:00

ripplesimulation.cpp

NPCs / creatures can now emit ripples

2013-02-27 09:20:42 +01:00

ripplesimulation.hpp

NPCs / creatures can now emit ripples

2013-02-27 09:20:42 +01:00

shadows.cpp

Make OpenMW work with Ogre 1.9

2013-01-12 08:23:15 +01:00

shadows.hpp

basic shadows

2012-04-11 18:53:13 +02:00

sky.cpp

Merge branch 'z-up' into graphics

2013-02-26 14:54:53 +01:00

sky.hpp

Merge branch 'z-up' into graphics

2013-02-26 14:54:53 +01:00

terrain.cpp

Merge branch 'z-up' into graphics

2013-02-26 14:54:53 +01:00

terrain.hpp

Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging.

2012-10-07 20:00:55 +02:00

terrainmaterial.cpp

Disabling PSSM feature to make sure we can fit the max. amount of terrain textures in Morrowind.esm in a single pass.

2013-01-12 07:02:12 +01:00

terrainmaterial.hpp

Make OpenMW work with Ogre 1.9

2013-01-12 08:23:15 +01:00

videoplayer.cpp

Support float samples with ffmpeg

2013-02-26 10:19:33 -08:00

videoplayer.hpp

support the allowSkipping extra parameter for playBink command.

2013-01-07 13:19:52 +01:00

water.cpp

NPCs / creatures can now emit ripples

2013-02-27 09:20:42 +01:00

water.hpp

NPCs / creatures can now emit ripples

2013-02-27 09:20:42 +01:00