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
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
7023395012
Windows-specific definition to omit inclusion of unused stuff from Windows.h
11 years ago
fb845e81a4
Rename nosound to no-sound for consistency
11 years ago
85ed21dbd2
Remove unused command line option
11 years ago
81ec8c2f55
Handle --version and --help before reading configuration - putting these options into openmw.cfg makes no sense
11 years ago
19e5978a01
Merge branch 'master' of https://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/main.cpp
11 years ago
39eea24dc3
Don't try to show exceptions in a message box if SDL was not initialized
11 years ago
030c733e2d
Merge branch 'master' into savedgame
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
11 years ago
baacf91de4
Another windows build fix
11 years ago
845bc5f7eb
Show fatal exceptions in a message box instead of cerr when running without a terminal
11 years ago
bcf61331ab
Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.
11 years ago
f990ba09f0
gdb detection doesn't seem to work for the forked process
11 years ago
883140babf
Add missing include for signals to make travis happy
11 years ago
b9899696e3
Add a crash catcher for unix. When encountering a fatal signal, attach gdb and log backtrace.
11 years ago
31ec973c9c
removed default value for --start
11 years ago
b3a7c8c098
removed --new-game switch
11 years ago
7a4b604376
added --skip-menu switch
11 years ago
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
7dc30a01cd
Some changes suggested by cppcheck
12 years ago
0a2ed8b0d7
Make OpenMW able to initialize SDL in windows builds
12 years ago
b5926257f5
Merge remote-tracking branch 'scrawl/sdl_input2'
12 years ago
b16bc69479
Removed the no longer needed --debug switch
12 years ago
ed6098388f
return false instead of std::exit
12 years ago
9ac4a9c5eb
Don't start OpenMW if no master file is selected. This fixes bug #813
12 years ago
289bbc64f7
Load fallback archives listed in openmw.cfg at startup
12 years ago
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
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
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
2d468fec02
made previous commits naming standard compliant
12 years ago
74ae479780
Cell names localization fix
12 years ago
8b18d195bd
Update apps/openmw/main.cpp
...
Edited the description for the --script-run switch.
12 years ago
64c08eada4
Merge remote-tracking branch 'upstream/next' into multiple_esm_esp
12 years ago
35d099a638
disabling gcc extensions
12 years ago
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
b0506e2220
re-enabling support for multiple data directories
13 years ago
2ccecd839b
improved the help text for --script-run; updated readme.txt
13 years ago
fd6c155118
Issue #352 : added --script-run switch
13 years ago
90de02b901
Issue #350 : console only script instructions
13 years ago
a021165d9f
Changed standard C lib includes to C++ format
13 years ago
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
13 years ago
934caf7a2b
removed --report-focus which is now useless
13 years ago
f7bfea5861
typo 2 -.-
13 years ago
56c9992b29
typo
13 years ago
8c84f68dab
fix for older boost versions; unsigned warning
13 years ago
5dd65c11ee
forgot to save the file
13 years ago
57ae1bdc43
Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg
...
Conflicts:
apps/openmw/main.cpp
13 years ago
d3a6484bbc
set the default value for --fallback the right way
13 years ago
a974d88cf1
Revert "set a default value for --fallback"
...
This reverts commit 94a220dcdd
13 years ago
94a220dcdd
set a default value for --fallback
13 years ago
scrawl
Dmitriy 'Endorph' Shkurskiy
Marc Zinnschlag
Alexander "Ace" Olofsson
Lukasz Gromanowski
vorenon
Emanuel Guevel
Mark Siewert
Nathan Jeffords
lazydev
Greendogo
guidoj
Sebastian Wick