Commit Graph

419 Commits (912dcdc4184936573d374fec06f56295bbf51112)

Author SHA1 Message Date
scrawl d36dfbe779 Apply the frame time cap to Ogre's ControllerManager (Fixes #2154)
This fixes particle systems getting out of whack due to a particularly long frame time, e.g. after a loading screen.
10 years ago
Jordan Ayers aac2de270e Cleanup: Don't call <environment obj>.get().
mEnvironment.get() is redundant.  Switch the call to resemble the
surrounding environment get() calls, instead.
10 years ago
scrawl 9c0649c11d Add basic framework to retrieve font colors from fallback settings (Feature #704) 10 years ago
scrawl 54dac1460c Run global scripts after running local scripts
Turns out to be a compatibility problem with Calvus Horatius contract scripts. The local script needs to be run first, otherwise the cleanup when he quits as result of negative profit does not work properly.
10 years ago
Marc Zinnschlag 19f469c7db Merge remote-tracking branch 'scrawl/master' 10 years ago
Marc Zinnschlag d1d861e1be Merge branch 'run'
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/CMakeLists.txt
10 years ago
scrawl 4426b03fa4 Remove some garbage 10 years ago
scrawl 0c273568f2 Increment version number for input configuration
Old files are broken by keycode->scancode switch (319f4e0547)
10 years ago
scrawl 36a90198e2 Add option to change screenshot image format 10 years ago
scrawl 2379c0ada7 Pause frame updates when the window is minimized (Fixes #1868) 10 years ago
Marc Zinnschlag a9df3b53fd restored --new-game switch 10 years ago
scrawl 2b407a9995 Refactor NIF cache
- Remove broken cache locking mechanism

This was supposed to unload NIFFiles after a cell transition completes, but it was never working due to a mistake on the line if (--sLockLevel), should have been if (--sLockLevel == 0). Repairing this would increase load times (NIF files would have to be reloaded more frequently), so just removed it for now.

 - Decouple cache from NIFFile (now a new nifcache component)

 - Add API for future background loading

 - Provide a reliable way (SharedPtr) to hold on to loaded NIFFiles. This will be useful to avoid deep copies of keyframe and text key data, which is currently a performance bottleneck.
11 years ago
scrawl 63cb91db2e Add --export-fonts command line option 11 years ago
Marc Zinnschlag d0654f3ade move starting of startup scripts from engine startup to new game start; also restart all startup scripts on saved game load 11 years ago
Marc Zinnschlag a3c4000198 moved call to Globalscripts::addStartup out of the constructor because at the time of construction the environment may not be set up yet to perform this operation 11 years ago
Marc Zinnschlag d87630b41a blacklisting for scripts in OpenMW 11 years ago
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