Commit Graph

172 Commits (coverity_scan)

Author SHA1 Message Date
scrawl d878456d0f Don't add an extra path separator 11 years ago
scrawl 54d8606b78 Fix logging fatal exceptions to cerr, and log them to openmw.log 11 years ago
scrawl d60df66811 Change openmw.log to boost ofstream to fix unicode path on windows (see https://github.com/OpenMW/openmw/pull/108) 11 years ago
Marc Zinnschlag 2faeceacfa Merge remote-tracking branch 'scrawl/master'
Conflicts:
	apps/openmw/main.cpp
11 years ago
Emanuel Guevel a41339da1e Write logs in log directory
The crash.log file was created in the working directory, requiring users
that had installed the game to run it with augmented privileges to be
able to create the file.
11 years ago
scrawl 65d5311037 Revert "Don't try to show exceptions in a message box if SDL was not initialized"
According to SDL docs, "This function may be called at any time, even before SDL_Init()".

Also fixes an issue where message boxes weren't working due to SDL_Quit already having been called by ~Engine.

This reverts commit 39eea24dc3.

Conflicts:
	apps/openmw/main.cpp
11 years ago
Marc Zinnschlag d6e212a02b Merge branch 'master' into script 11 years ago
pvdk f263acdac6 Merge remote-tracking branch 'upstream/master' into versioninfo 11 years ago
Marc Zinnschlag 4ee43612f6 added new switch: --script-warn 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
pvdk c95b8bcb39 Moved the generated version header stuff into components 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
Dmitriy 'Endorph' Shkurskiy 7023395012 Windows-specific definition to omit inclusion of unused stuff from Windows.h 11 years ago
scrawl fb845e81a4 Rename nosound to no-sound for consistency 11 years ago
scrawl 85ed21dbd2 Remove unused command line option 11 years ago
scrawl 81ec8c2f55 Handle --version and --help before reading configuration - putting these options into openmw.cfg makes no sense 11 years ago
scrawl 19e5978a01 Merge branch 'master' of https://github.com/zinnschlag/openmw
Conflicts:
	apps/openmw/main.cpp
11 years ago
scrawl 39eea24dc3 Don't try to show exceptions in a message box if SDL was not initialized 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
Alexander "Ace" Olofsson baacf91de4 Another windows build fix 11 years ago
scrawl 845bc5f7eb Show fatal exceptions in a message box instead of cerr when running without a terminal 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
scrawl f990ba09f0 gdb detection doesn't seem to work for the forked process 11 years ago
scrawl 883140babf Add missing include for signals to make travis happy 11 years ago
scrawl b9899696e3 Add a crash catcher for unix. When encountering a fatal signal, attach gdb and log backtrace. 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
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 7dc30a01cd Some changes suggested by cppcheck 12 years ago
Alexander "Ace" Olofsson 0a2ed8b0d7 Make OpenMW able to initialize SDL in windows builds 12 years ago
Marc Zinnschlag b5926257f5 Merge remote-tracking branch 'scrawl/sdl_input2' 12 years ago
scrawl b16bc69479 Removed the no longer needed --debug switch 12 years ago
vorenon ed6098388f return false instead of std::exit 12 years ago
vorenon 9ac4a9c5eb Don't start OpenMW if no master file is selected. This fixes bug #813 12 years ago
Emanuel Guevel 289bbc64f7 Load fallback archives listed in openmw.cfg at startup 12 years ago
Mark Siewert eefbdde6de - For pull request: remove all instances of maps used to track refnumbers.
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
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
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 2d468fec02 made previous commits naming standard compliant 12 years ago
lazydev 74ae479780 Cell names localization fix 12 years ago
Greendogo 8b18d195bd Update apps/openmw/main.cpp
Edited the description for the --script-run switch.
12 years ago
Mark Siewert 64c08eada4 Merge remote-tracking branch 'upstream/next' into multiple_esm_esp 12 years ago
Marc Zinnschlag 35d099a638 disabling gcc extensions 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 b0506e2220 re-enabling support for multiple data directories 13 years ago
Marc Zinnschlag 2ccecd839b improved the help text for --script-run; updated readme.txt 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
guidoj a021165d9f Changed standard C lib includes to C++ format 13 years ago
guidoj 0549e949ba Mostly removal of unnecessary #include's and a little clean up 13 years ago
scrawl 934caf7a2b removed --report-focus which is now useless 13 years ago
Sebastian Wick f7bfea5861 typo 2 -.- 13 years ago
Sebastian Wick 56c9992b29 typo 13 years ago
Sebastian Wick 8c84f68dab fix for older boost versions; unsigned warning 13 years ago
Sebastian Wick 5dd65c11ee forgot to save the file 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 d3a6484bbc set the default value for --fallback the right way 13 years ago
Sebastian Wick a974d88cf1 Revert "set a default value for --fallback"
This reverts commit 94a220dcdd.
13 years ago
Sebastian Wick 94a220dcdd set a default value for --fallback 13 years ago
Sebastian Wick 48b7b03453 typo; World::getFallback(std::string key, std::string def) 13 years ago
Sebastian Wick de510d445b throw an error if the --fallback syntax is wrong 13 years ago
Sebastian Wick 73705dadf6 parse fallback with boost program option custom validators 13 years ago
Sebastian Wick d87dffa948 should work... but does not even compile 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
Marc Zinnschlag 4c2fffdd61 temporarily disabled multi data path support in OpenMW 13 years ago
Marc Zinnschlag 68da94c8f0 workaround for older boost versions 13 years ago
Lukasz Gromanowski d5f1d7eed7 Fix for processing tokens inside data-local config option.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Marc Zinnschlag 547d6a0639 Merge remote branch 'lgro/config' into config 13 years ago
Lukasz Gromanowski 0c0b594090 Issue #168 - Configuration cleanup
Removed unnecessary path methods - according to forum disscusion:

http://openmw.org/forum/viewtopic.php?f=6&t=448

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Marc Zinnschlag 27caee664e Merge remote branch 'lgro/config' into config
Conflicts:
	components/files/path.hpp
13 years ago
Lukasz Gromanowski 1d96b99532 Issue #168 - Configuration cleanup
Added tokens processing, modified getInstallPath for linux
so we could use ~/.wine/dosdevices symlinks.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Lukasz Gromanowski 406897aa64 Issue #168 - Configuration cleanup - WIP
Sources update.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
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 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
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 0bf2a2df41 Mantis: #3 - Fixed spelling error "Font" -> "Character"
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 d9a25427c5 added --version command line option 14 years ago
Nikolay Kasyanov e48d265b5d Mac fix: added local config dir support, app root dir is dir where bundle located 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
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
Marc Zinnschlag 8829398bfc added --fs-strict switch 14 years ago
Marc Zinnschlag ef1e986a87 added --data-local switch 14 years ago
Marc Zinnschlag e60f0e3b38 --data switch accepts multiple directories now 14 years ago
Marc Zinnschlag 6e880cffb2 changed engine class to support multiple data directories for esm files 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
Marc Zinnschlag fc2d659925 Merge remote branch 'jpn/config' into config 14 years ago
Marc Zinnschlag f4f12e885f all program options (except help) can now be used from a cfg file 14 years ago
Marc Zinnschlag 8915e8a751 change in multi_es branch broke fps switch; fixed now 14 years ago
Jan-Peter Nilsson f2faa34bd9 If there is an openmw.cfg in the current path, use it as global config 14 years ago
Marc Zinnschlag beb1422c77 allow multiple --master and --plugin command line arguments 14 years ago