Commit Graph

190 Commits (6cb5ac6e63fb9bf6b27e827a227161f6dbc82f0a)

Author SHA1 Message Date
David Cernat 6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
6 years ago
Alexander Stillich 725cc94210 Renamed cc_install to something less cryptic (crashCatcherInstall) 6 years ago
Doc West 467989cdd5 Moved crashcatcher to a component and also use it in CS
Reworked debugger detection (failed on gdb 7.11), it now uses /proc to detect the debugger
6 years ago
David Cernat 5d4b97645d Merge pull request #374 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/CMakeLists.txt
6 years ago
Ilya Zhuravlev d2121ccd62 Update android port. 6 years ago
David Cernat 260b3411c3 Merge pull request #317 from OpenMW/master
Add OpenMW commits up to 18 Oct 2017
7 years ago
AnyOldName3 1f77f9654b Strip quotes from the data-local setting if present (because for whatever reason it's a string, not a boost::filesystem::path) 7 years ago
David Cernat 182f8c1f06 [General] Print client version on startup 7 years ago
David Cernat 4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts
# Conflicts:
#	.gitignore
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
MiroslavR 393f4ab758 Add missing include for isatty function (Fixes #4002) 7 years ago
David Cernat aeb1ec3394 [Client] Delimit and clarify changes made by tes3mp to engine and main 7 years ago
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
7 years ago
Bret Curtis c781d1f8ed purge unnecessary imports
add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back
7 years ago
Bret Curtis d799954ca0 replace and purge boost::math::gcd and other non-used headers 7 years ago
Ewan Higgs 38a2de3c51 convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 7 years ago
David Cernat df051a777a Merge pull request #181 from OpenMW/master
Add OpenMW commits up to 4 Mar 2017
7 years ago
scrawl 4123398cbc Change no-grab setting to respect the value given 7 years ago
scrawl 29556a1802 More consistent wording of errors/warnings
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.

An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.

The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.

Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
7 years ago
David Cernat a1988ac6ef Merge pull request #161 from OpenMW/master
Add OpenMW commits up to 21 Feb 2017
7 years ago
scrawl 3f27c8cc97 Always print context for script warnings to remove the need for verbose option
(Fixes #2813)
7 years ago
David Cernat 253ded1ee3 Use new getFilenameStamp() method to generate timestamps for filenames 7 years ago
David Cernat 3932654d5d Use log filenames w/ timestamps instead of adding numbers to their ends 7 years ago
Koncord 11be8ed005 Rename copyOldLog to renameOldLog 8 years ago
Koncord e44ebca0aa Keep old client logs 8 years ago
David Cernat 7bbeed629d Merge pull request #109 from OpenMW/master
Add OpenMW changes up to 25 Nov
8 years ago
Nikolay Kasyanov ea888519c7 [macOS] Set OpenMW working dir to <bundle>/Contents/MacOS 8 years ago
David Cernat fa9d6e810e Use lowerCamelCase in tes3mp client function names like OpenMW does 8 years ago
Koncord fa0a55c2a9 Fix use of freed memory 8 years ago
Koncord 997c62cc52 Add --connect option to client 8 years ago
Koncord 35991fcd15 Add logger to client 8 years ago
AnyOldName3 20f73f4a32 Relocate escape-related code to new files escape.hpp and escape.cpp. 8 years ago
AnyOldName3 59639e3988 Make it build again (but remove the new functionality). 8 years ago
AnyOldName3 95d2c7ea5c Attempt to unescape characters when constructing file paths, introducing compilation errors. 8 years ago
AnyOldName3 f1b5ad5804 Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings. 8 years ago
AnyOldName3 e6f78ae5b7 Switch indentation to spaces to remain consistent with the rest of the project 8 years ago
AnyOldName3 1a0642f1db Make it work by realising that what boost::program_options calls validation is what any sane person would regard as parsing 8 years ago
AnyOldName3 195dd27780 Resolve obvious runtime error revealing more subtle one 8 years ago
AnyOldName3 fbe6dc9704 Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++ 8 years ago
AnyOldName3 2a9b12bb3f Fix an issue preventing compilation, revealing another that doesn't make much sense. 8 years ago
AnyOldName3 c1ffc9e776 Remove a compilation error and set up framework to remove the others 8 years ago
AnyOldName3 e17e354e84 Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors 8 years ago
scrawl 6546c05428 Move Fallback map to components/ 8 years ago
sandstranger bd5057aa3c enable opengl es1 9 years ago
scrawl ccc721ba3f Print the OpenMW version to the logfile 9 years ago
Nikolay Kasyanov 4e3bbe01b6 OS X: disable `glTexStorage2D` because of OSG/driver issue
See http://forum.openscenegraph.org/viewtopic.php?p=65276#65276 for the details.
9 years ago
scrawl f09e4620b6 Move OpenMW version information to a textfile instead of compiling it in
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
9 years ago
dteviot 76f20b8b20 fix 'WIN32_LEAN_AND_MEAN' macro redefinition warning. 9 years ago
scrawl 0cc9b1bb40 Remove dependency on OgrePlatform.h 9 years ago
scrawl 974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
9 years ago
k1ll 96d9afec38 More header case fixes 9 years ago