Commit Graph

85 Commits (7c2afc43f4cac1c55f149e37a33a68edae16e937)

Author SHA1 Message Date
scrawl b16bc69479 Removed the no longer needed --debug switch 12 years ago
scrawl 289587b1a9 Cleanup 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
Emanuel Guevel 289bbc64f7 Load fallback archives listed in openmw.cfg at startup 12 years ago
scrawl fe7b2732d8 Avoid manually updating render targets from within frameRenderingQueued 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
Jordan Milne 043e29c620 Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble) 12 years ago
scrawl ed3c23ad9a Fixed crash on changing cell due to Utf8Encoder going out of scope 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
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
Marc Zinnschlag afc2e840ae renamed namespace TranslationData to Translation 12 years ago
Marc Zinnschlag 206c613b52 moved translation storage from GUI manager to engine 12 years ago
lazydev 74ae479780 Cell names localization fix 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
Marc Zinnschlag fd6c155118 Issue #352: added --script-run switch 13 years ago
Marc Zinnschlag 90de02b901 Issue #350: console only script instructions 13 years ago
guidoj 0549e949ba Mostly removal of unnecessary #include's and a little clean up 13 years ago
scrawl d69501b061 change daedric font to .zip resource 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
scrawl 934caf7a2b removed --report-focus which is now useless 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
Marc Zinnschlag 69f0ec99f1 implemented dialogue scripts 13 years ago
Marc Zinnschlag be70d197e5 Merge branch 'next'
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
13 years ago
Marc Zinnschlag e02cba58b1 Merge branch 'master' into next
Conflicts:
	apps/openmw/mwclass/light.cpp
13 years ago
Marc Zinnschlag 27caee664e Merge remote branch 'lgro/config' into config
Conflicts:
	components/files/path.hpp
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
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
Marc Zinnschlag 0c2de2c00c Merge branch 'animation2' 13 years ago
Jacob Essex 18e4b73a86 Added a more detailed fps counter displaying the triangle and batch count 13 years ago
Jason Hooks eab69f18ac File output switch 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 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 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
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
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
Jan-Peter Nilsson a94de76801 Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline) 14 years ago