Commit Graph

271 Commits (d24e3eec9f4dcf17e5352eda162fbafe48def835)

Author SHA1 Message Date
emoose cadc753216 Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell
Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery
Bug #430 fix is only tested in interiors (ToddTest)
12 years ago
emoose c8cc6b6e65 Fixed: engine: Bug #437 Stop animations when paused; tooltips: capitalize first letter (eg paper -> Paper) 12 years ago
Marc Zinnschlag 3f6afb13f1 Merge remote-tracking branch 'scrawl/alchemy' 12 years ago
scrawl d76522e7a4 searchPtrViaHandle 12 years ago
scrawl 28cc480ce1 fix some alchemy issues and make the gui use the new implementation 12 years ago
scrawl 84a4fd56c3 consider all files in Splash directory 12 years ago
greye 2fa4ac177a initial resolving 12 years ago
scrawl 9106e5307c moved global map from RenderingManager to gui and removed world method 12 years ago
greye 18cc435aa1 resolving conflicts 12 years ago
scrawl 86cfc91ef3 global map rendering 12 years ago
scrawl 32de090079 Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities 12 years ago
greye 7606ebafd6 resolving conflicts, minor update 12 years ago
scrawl 7ad80e306b fixed the disappearing 12 years ago
scrawl 2b339f6c0f loading screen 12 years ago
scrawl c27ff546e4 shader cache 13 years ago
scrawl 19ae30ee68 Merge branch 'master' into next
Conflicts:
	apps/openmw/mwbase/inputmanager.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.hpp
	apps/openmw/mwinput/mouselookevent.cpp
13 years ago
greye 392e6efcb5 initial player rendering 13 years ago
greye c46eeaa100 initial 3d-person camera support 13 years ago
scrawl bc6e4feedc hotkey window first version 13 years ago
scrawl 976ad7a301 key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw 13 years ago
scrawl 86d6f190bf Input system rewrite 13 years ago
Marc Zinnschlag 6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 0231533d05 Issue #107: InputManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag b68f9d6a28 Issue #107: MechanicsManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 6bd48d12af Issue #107: SoundManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag d00d40cc3f Issue #107: Journal is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 923109b260 Issue #107: DialogueManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 28ecfb4290 Issue #107: ScriptManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag fd6c155118 Issue #352: added --script-run switch 13 years ago
Marc Zinnschlag 90de02b901 Issue #350: console only script instructions 13 years ago
scrawl 1fef086088 Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup"
This reverts commit 546b640022, reversing
changes made to fcaa8aae06.
13 years ago
scrawl f8d6a36196 Merge branch 'master' into nif-cleanup
Conflicts:
	apps/openmw/mwrender/sky.cpp
	apps/openmw/mwrender/sky.hpp
	components/nifogre/ogre_nif_loader.cpp
	components/nifogre/ogre_nif_loader.hpp
13 years ago
scrawl 546b640022 Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup 13 years ago
scrawl 014396e80c remove the plugins.cfg files, do not enforce CG plugin 13 years ago
Chris Robinson 6047dc6a0c Merge remote branch 'zini/master' into nif-cleanup
Conflicts:
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/animation.hpp
	apps/openmw/mwrender/creatureanimation.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/npcanimation.hpp
	components/nifogre/ogre_nif_loader.hpp
13 years ago
guidoj 0549e949ba Mostly removal of unnecessary #include's and a little clean up 13 years ago
Chris Robinson 386ac56bda Remove the NIF loader and code to manually transform the vertices
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
13 years ago
Marc Zinnschlag 4c39fefd1e Issue #107: World is accessed only through the interface class from now on; some include cleanup 13 years ago
Marc Zinnschlag 76174098c7 Issue #107: CellStore moved from ESMS to MWWorld 13 years ago
scrawl 63ce143a04 fix triangle / batch counts with compositors 13 years ago
Mark Siewert bef4bef5d2 - Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied.
- Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first.
- Support deleting parent entries from the list.
13 years ago
scrawl 51b8a76a68 merged by branches together, starting with alchemy window
Merge branch 'guimode_stacking' into next

Conflicts:
	apps/openmw/mwgui/mode.hpp
13 years ago
scrawl 7ebbc099b3 allow stacking gui modes 13 years ago
scrawl 343bbaf0fd integrated video settings in the settings file, the launcher is now useless 13 years ago
Marc Zinnschlag bee03b5180 Merge remote branch 'scrawl/gui' 13 years ago
scrawl d69501b061 change daedric font to .zip resource 13 years ago
scrawl 2b584300d6 throw an exception when no default settings file is found, which indicates a packaging error 13 years ago
Marc Zinnschlag e26f39e563 fixed exception handling during subsystem setup 13 years ago
scrawl 7f15385dc5 unrelated cleanup 13 years ago
scrawl 1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp
13 years ago