mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 22:19:54 +00:00
Code Issues Releases Wiki Activity
27588 commits 38 branches 54 tags 122 MiB
Commit graph

224 commits

Author SHA1 Message Date
Marc Zinnschlag
d87630b41a blacklisting for scripts in OpenMW 2014-07-21 09:34:10 +02:00
slothlife
ead801f2d0 Fix for compiling Win32 debug. 2014-06-21 21:15:41 -05:00
scrawl
d878456d0f Don't add an extra path separator 2014-06-19 01:10:33 +02:00
scrawl
54d8606b78 Fix logging fatal exceptions to cerr, and log them to openmw.log 2014-06-13 22:04:20 +02:00
scrawl
d60df66811 Change openmw.log to boost ofstream to fix unicode path on windows (see https://github.com/OpenMW/openmw/pull/108) 2014-06-11 16:56:41 +02:00
Marc Zinnschlag
2faeceacfa Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/openmw/main.cpp
 2014-06-11 08:51:18 +02:00
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.
 2014-06-10 23:46:49 +02:00
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
 2014-06-10 04:10:34 +02:00
Marc Zinnschlag
d6e212a02b Merge branch 'master' into script 2014-02-13 15:02:02 +01:00
pvdk
f263acdac6 Merge remote-tracking branch 'upstream/master' into versioninfo 2014-02-03 02:27:24 +01:00
Marc Zinnschlag
4ee43612f6 added new switch: --script-warn 2014-02-02 14:09:59 +01:00
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
 2014-01-24 18:28:35 +01:00
pvdk
c95b8bcb39 Moved the generated version header stuff into components 2014-01-22 17:33:55 +01:00
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
 2014-01-06 00:23:17 +01:00
Dmitriy 'Endorph' Shkurskiy
7023395012 Windows-specific definition to omit inclusion of unused stuff from Windows.h 2014-01-04 07:46:29 +02:00
scrawl
fb845e81a4 Rename nosound to no-sound for consistency 2013-12-26 20:53:52 +01:00
scrawl
85ed21dbd2 Remove unused command line option 2013-12-26 20:53:51 +01:00
scrawl
81ec8c2f55 Handle --version and --help before reading configuration - putting these options into openmw.cfg makes no sense 2013-12-26 20:53:51 +01:00
scrawl
19e5978a01 Merge branch 'master' of https://github.com/zinnschlag/openmw 
Conflicts:
	apps/openmw/main.cpp
 2013-12-16 13:35:31 +01:00
scrawl
39eea24dc3 Don't try to show exceptions in a message box if SDL was not initialized 2013-12-13 03:50:01 +01:00
Marc Zinnschlag
030c733e2d Merge branch 'master' into savedgame 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
 2013-12-07 12:27:06 +01:00
Alexander "Ace" Olofsson
baacf91de4 Another windows build fix 2013-12-06 11:37:29 +01:00
scrawl
845bc5f7eb Show fatal exceptions in a message box instead of cerr when running without a terminal 2013-12-05 15:51:07 +01:00
scrawl
bcf61331ab Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger. 2013-11-29 20:06:54 +01:00
scrawl
f990ba09f0 gdb detection doesn't seem to work for the forked process 2013-11-16 20:55:41 +01:00
scrawl
883140babf Add missing include for signals to make travis happy 2013-11-16 17:00:26 +01:00
scrawl
b9899696e3 Add a crash catcher for unix. When encountering a fatal signal, attach gdb and log backtrace. 2013-11-16 15:56:15 +01:00
Marc Zinnschlag
31ec973c9c removed default value for --start 2013-11-16 12:08:00 +01:00
Marc Zinnschlag
b3a7c8c098 removed --new-game switch 2013-11-16 11:36:32 +01:00
Marc Zinnschlag
7a4b604376 added --skip-menu switch 2013-11-16 11:33:20 +01:00
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>
 2013-09-29 09:11:57 +02:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
Alexander "Ace" Olofsson
0a2ed8b0d7 Make OpenMW able to initialize SDL in windows builds 2013-06-25 15:05:10 +02:00
Marc Zinnschlag
b5926257f5 Merge remote-tracking branch 'scrawl/sdl_input2' 2013-06-16 21:23:35 +02:00
scrawl
b16bc69479 Removed the no longer needed --debug switch 2013-06-16 20:39:40 +02:00
vorenon
ed6098388f return false instead of std::exit 2013-06-16 18:13:14 +02:00
vorenon
9ac4a9c5eb Don't start OpenMW if no master file is selected. This fixes bug #813 2013-06-16 04:59:34 +02:00
Emanuel Guevel
289bbc64f7 Load fallback archives listed in openmw.cfg at startup 2013-03-09 21:14:11 +01:00
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.
 2013-02-09 13:00:57 +01:00
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.
 2013-01-25 18:22:01 +01:00
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.
 2013-01-08 20:00:06 -08:00
Marc Zinnschlag
2d468fec02 made previous commits naming standard compliant 2012-12-26 16:19:59 +01:00
lazydev
74ae479780 Cell names localization fix 2012-12-23 23:23:24 +04:00
Greendogo
8b18d195bd Update apps/openmw/main.cpp 
Edited the description for the --script-run switch.
 2012-11-27 04:50:49 -06:00
Mark Siewert
64c08eada4 Merge remote-tracking branch 'upstream/next' into multiple_esm_esp 2012-11-06 20:37:29 +01:00
Marc Zinnschlag
35d099a638 disabling gcc extensions 2012-10-09 17:10:25 +02:00
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.
 2012-10-07 20:00:55 +02:00
Marc Zinnschlag
b0506e2220 re-enabling support for multiple data directories 2012-08-16 12:59:28 +02:00
Marc Zinnschlag
2ccecd839b improved the help text for --script-run; updated readme.txt 2012-07-30 12:43:23 +02:00
Marc Zinnschlag
fd6c155118 Issue #352: added --script-run switch 2012-07-30 12:37:46 +02:00
Marc Zinnschlag
90de02b901 Issue #350: console only script instructions 2012-07-30 11:43:28 +02:00
guidoj
a021165d9f Changed standard C lib includes to C++ format 2012-07-17 09:44:24 +02:00
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
scrawl
934caf7a2b removed --report-focus which is now useless 2012-04-19 01:16:41 +02:00
Sebastian Wick
f7bfea5861 typo 2 -.- 2012-04-05 00:16:44 +02:00
Sebastian Wick
56c9992b29 typo 2012-04-04 23:52:42 +02:00
Sebastian Wick
8c84f68dab fix for older boost versions; unsigned warning 2012-04-04 23:51:22 +02:00
Sebastian Wick
5dd65c11ee forgot to save the file 2012-04-04 21:04:52 +02:00
Sebastian Wick
57ae1bdc43 Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg 
Conflicts:
	apps/openmw/main.cpp
 2012-04-04 20:58:02 +02:00
Sebastian Wick
d3a6484bbc set the default value for --fallback the right way 2012-04-04 19:59:46 +02:00
Sebastian Wick
a974d88cf1 Revert "set a default value for --fallback" 
This reverts commit 94a220dcdd.
 2012-04-04 19:58:04 +02:00
Sebastian Wick
94a220dcdd set a default value for --fallback 2012-04-04 19:52:07 +02:00
Sebastian Wick
48b7b03453 typo; World::getFallback(std::string key, std::string def) 2012-04-04 16:15:15 +02:00
Sebastian Wick
de510d445b throw an error if the --fallback syntax is wrong 2012-04-04 15:23:14 +02:00
Sebastian Wick
73705dadf6 parse fallback with boost program option custom validators 2012-04-03 02:14:39 +02:00
Sebastian Wick
d87dffa948 should work... but does not even compile 2012-04-03 01:47:43 +02:00
Sebastian Wick
ab9c430632 fallback in apps/openmw; fix for apps/mwiniimporter 2012-04-02 20:47:09 +02:00
scrawl
00cc45c537 FPS is now a setting instead of commandline option 2012-04-02 16:10:54 +02:00
Marc Zinnschlag
4c2fffdd61 temporarily disabled multi data path support in OpenMW 2012-02-28 09:27:35 +01:00
Marc Zinnschlag
68da94c8f0 workaround for older boost versions 2012-02-24 20:19:32 +01:00
Lukasz Gromanowski
d5f1d7eed7 Fix for processing tokens inside data-local config option. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-02-22 23:56:07 +01:00
Marc Zinnschlag
547d6a0639 Merge remote branch 'lgro/config' into config 2012-02-21 11:50:23 +01:00
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>
 2012-02-20 00:02:00 +01:00
Marc Zinnschlag
27caee664e Merge remote branch 'lgro/config' into config 
Conflicts:
	components/files/path.hpp
 2012-02-13 16:36:57 +01:00
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>
 2012-01-25 23:55:43 +01:00
Lukasz Gromanowski
406897aa64 Issue #168 - Configuration cleanup - WIP 
Sources update.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-01-21 17:58:49 +01:00
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>
 2012-01-21 01:31:20 +01:00
Marc Zinnschlag
0c2de2c00c Merge branch 'animation2' 2012-01-17 15:37:51 +01:00
Jacob Essex
18e4b73a86 Added a more detailed fps counter displaying the triangle and batch count 2012-01-16 15:33:21 +00:00
Jason Hooks
eab69f18ac File output switch 2012-01-10 00:34:29 -05:00
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
 2011-10-08 10:31:23 +02:00
Lukasz Gromanowski
d43455fd57 Issue #168: Configuration cleanup, part 2 
Corrected --data and --data-local parameters handling.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-09-02 22:45:21 +02:00
Lukasz Gromanowski
54cb6deab9 Issue #168: Configuration cleanup, part 2 2011-09-02 20:01:24 +02:00
Lukasz Gromanowski
ea7eb7a62d fixes #128 Configuration cleanup. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-08-19 21:06:09 +02:00
Marc Zinnschlag
b157273cd9 Merge branch 'next' 
Conflicts:
	apps/openmw/main.cpp
 2011-07-31 19:28:12 +02:00
Lukasz Gromanowski
0bf2a2df41 Mantis: #3 - Fixed spelling error "Font" -> "Character" 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-07-17 22:53:20 +02:00
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>
 2011-07-17 22:16:50 +02:00
Marc Zinnschlag
d9a25427c5 added --version command line option 2011-07-08 16:16:20 +02:00
Nikolay Kasyanov
e48d265b5d Mac fix: added local config dir support, app root dir is dir where bundle located 2011-06-26 20:15:42 +04:00
Nikolay Kasyanov
31749fc97b Added include for Ogre::macBundlePath to main.cpp and removed such 
include from engine.cpp (no longer needed there).
 2011-06-25 19:29:11 +04:00
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>
 2011-06-19 18:14:03 +02:00
Marc Zinnschlag
8829398bfc added --fs-strict switch 2011-05-05 19:56:16 +02:00
Marc Zinnschlag
ef1e986a87 added --data-local switch 2011-05-05 19:50:28 +02:00
Marc Zinnschlag
e60f0e3b38 --data switch accepts multiple directories now 2011-05-05 19:39:11 +02:00
Marc Zinnschlag
6e880cffb2 changed engine class to support multiple data directories for esm files 2011-05-05 19:32:42 +02:00
Marc Zinnschlag
bdfd28f44d adjusted components/files namespace; some related cleanup 2011-04-28 09:56:50 +02:00
Marc Zinnschlag
7131c08ca4 moved path.hpp/path.cpp to a new component 2011-04-28 09:39:40 +02:00
Marc Zinnschlag
fc2d659925 Merge remote branch 'jpn/config' into config 2011-04-24 12:20:38 +02:00
Marc Zinnschlag
f4f12e885f all program options (except help) can now be used from a cfg file 2011-04-21 18:23:46 +02:00
Marc Zinnschlag
8915e8a751 change in multi_es branch broke fps switch; fixed now 2011-04-21 18:10:35 +02:00
Jan-Peter Nilsson
f2faa34bd9 If there is an openmw.cfg in the current path, use it as global config 2011-04-09 11:31:06 +02:00
Marc Zinnschlag
beb1422c77 allow multiple --master and --plugin command line arguments 2011-03-29 13:57:56 +02:00
Nikolay Kasyanov
edcac879d7 Oops. Used tabs instead of 4 spaces. Fixed. 2011-03-12 03:00:42 +03:00
Nikolay Kasyanov
768c9bdf07 On OS X openmw now sets current directory to bundle root, openmw.cfg values is relative to bundle root 2011-03-09 01:42:04 +03:00
sergoz
5132531f73 added fps counter 2011-02-18 17:46:24 +03:00
Jan-Peter Nilsson
429775d485 Store configuration in /etc/openmw/ and ~/.openmw/ on linux 
Requires new openengine version.
 2011-01-12 18:18:06 +01:00
Pieter van der Kloet
dd4d022301 Converted all tabs to four spaces 2011-01-05 22:18:21 +01:00
Marc Zinnschlag
38ab9f7a3d Merge branch 'newchar' 
Conflicts:
	components/esm_store/store.hpp
 2010-10-22 10:27:32 +02:00
Marc Zinnschlag
1c4db82a0e added --script-all switch 2010-10-06 14:52:53 +02:00
Marc Zinnschlag
8659ce3a82 extended --start switch for exterior cell support 2010-10-05 18:23:53 +02:00
Jan Borsodi
64fce8d321 Added an option (USE_DEBUG_CONSOLE) to cmake file to disable the console for debug builds on windows. If set to false all debug output is redirect to the debug output of Visual Studio. 2010-09-19 02:01:01 +02:00
Nicolay Korslund
31017447eb Added --nosound switch 2010-08-18 11:16:15 +02:00
Nicolay Korslund
532ccbd1f8 Killed clientconsole, mwcompiler, mwinterpreter and command server 2010-07-22 14:15:02 +02:00
Nicolay Korslund
b97def39b3 Minor fixes to Mac stuff 2010-07-07 10:07:15 +02:00
Nicolay Korslund
2ec96ed7de Merge branch 'master' of http://github.com/ardekantur/openmw 2010-07-07 09:53:13 +02:00
athile
a638c330ec Add one more command server fix so it still works correctly on Windows and reeanble the command server by default. 2010-07-06 10:28:48 -07:00
athile
5fe4313b95 Various Windows fixes to CMake, compile errors, and a few warnings. Also made the command server optional and disabled by default since it is not currently working correctly on Linux. 2010-07-04 20:17:10 -07:00
Ardekantur
ee6c933156 Merge branch 'master' of git://github.com/korslund/openmw 
Conflicts:
	CMakeLists.txt
	apps/openmw/main.cpp
	game/engine.cpp
 2010-07-04 17:16:57 -04:00
Marc Zinnschlag
a61b2c39f0 added scriptrunning/startscript/stopscript; sorted out more case problems 2010-07-04 16:00:32 +02:00
Marc Zinnschlag
2064c43d89 added script manager (doesn't do anything yet); local scriptes for active cells are passed on to the script manager 2010-07-02 16:18:25 +02:00
Marc Zinnschlag
c7f76f51fb added --debug option and finally cleaned up the merge mess 2010-07-02 13:12:05 +02:00
Marc Zinnschlag
ce37666dbc factored world class out of main engine class 2010-07-02 09:00:06 +02:00
athile
7db274f1c5 Sky rendering clean-up and correct resource configuration 2010-06-27 16:44:15 -07:00
Marc Zinnschlag
e4f85cb3e6 directory structure reorganisation (still missing the mangle stuff) 2010-06-25 22:28:59 +02:00
Renamed from game/main.cpp (Browse further)