Commit Graph

528 Commits (move)

Author SHA1 Message Date
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
scrawl a3151fe525 fixed input handling priority in the main loop 13 years ago
scrawl 88c50c5171 Merge branch 'master' into water 13 years ago
scrawl 3f05aba76d got MRT working, some minor quirks to solve (black viewport background) 13 years ago
Sebastian Wick 57ae1bdc43 Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg
Conflicts:
	apps/openmw/main.cpp
13 years ago
Sebastian Wick 73705dadf6 parse fallback with boost program option custom validators 13 years ago
Sebastian Wick ab9c430632 fallback in apps/openmw; fix for apps/mwiniimporter 13 years ago
scrawl 00cc45c537 FPS is now a setting instead of commandline option 13 years ago
scrawl 2b4b941192 Merge branch 'master' into gamesettings 13 years ago
scrawl 5accca385c fix crash on exit when no user settings exist 13 years ago
scrawl 7b3adb27a3 backend changes, terrain num lights setting 13 years ago
scrawl f4bbcb48a6 settings-default.cfg 13 years ago
scrawl 6091a0504d first settings test (config file has to be created manually) 13 years ago
scrawl 30407d3a2c Merge branch 'master' into occlusionquery 13 years ago
scrawl 4e63f89829 silence an error regarding faced handle 13 years ago
Marc Zinnschlag 509650d5f3 Merge remote branch 'ace/fs-fix' 13 years ago
Marc Zinnschlag 0892df0ad3 framework for gamemechanics-realted actor updated 13 years ago
Alexander "Ace" Olofsson 4a9a416d46 Can find files even if no .bsa file exists now 13 years ago
scrawl e6303fc3f4 Merge branch 'master' into water
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
13 years ago
Chris Robinson fa70a72b75 Remove some unused sound manager fields and constructor parameters 13 years ago
scrawl 6067053f08 Merge branch 'next' into water
Conflicts:
	CMakeLists.txt
13 years ago
Chris Robinson 5ae47f783e Use the sound manager's update to make sure music is still playing 13 years ago
Jason Hooks 51fb9e67cd Merge 13 years ago
gugus 7ca0503205 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 13 years ago
Marc Zinnschlag af875896ad fix for issue #179 13 years ago
gugus 10321ff51a Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 13 years ago
gugus 6f7752633a there was no extension in the compiler context. Corrected. But Choice doesn't work. 13 years ago
Michael Papageorgiou 054a176c86 Added new FileLibrary class to handle music, this fixes a number of issues. 13 years ago
Michael Papageorgiou 03ea3bb62f SoundManager: first attempt at refactoring. BROKEN 13 years ago
Marc Zinnschlag 69f0ec99f1 implemented dialogue scripts 13 years ago
Marc Zinnschlag 1e998545c7 fixed log path 13 years ago
Marc Zinnschlag be70d197e5 Merge branch 'next'
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
13 years ago
Marc Zinnschlag 771d50fe69 removed a redundant assert and a left-over comment 13 years ago
Marc Zinnschlag e02cba58b1 Merge branch 'master' into next
Conflicts:
	apps/openmw/mwclass/light.cpp
13 years ago
Marc Zinnschlag 9af08ff18d store screenshots in user directory instead of local directory 13 years ago
Marc Zinnschlag 77201d05bc post-merge fix 13 years ago
Marc Zinnschlag 27caee664e Merge remote branch 'lgro/config' into config
Conflicts:
	components/files/path.hpp
