Commit Graph

560 Commits (coverity_scan)

Author SHA1 Message Date
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
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
Marc Zinnschlag f19973450f moved exit game flag from Environment to StateManager 11 years ago
Marc Zinnschlag 79b7fa258b added new mwstate subsystem 11 years ago
scrawl 992a8e9c36 Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore. 11 years ago
Marc Zinnschlag 418ccf705d Merge branch 'openmw-27'
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
11 years ago
Marc Zinnschlag f4e6f31658 Merge remote-tracking branch 'scrawl/openmw-27' 11 years ago
scrawl 3a827d9c12 Deleted Obliviontt.zip 11 years ago
scrawl 636d399c7f Refactored Ogre initialisation into a component 11 years ago
scrawl 4f35fd8184 Removed a workaround from Renderer, some cleanup 11 years ago
Marc Zinnschlag c995533e07 Merge branch 'dialogue' into saving
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
11 years ago
greye 4cdb57e388 workaround segfault on --new-game switch 11 years ago
Lukasz Gromanowski 9c2145eda1 Issue #913: Merge --master and --plugin switches
Merged master/plugin switches into content in openmw
and mwiniimporter.

Extension in content files is now required.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl d3d6dfbde8 Refactored loading screen
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
12 years ago
scrawl ebf9debb80 Enabled terrain self shadows, implemented getHeightAt, some optimizations 12 years ago
scrawl e27437f8ed New terrain renderer - improvements:
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
 - Fixes several blending issues and cell border seams
 - Fix map render to use the terrain bounding box instead of an arbitrary height
 - Different LODs are now properly connected instead of using skirts
 - Support self shadowing
 - Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
 - Support a fixed function fallback (though the splatting shader usually performs better)
 - Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
12 years ago
Alex b9579e085f cleanup 12 years ago
Alex c3ca5b7c32 mild cleanup 12 years ago
Alex de1f423bd7 initial move of script opcodes and registerExtensions functions to components/compiler 12 years ago
scrawl 7dc30a01cd Some changes suggested by cppcheck 12 years ago
greye e553f285b8 update player position on engine start 12 years ago
Sebastian Wick 8bdc9ff3ae set position of the window for multiple monitors 12 years ago
Vincent Heuken 09cca0bf80 more detailed error message when SDL fails to initialize 12 years ago
scrawl b16bc69479 Removed the no longer needed --debug switch 12 years ago
scrawl 289587b1a9 Cleanup 12 years ago
scrawl 4fb32f7f05 Moved window resize messages to sdlinputwrapper 12 years ago
scrawl 403704b92a Use openmw.png for SDL_SetWindowIcon 12 years ago
scrawl 495aeb5d3b Merge branch 'master' into HEAD
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/mwgui/cursorreplace.cpp
	apps/openmw/mwgui/cursorreplace.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwgui/windowmanagerimp.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	libs/openengine/ogre/renderer.cpp
12 years ago
scrawl daab4f55a3 Use Morrowind's fonts 12 years ago
scrawl aaa9aba999 Some fixes 12 years ago
scrawl c41f119ba6 Added new game button 12 years ago
scrawl ac4fa1941d Fix the frame update not getting called on the first frame 12 years ago
Glorf 74de8b83b6 Enabled collision when new game 12 years ago
scrawl 2693b78536 Add initial player inventory when new game is started 12 years ago
scrawl 2eb9395661 Do some padding with zeros on the resource group name to avoid priority problems with more than 10 resource groups. 12 years ago
scrawl 86bac7aa92 Fix wrong BSA group name typo 12 years ago
scrawl f0d49fdbd0 Create separate groups for each data dir / BSA file. 12 years ago
scrawl 05a5cb3ae4 Improved responsiveness of the inventory window when resizing. 12 years ago
scrawl df0ee82a3c Loose files should have priority over BSA resources. This makes texture replacers work. 12 years ago
Emanuel Guevel 289bbc64f7 Load fallback archives listed in openmw.cfg at startup 12 years ago
scrawl c8b31b4745 Remove an outdated message 12 years ago
scrawl fe7b2732d8 Avoid manually updating render targets from within frameRenderingQueued 12 years ago
scrawl 05bd94effb Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
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
12 years ago
Nathan Jeffords 109dff2d29 renamed high level NIF files... 12 years ago
Nathan Jeffords d3c1f5e7b2 renamed low-level NIF related files and include guards to conform to naming convention 12 years ago
scrawl d8f2d0195a Got rid of the texture rotation hack by rendering the cursor manually. 12 years ago
scrawl cacdb33b42 Merge branch 'master' into graphics
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
12 years ago
Chris Robinson df8889dcc4 Limit maximum frame time to 200ms
This effectively slows game time when it drops below 5 fps. Something like this
is desirable when dealing with time-based animations, which can jump forward
after a lengthy cell transition.
12 years ago
scrawl db9e49968e Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson 3c0b29de45 Merge remote-tracking branch 'zini/master' into animation2 12 years ago
lazydev 71e5369f04 Loading translation data for all the plugin files, not only for the first one 12 years ago
scrawl 42883ec64b cleanup 12 years ago
Chris Robinson 34ddf69a31 Merge remote-tracking branch 'zini/next' into animation2 12 years ago
scrawl d47090b312 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Mark Siewert dca8dc4fdb Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/esmreader.hpp

- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.
12 years ago
Chris Robinson 3c02e1ccc9 Run physics right after updating the actors 12 years ago
Chris Robinson 1ce8eaf52c Merge remote-tracking branch 'zini/master' into animation2
Conflicts:
	apps/openmw/mwrender/actors.cpp
	apps/openmw/mwrender/actors.hpp
12 years ago
Jordan Milne 10a3caa504 more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine 12 years ago
Jordan Milne 9b485a86ef resize the window in a slightly less bad way, fix my check in setUseHardwareCursors to be the right way round 12 years ago
Jordan Milne 043e29c620 Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble) 12 years ago
Jordan Milne d26e33eb26 Merge branch 'master' into sdl_input 12 years ago
Jordan Milne b6ec64485c fix includes for Windows 12 years ago
Jordan Milne 5a6589af01 extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start 12 years ago
scrawl 52516ca4b4 Merge branch 'master' into graphics 12 years ago
scrawl ed3c23ad9a Fixed crash on changing cell due to Utf8Encoder going out of scope 12 years ago
Nathan Jeffords d5ebd6654d cache loaded NIF files to eliminate reloads
Created a NIF file caching mechanism to prevent the system from
reloading a NIF during a startup and cell changes.
12 years ago
Nathan Jeffords d469415e59 factored out two function from OMW::Engine::go
The initialization code inside Engine::go is now in two function it
calls prior to running the main loop.
12 years ago
scrawl 6ef85c46fd Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
scrawl 55769aaf91 Fix selection buffer (i.e. item selection on the inventory character preview) when object shaders were disabled 12 years ago
Nathan Jeffords 44031ec3d7 fleshed out BSAArchive and DirArchive.
Implemented both lists & finds, with pattern matching.

Conflicts:
	components/bsa/bsa_archive.cpp
12 years ago
Nathan Jeffords 719663d86e added option to override the activation distance
The command line option '--activate-dist <int>' can be used to override
the in game activation distance.
12 years ago
Nathan Jeffords b9fbd6ae4b Factored faced object lookups into MWRender::World
* Renamed MWWorld::World::getFacedHandle to getFacedObject.
 * Changed it to return an object pointer
 * Updated clients to use return object directly.
12 years ago
Emanuel Guevel 63f09462fd to_utf8, Utf8Encoder: pass encoding as constructor parameter
Edit other files accordingly.
12 years ago
lazydev cd5d95ed22 1. Dialogs in Russian version now works.
2. Destination names it travel window are now translated
12 years ago
Marc Zinnschlag 206c613b52 moved translation storage from GUI manager to engine 12 years ago
lazydev 1f71395660 renaming of translation component; removing of C++11 features 12 years ago
lazydev 74ae479780 Cell names localization fix 12 years ago
Mark Siewert 8ea9f00e6f Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/cellstore.hpp
	apps/openmw/mwworld/containerstore.cpp
	apps/openmw/mwworld/localscripts.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm_store/reclists.hpp
	components/esm_store/store.cpp
	extern/shiny

- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
12 years ago
Marc Zinnschlag 2a1727d4c5 improved error reporting for dialogue scripts (enabled via --script-verbose) 12 years ago
Marc Zinnschlag 79706bf60f Issue #219: dialogue manager cleanup 12 years ago
Mark Siewert 64c08eada4 Merge remote-tracking branch 'upstream/next' into multiple_esm_esp 12 years ago
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
Mark Siewert 1f961d575e Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	components/esm/loadland.hpp
	components/esm_store/reclists.hpp
12 years ago
Mark Siewert 28d4d7ea3f Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging.
- Remove check for 255 master/plugin files.
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
Marc Zinnschlag 35f478071e Issue #255: deleted the old environment class and using the new one instead 13 years ago
Marc Zinnschlag 7102a825c2 Issue 255: moved global scripts into script manager (simplifying the environment class) 13 years ago
scrawl 934caf7a2b removed --report-focus which is now useless 13 years ago
scrawl cac662ca98 basic tooltips 13 years ago
Marc Zinnschlag a4fb71a0fc Merge remote branch 'scrawl/graphics' 13 years ago
scrawl 800df7376c use the cursors from morrowind.bsa and remove mwpointer.png 13 years ago
scrawl a727bcd4a4 override nif transparency settings (part 1) 13 years ago
scrawl 2a4fcf42a3 basic shadows 13 years ago
scrawl b1c84f28a9 Merge branch 'master' into water
Conflicts:
	files/settings-default.cfg
13 years ago
Marc Zinnschlag f52b9cc162 Merge branch 'autoequip' 13 years ago
scrawl e492a69c8f Merge branch 'inputfix' into water 13 years ago