5aac28b00f
[Client] Disable use of certain options when starting client
3 years ago
6e95604627
[Client] Remove credits check on Windows client
3 years ago
26033ff7e7
Add OpenMW 0.47 commits up to 4 Aug 2021
3 years ago
10b799653b
Merge branch 'opt-out-compose' into 'master'
...
Make it possible to opt out of composing variables
Closes #6186
See merge request OpenMW/openmw!1076
(cherry picked from commit 15d278de554818fef6fecf300456800523e91adf)
4727ae4b Make it possible to opt out of composing variables
04e9b6d2 Abort on duplicate content file
3 years ago
a379d12529
[General] Turn Utils::printVersion() into Utils::getVersionInfo()
4 years ago
e1259fdc41
Add OpenMW commits up to 4 Feb 2021
...
# Conflicts:
# apps/openmw/engine.cpp
# apps/openmw/mwmechanics/npcstats.hpp
# apps/openmw/mwrender/globalmap.cpp
4 years ago
14cf0ce1dc
Implement instanced groundcover
4 years ago
7d551b0cfd
Split long osg log messages into lines.
4 years ago
da3316daf8
Add OpenMW commits up to 4 Jan 2021
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/main.cpp
# apps/openmw/mwmechanics/npcstats.hpp
# apps/openmw/mwphysics/actor.cpp
# apps/openmw/mwphysics/mtphysics.hpp
# components/CMakeLists.txt
4 years ago
49c6e50c31
Print '--version' and '--help' messages without timestamps
4 years ago
242dd8d496
Use a logging system instead of cout for a couple of missing messages
4 years ago
5734551ff3
Add time to logs. Redirect OSG log to OpenMW log.
4 years ago
7f435ceeac
Add OpenMW commits up to 1 Nov 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/main.cpp
# apps/openmw/mwclass/container.hpp
# apps/openmw/mwclass/creature.hpp
# apps/openmw/mwclass/npc.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwdialogue/journalimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/dialogue.hpp
# apps/openmw/mwgui/mainmenu.cpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/aiactivate.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/interpretercontext.hpp
# components/CMakeLists.txt
4 years ago
4032b754e4
set minimal boost version; remove #ifdef boost version checks
4 years ago
538314b03a
Make path settings have path type
4 years ago
8b28b6e55e
Compose BSA, context and script blacklist lists
...
These would only take their value from the highest priority source, so
specifying `openmw --content anExtraEsp.esp` would override all the
content files in the user cfg file, and the user cfg file would override
any in the global/local one.
4 years ago
cf81f1bbb7
Make composing variables compose in the expected order
4 years ago
651a5a27f6
Fix inconsistent indentation
...
This has been irritating me for years.
4 years ago
b57c0bcafe
Add OpenMW commits up to 6 June 2019
...
# Conflicts:
# apps/openmw/mwgui/hud.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/waitdialog.cpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
5181c601c0
Add OpenMW commits up to 2 May 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/statsextensions.cpp
5 years ago
8729c3c5e3
Add OpenMW commits up to 9 Mar 2019
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# README.md
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwscript/animationextensions.cpp
# apps/openmw/mwscript/guiextensions.cpp
# apps/openmw/mwscript/miscextensions.cpp
# apps/openmw/mwscript/soundextensions.cpp
5 years ago
3efffe92e3
Add OpenMW commits up to 5 Nov 2018
...
# Conflicts:
# CI/before_install.linux.sh
# CMakeLists.txt
# apps/openmw/mwmechanics/aifollow.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/CMakeLists.txt
5 years ago
84cab59057
Add OpenMW commits up to 19 Aug 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/main.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/misc/debugging.hpp
5 years ago
0339958e21
[General] Rename Log class into TimedLog
5 years ago
ae935a8084
Add separate textures for scrollbars (feature #5051 )
6 years ago
02e646e838
[Client] Use check for credits file that makes more sense
6 years ago
a302ec9c65
Make fallback map static to simplify constructors
6 years ago
33f6fb258d
Option to set specific random seed for random number generator
6 years ago
f3b8a5b909
[General] Check integrity of credits only on Windows clients
...
This avoids the problems that were encountered in Linux and macOS builds regarding this check while also still addressing the scenario where official Windows builds had their credits modified by people unrelated to the project.
6 years ago
e2ddb39591
Remove incorrect comment
6 years ago
a083439139
Merge pull request #469 from davidcernat/master while resolving conflicts
...
# Conflicts:
# apps/openmw/main.cpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
6 years ago
5a4d0cec3a
Use new logging system for game itself
6 years ago
9a5b016293
Move crashcatcher initialization to components
6 years ago
7d6e3673e0
Implement advanced logging system (feature #4581 )
6 years ago
e2519226aa
Move boost include
7 years ago
c2a175c2e0
Move crash catcher wrapper to separate file
7 years ago
c454f1bdad
Use log file for editor (feature #4012 )
7 years ago
35fdb833df
[Client] Verify integrity of credits file
7 years ago
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
7 years ago
725cc94210
Renamed cc_install to something less cryptic (crashCatcherInstall)
7 years ago
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
7 years ago
5d4b97645d
Merge pull request #374 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/CMakeLists.txt
7 years ago
d2121ccd62
Update android port.
7 years ago
260b3411c3
Merge pull request #317 from OpenMW/master
...
Add OpenMW commits up to 18 Oct 2017
7 years ago
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
182f8c1f06
[General] Print client version on startup
7 years ago
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
393f4ab758
Add missing include for isatty function ( Fixes #4002 )
8 years ago
aeb1ec3394
[Client] Delimit and clarify changes made by tes3mp to engine and main
8 years ago
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
David Cernat
psi29a
Andrei Kortunov
Petr Mikheev
AnyOldName3
elsid
Alexander Stillich
Doc West
Ilya Zhuravlev
MiroslavR