David Cernat
92060bd6b6
Merge pull request #370 from TES3MP/0.6.2
...
Add 0.6.2 commits up to 10 Jan 2018
7 years ago
David Cernat
14ef2fa791
Merge pull request #369 from OpenMW/master
...
Add OpenMW commits up to 9 Jan 2018
7 years ago
scrawl
f6ca7295a6
Revert "Merge pull request #1595"
...
This reverts commit 7ef7b1a7b1
, reversing
changes made to 9e7e4de0ab
.
7 years ago
scrawl
7ef7b1a7b1
Merge pull request #1595
7 years ago
Thunderforge
bd072b131b
Moving controller file out of the controllers subdirectory
7 years ago
Andrei Kortunov
b277b83810
Display the 'Screenshot saved' message after the screenshot saving (bug #4191 )
7 years ago
Thunderforge
3f7143556a
Providing different mappings depending on the version of SDL installed
7 years ago
David Cernat
09958681cd
Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try
7 years ago
David Cernat
cac2c6c1e8
Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts
7 years ago
Koncord
2726d94d10
[Client] Disallow to load save game via launch options
7 years ago
David Cernat
300ca905fc
[Client] Don't pause game when minimizing window, despite MyGUI issues
7 years ago
David Cernat
28e1947f23
Merge pull request #339 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/engine.cpp
7 years ago
scrawl
36f4f0ef85
Don't increase simulationTime while the game is minimized ( Fixes #4211 )
7 years ago
David Cernat
38247ff086
Merge pull request #303 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
7 years ago
scrawl
f67dbc8aa0
Remove redundant update function
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
scrawl
8c6a8ca48d
Respect the framelimit in all cases ( Fixes #3531 )
...
Affects loading screen, videos & modal dialogs. Also skips rendering if window is minimized.
7 years ago
spycrab
632d39ca76
Allow starting at an (unnamed) exterior cell using --start (Feature #3941 )
8 years ago
David Cernat
b8b3856c73
Merge pull request #244 from OpenMW/master
...
Add OpenMW commits up to 19 Jul 2017
8 years ago
scrawl
a629d48df6
Update the facedObject after the camera is updated
8 years ago
David Cernat
aeb1ec3394
[Client] Delimit and clarify changes made by tes3mp to engine and main
8 years ago
David Cernat
708d3723eb
[Client] Fix client script messagebox buttons that had always broken in tes3mp
8 years ago
David Cernat
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 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
8 years ago
David Cernat
fec82dc033
Merge pull request #202 from OpenMW/master
...
Add OpenMW commits up to 21 Apr 2017
8 years ago
scrawl
1ffb9e1bf3
Remove renderWorldMap()
8 years ago
David Cernat
df051a777a
Merge pull request #181 from OpenMW/master
...
Add OpenMW commits up to 4 Mar 2017
8 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.
8 years ago
Koncord
9199446edd
[Client] Add Files::Collections to Main::init() arguments
8 years ago
David Cernat
a58601fb2b
[Client] Delineate tes3mp-only code more clearly, part 1
8 years ago
David Cernat
38ccc2671c
Merge pull request #164 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
8 years ago
scrawl
8f79fa3d72
Add resource statistics panel opened with F4
8 years ago
scrawl
b40ca9b60a
Set the window rectangle on the Viewer's EventQueue
8 years ago
David Cernat
a1988ac6ef
Merge pull request #161 from OpenMW/master
...
Add OpenMW commits up to 21 Feb 2017
8 years ago
scrawl
3f27c8cc97
Always print context for script warnings to remove the need for verbose option
...
(Fixes #2813 )
8 years ago
David Cernat
cdffbc05f7
Merge pull request #159 from OpenMW/master
...
Add OpenMW commits up to 19 Feb 2017
8 years ago
scrawl
481c440698
Print OSG version on startup
8 years ago
David Cernat
2ed9ae5739
Merge pull request #149 from OpenMW/master
...
Add OpenMW commits up to 14 Feb 2017
8 years ago
scrawl
72c6b11cf8
Move global map render to the worker thread
8 years ago
scrawl
026a05718f
Construct the WorkQueue in Engine
8 years ago
David Cernat
ae23c6d6a5
Merge pull request #145 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
8 years ago
scrawl
066aa2e60e
Always run preloadCommonAssets even when the menu is skipped
...
Move to before the content files are loaded so we can do preloading in parallel with content file loading
8 years ago
David Cernat
63974af131
Merge pull request #139 from OpenMW/master
...
Add OpenMW commits up to 3 Feb 2017
8 years ago
scrawl
6d8c414071
Set osgViewer ReleaseContextAtEndOfFrameHint to false for better performance when in SingleThreaded mode
...
The flag is normally set to off by default when using Viewer::run() - however since we're using our own frame loop, we have to unset the flag ourselves
8 years ago
scrawl
c5f8ff6e0e
Add names to several nodes for debugging purposes
8 years ago
David Cernat
9f8f62b765
Merge pull request #137 from OpenMW/master
...
Add OpenMW commits up to 1 Feb
8 years ago
scrawl
34deb6e7b1
Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes
8 years ago
David Cernat
973db7c78a
Merge pull request #113 from OpenMW/master
...
Add OpenMW commits up to 17 Dec
8 years ago
Koncord
536715cf46
Cleanup tes3mp headers
8 years ago
Koncord
753dc50131
Fix crash if connection has failed
8 years ago