Commit Graph

403 Commits (e33ee52b917c2e9a295b89b20c6cd117db32a439)

Author SHA1 Message Date
scrawl 326c747508 Don't run scripts when in pause menu (Fixes #1495) 11 years ago
scrawl 797134aa51 Handle activation scripts in AiActivate (Fixes #1478) 11 years ago
scrawl 41ab7329a8 Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202
Note: breaks compatibility with input.xml, so the filename was changed.
11 years ago
scrawl 3b3b53d665 Support animated main menus (menu_background.bik)
Closes #1362
11 years ago
scrawl e68600eda2 Make Activate instruction work properly even when onActivate was not called in the same frame.
There are two major differences to the old implementation:
 - Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low.
 - The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action.

Fixes #1166 and #1346.
11 years ago
Marc Zinnschlag 6ac700a501 Merge remote-tracking branch 'potatoesmaster/getClass' 11 years ago
Marc Zinnschlag 244eb11651 Merge remote-tracking branch 'greye/widechar' 11 years ago
Emanuel Guevel 1e4a854433 Remove static method MWWorld::Class::get(&Ptr)
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
11 years ago
greye 8b94e31062 try to set relative path to resources 11 years ago
scrawl b39b572c5a Moved mStartupScript to World, so that it is executed for a New game 11 years ago
scrawl 9fe505c8fa Only run --script-run commands when bypassing the menu
Running them while no game is started yet is dangerous, and also leaves bits and pieces of state (e.g. in LocalScripts for scripted items added to inventory) that will not get cleaned up properly when a game is loaded (since when no game was previously running, no cleanup is performed). As a result, dangling MWWorld::Ptrs were left in LocalScripts.
11 years ago
scrawl d70306382e Don't create the player object until the game starts
Fixes a crash introduced in e591d23 when using --skip-menu=0.
11 years ago
scrawl 6eca5ac4bb Fixes #1296: Streamlined cellChanged detection 11 years ago
scrawl 4f852daf45 Don't play company logo when using --skip-menu 11 years ago
scrawl f2cd37edd0 Play company logo movie 11 years ago
scrawl 5906d795c0 Refactored video player (now a MyGUI widget) 11 years ago
scrawl 2e4ef93b28 Add proper main menu (background image, logo animation, title music) 11 years ago
Marek Kochanowicz 6416ae90d2 Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/subviews.cpp
11 years ago
Marc Zinnschlag 7bc97fb8b8 reworked code for player positioning on startup and new game 11 years ago
Marc Zinnschlag 2de862126a moved resources group creation from Engine to bsa component 11 years ago
scrawl edb5a54092 Include some more required Ogre headers explicitely. 11 years ago
scrawl a99aa15d14 Fix a copy&paste mistake leaving start rotation uninitialized 11 years ago
Marc Zinnschlag 4ee43612f6 added new switch: --script-warn 11 years ago
scrawl 49e26415be Don't call loadGame() from within the MWMechanics::Actors update sequence 11 years ago
Marc Zinnschlag 1b5301eec0 Merge branch 'savedgame'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
11 years ago
Marc Zinnschlag 29c3a288e3 load and save of reference in cells (without CustomData state) 11 years ago
scrawl 28185e2017 Death/godmode fixes: Revive player *after* character update, since there might be fall damage. 11 years ago
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
scrawl 9b9c39af7a Fix being able to activate magic bolts mid-flight 11 years ago
gus 828e5841d8 Windows SDL fix 11 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 11 years ago
scrawl 62774fcc4a Merge branch 'master' into HEAD
Conflicts:
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/loadtes3.cpp
11 years ago
scrawl b8e9343764 Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes 11 years ago
scrawl 85ed21dbd2 Remove unused command line option 11 years ago
scrawl 33389b9b63 XDG compliant paths 11 years ago
mrcheko a854eb73db StateRunning check returns 11 years ago
mrcheko f50ff0b1c4 reworked http://bugs.openmw.org/issues/428 11 years ago
scrawl 0bc3a13c0f Break invisibility on Use or Activate 11 years ago
Marc Zinnschlag 030c733e2d Merge branch 'master' into savedgame
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
11 years ago
scrawl afa71bb622 Throw an exception if a BSA is not found 11 years ago
scrawl bcf61331ab Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger. 11 years ago
Marc Zinnschlag 35e8e23037 keep track of total play time per character 11 years ago
Marc Zinnschlag 616e3aa32f store content file list in saved games and reject saved games not matching the current game 11 years ago
Marc Zinnschlag 5e64888227 added basic save slot management and connected main menu save to save function (bypassing the save GUI for now) 11 years ago
Marc Zinnschlag 82c8495338 removed boolean running flag with state enum 11 years ago
Marc Zinnschlag c5f81e3508 don't run udpates if no game is running 11 years ago
Marc Zinnschlag ec5b2e9a7e added running flag; moved new game code to MWState 11 years ago
Marc Zinnschlag 31ec973c9c removed default value for --start 11 years ago
Marc Zinnschlag b3a7c8c098 removed --new-game switch 11 years ago
Marc Zinnschlag 7a4b604376 added --skip-menu switch 11 years ago