13 years ago
Lukasz Gromanowski bcc4d7a7c9 Issue #133 Handle resources across multiple data directories
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Pieter van der Kloet 17b1546dc1 Changed the way screenshots are created (Bug #191) 13 years ago
Lukasz Gromanowski b004e2479c Issue #133 Handle resources across multiple data directories - WIP
Work In Progress - added support for multiple paths in SoundManager.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Cris Mihalache daa8fb15ce Removed all physics-related code from Engine 13 years ago
Cris Mihalache 6d4fa9274e Moved OpenEngine systems into their appropriate classes 13 years ago
Marc Zinnschlag 16bc374921 animation updates were hooked up to the wrong update function 13 years ago
Jason Hooks ec94ecacaf Zinis branch merge 13 years ago
Lukasz Gromanowski 7c24ae9ac7 Issue #168 - Configuration cleanup - WIP
This is "work in progress" commit, it shall not be merged alone,
without succeeding commits (it's not fully functional).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Jason Hooks 84f45b1972 underwater view 13 years ago
Jason Hooks ff2bbc9fc5 Transparent water 13 years ago
Marc Zinnschlag 0c2de2c00c Merge branch 'animation2' 13 years ago
Jacob Essex 3b15170d09 Cleaned up and simplified the code relating to the fps display 13 years ago
Jacob Essex 18e4b73a86 Added a more detailed fps counter displaying the triangle and batch count 13 years ago
Jason Hooks d1793bc4bd Animation files in the correct directory 13 years ago
Jason Hooks eab69f18ac File output switch 13 years ago
Jason Hooks 653d999ac4 Animation creatures 13 years ago
Marc Zinnschlag 51d5c7cd59 Merge remote branch 'jhooks/mwrender' into mwrender
Conflicts:
	apps/openmw/engine.cpp

- fixed code that did not compile
- removed tons of tabs
- more clean up
13 years ago
Jason Hooks d8367f4968 Activation fix 13 years ago
Jacob Essex 3779aaba62 Now no longer need to handle this exception here as it is handled by the dispatcher in the OpenEngine submodule 13 years ago
Jason Hooks c25b49d2b6 refdata change 13 years ago
Jacob Essex 0e3859385d Now ensures that the directory to the config file exists before Ogre tries to access it 13 years ago
Jason Hooks 965ff24597 Removing Object: 13 years ago
Jason Hooks 0c8aa7fae3 Removing Object: 13 years ago
Jason Hooks 6efc61b9df Removal of MWScene; Object listing fixed 13 years ago
Marc Zinnschlag abeb3a22d4 Issue #19: Cleaned up Engine includes 13 years ago
Marc Zinnschlag bc8db3612a Issue #19: Create OGRE renderer in go function instead of Engine's constructor
This avoids setting up a renderer each time openmw is called with the --help switch.
13 years ago
Marc Zinnschlag 39af941d6f Issue #19: Moved code from Engine to WindowManager and ScriptManager 13 years ago
Marc Zinnschlag 38c0f36d44 Issue #19: Finished cleaning out the Engine framelistener 13 years ago
Marc Zinnschlag 8bf4abf53b Issue #19: Focus Reporting Improvements
- moved focus reporting code out of the framelistener
- made focus reporting optional (new --report-focus switch)
- report based on tiem passed instead of number of frames passed
- only report if focus has changed
13 years ago
Marc Zinnschlag fbcb5fe681 Issue #19: Some more framelistener cleanup 13 years ago
Marc Zinnschlag 8bebae17aa Issue #19: More local script related cleanup 13 years ago
Marc Zinnschlag 896b7da23d Issue #19: fixed RNG in engine's frame listener 13 years ago
Marc Zinnschlag 3bef04cb1d Issue #19: fixed exception handling in engine's frame listener 13 years ago
Marc Zinnschlag 10778d8c3e Issue #19: factored out local script handling into a separate class
This also fixes a bug related to self-destructing references (introduced during the cell handling improvements)
13 years ago
Lukasz Gromanowski d43455fd57 Issue #168: Configuration cleanup, part 2
Corrected --data and --data-local parameters handling.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Lukasz Gromanowski 54cb6deab9 Issue #168: Configuration cleanup, part 2 14 years ago
Lukasz Gromanowski ea7eb7a62d fixes #128 Configuration cleanup.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Marc Zinnschlag b157273cd9 Merge branch 'next'
Conflicts:
	apps/openmw/main.cpp
14 years ago
Lukasz Gromanowski ac9b1715d5 Added new command line option: "encoding"
Added new command line option: "encoding" which allow to
change font encoding used in game messages.

Currently there are three evailable encodings:

    win1250 - Central and Eastern European (languages
              that use Latin script, such as Polish,
              Czech, Slovak, Hungarian, Slovene, Bosnian,
              Croatian, Serbian (Latin script),
              Romanian and Albanian)

    win1251 - languages that use the Cyrillic alphabet
              such as Russian, Bulgarian, Serbian Cyrillic
              and others

    win1252 - Western European (Latin) - default

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Nikolay Kasyanov 31749fc97b Added include for Ogre::macBundlePath to main.cpp and removed such
include from engine.cpp (no longer needed there).
14 years ago
Marc Zinnschlag 8446619ac4 Merge branch 'components_namespaces' into next
Conflicts:
	apps/openmw/mwrender/interior.cpp
	components/bsa/bsa_archive.cpp
14 years ago
Lukasz Gromanowski 2ddd5dba11 Mantis: #18 - Move components from global namespace into their own namespace.
Moving classes from components/nifbullet into NifBullet namespace.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Lukasz Gromanowski 90985e849e Mantis: #18 - Move components from global namespace into their own namespace.
Moving classes from components/misc into Misc namespace.

Note: Misc namespace introduced conflict with ESM::Misc and MWClass::Misc
classes, so both of them are renamed to ESM::Miscellaneous
and MWClass::Miscellaneous.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Lukasz Gromanowski 8a84201ba2 Mantis: #18 - Move components from global namespace into their own namespace.
Moving classes from components/bsa into Bsa namespace.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Marc Zinnschlag e3d05e90d4 Merge remote branch 'swick/MessageBox' into MessageBox 14 years ago
Sebastian Wick a4217f8fb8 Everything should work fine but deleting the existing MessageBox'es. 14 years ago
Marc Zinnschlag 0f2df4e2b8 more cleanup 14 years ago
Jason Hooks 9eefee7168 Say strict 14 years ago
Jason Hooks 65cc0e8317 trying strict 14 years ago
Jason Hooks 2aaa0f4578 Backslash working in linux 14 years ago
Jason b92955763a Introducing Dir Archive 14 years ago
Jason Hooks 51b74c2f05 starting 14 years ago
Jason Hooks b945ce61a5 Merge remote branch 'upstream/master' 14 years ago
Marc Zinnschlag 64d6ee26bd changed OGRE framelistener function from frameStarted to frameRenderingQueued 14 years ago
Marc Zinnschlag 8829398bfc added --fs-strict switch 14 years ago
Marc Zinnschlag 6e880cffb2 changed engine class to support multiple data directories for esm files 14 years ago
Marc Zinnschlag 58cbdfd762 Merge branch 'journal' 14 years ago
Marc Zinnschlag 8b9ee30924 user/global mixup 14 years ago
Marc Zinnschlag bdfd28f44d adjusted components/files namespace; some related cleanup 14 years ago
Marc Zinnschlag 7131c08ca4 moved path.hpp/path.cpp to a new component 14 years ago
Jason Hooks 2ac1cc8aee Trying to animate creatures 14 years ago
Marc Zinnschlag 190f77f6c9 added journal class 14 years ago
Jan-Peter Nilsson dc4e6216c3 Initialize member variables in the same order they are defined to avoid compiler warning 14 years ago
Pieter van der Kloet 833a61dd82 Fixed Boost errors with 1.46 caused by the deprecated name file_string() 14 years ago
gugus 2aee958789 Not sure about this commit: the PhysicEngine was initialized twice... 14 years ago
gugus 0fb2107265 Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
Conflicts:
	apps/openmw/mwclass/npc.cpp
14 years ago
Marc Zinnschlag 4100a72e8d don't do physics calculations while the GUI is up 14 years ago
Nikolay Kasyanov edcac879d7 Oops. Used tabs instead of 4 spaces. Fixed. 14 years ago
Nikolay Kasyanov 768c9bdf07 On OS X openmw now sets current directory to bundle root, openmw.cfg values is relative to bundle root 14 years ago
Nikolay Kasyanov 943eea8104 .app bundle finally works 14 years ago
Jan-Peter Nilsson fb2f6f3c02 Delete mPhysicEngine when we are done with it 14 years ago
Jan-Peter Nilsson 1ce77229c0 Don't create physics before we have initialized ogre 14 years ago
gugus ff941b5963 add physic 14 years ago
sergoz 5132531f73 added fps counter 14 years ago
Marc Zinnschlag 9a3158675a reworked cell changing mechanism 14 years ago
Marc Zinnschlag ca44b3640a pasing movement data from mwmechanics to mwscene and fixed a very stupid interface bug 14 years ago
Marc Zinnschlag 40d772b33a call doPhysics function once per frame 14 years ago
Jan-Peter Nilsson 8cb8481b37 Use a local plugins.cfg if available (allow us to run without installing) 14 years ago
Jan-Peter Nilsson 0b1f18cc12 plugins.cfg is global config 14 years ago
Jan-Peter Nilsson 429775d485 Store configuration in /etc/openmw/ and ~/.openmw/ on linux
Requires new openengine version.
14 years ago
Marc Zinnschlag 42ef7a61a0 Merge branch 'script'
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/world.cpp
	apps/openmw/mwworld/world.hpp
14 years ago
Marc Zinnschlag 4dd8616f87 Merge remote branch 'pvdk/master'
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwsound/soundmanager.cpp
14 years ago
Pieter van der Kloet dd4d022301 Converted all tabs to four spaces 14 years ago
Jan-Peter Nilsson ba18dc46ef Don't try to play random tunes when sound is disabled 14 years ago
Marc Zinnschlag 4a12be11bf moved PlayerPos class from MWRender to MWWorld and renamed it to Player 14 years ago
Marc Zinnschlag 67a745cdf6 workaround for NPC activation crash 14 years ago
Marc Zinnschlag 5336b90149 music player and NPC rendering branch 14 years ago
Jason Hooks a9892161af MP3 functions moved to soundmanager 14 years ago
Jason Hooks be1582a88f Regional Sounds 14 years ago
Jason Hooks a038c67e5a Preliminary region sound framework2 14 years ago
Jason Hooks cab2341259 Preliminary region sound framework 14 years ago
Jason Hooks a7c3a29ffd Music Player with directory mp3 lookup 14 years ago
Jason Hooks 74aba13053 Music Player 14 years ago
Jan Borsodi 38b434771a Merge remote branch 'zini/master' into gui-windows 14 years ago
Marc Zinnschlag 38ab9f7a3d Merge branch 'newchar'
Conflicts:
	components/esm_store/store.hpp
14 years ago
Jan Borsodi c45811770a Added a custom widget for displaying dynamic stats (health, magicka, fatigue). Can show a title/label, graphical bar and detailed text. 14 years ago