You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

scrawl 03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame ... Conflicts: apps/openmw/mwgui/referenceinterface.cpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp apps/openmw/mwscript/cellextensions.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/store.cpp apps/openmw/mwworld/worldimp.cpp		11 years ago
..
launcher	Fixed paths to OpenMW icons	12 years ago
mac	OpenCS.app icon & bundle properties	11 years ago
materials	Terrain specular mapping: use a "_diffusespec" postfix to indicate specular information is present in the alpha channel. Use alpha directly instead of 1-alpha.	11 years ago
mygui	Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame	11 years ago
opencs	Merge remote-tracking branch 'sirherrbatka/filters' into saving	11 years ago
ui	Fix for file path issues	11 years ago
water	Simpler, more lightweight underwater effect, changed colors to match vanilla better	12 years ago
CMakeLists.txt	Added shader based MyGUI render manager to allow using Ogre's next generation render systems.	12 years ago
opencs.cfg	Deleted ".directory" text files.	12 years ago
opencs.desktop	Update opencs.desktop	11 years ago
openmw.bmp	Some improvments for windows builds and installer	13 years ago
openmw.cfg	fixed data-local path	12 years ago
openmw.cfg.local	fixed local openmw.cfg file	11 years ago
openmw.desktop	Update openmw.desktop	11 years ago
settings-default.cfg	Merge branch 'master' into HEAD	11 years ago
transparency-overrides.cfg	Added BM trees to transparency overrides	12 years ago