teamnwah
/
openmw-tes3coop
forked from mirror/openmw-tes3mp
2
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity
21,770 Commits
34 Branches
0 Tags
66 MiB
0.7.0
0.7.0-alpha
0.7.0-beta
master
0.8.0-dev
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6cb5ac6e63'
${ noResults }
Commit Graph

601 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
Bret Curtis 99e4d49e7c
Merge pull request #1787 from akortunov/profilierfont 
Use the DejaVuLGCSansMono.ttf for profiler output
 6 years ago
Andrei Kortunov 70b6d4983d Use the DejaVuLGCSansMono.ttf in profilier output 6 years ago
David Cernat a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	README.md
#	apps/openmw/mwgui/quickkeysmenu.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/combat.cpp
 6 years ago
Nikolay Kasyanov 5fcb091127 Replace FIXME with a detailed explanation of the issue 6 years ago
Nikolay Kasyanov 9c78364c45 Revert "Merge pull request #1771 from Xenkhan/master" 
This reverts commit 9667dd051c, reversing
changes made to f52e06fc19.
 6 years ago
Bret Curtis a55583a395
Merge branch 'master' into master 6 years ago
Xenkhan 405a0caf29
Remove unneeded whitespace 6 years ago
Xenkhan 5a4817c147
Get rid of reinterpret_cast<> 6 years ago
Bret Curtis 6655b7e512
Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression 
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set
 6 years ago
Xenkhan 24ddb66af9
Retrieve SDL window settings instead of using magic numbers 6 years ago
Nikolay Kasyanov 359f87ab9f Change imageToSurface to return a unique_ptr to avoid manual surface cleanup 6 years ago
Miloslav Číž db6107f12f
Merge branch 'master' into screenshot360 6 years ago
David Cernat 14ef2fa791
Merge pull request #369 from OpenMW/master 
Add OpenMW commits up to 9 Jan 2018
 6 years ago
scrawl f6ca7295a6
Revert "Merge pull request #1595" 
This reverts commit 7ef7b1a7b1, reversing
changes made to 9e7e4de0ab.
 6 years ago
scrawl 7ef7b1a7b1
Merge pull request #1595 6 years ago
Thunderforge bd072b131b Moving controller file out of the controllers subdirectory 6 years ago
Andrei Kortunov b277b83810 Display the 'Screenshot saved' message after the screenshot saving (bug #4191) 6 years ago
Thunderforge 3f7143556a Providing different mappings depending on the version of SDL installed 6 years ago
David Cernat cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 6 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
Miloslav Číž 8f32114025 segfault fix 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) 7 years ago
David Cernat b8b3856c73 Merge pull request #244 from OpenMW/master 
Add OpenMW commits up to 19 Jul 2017
 7 years ago
scrawl a629d48df6 Update the facedObject after the camera is updated 7 years ago
David Cernat aeb1ec3394 [Client] Delimit and clarify changes made by tes3mp to engine and main 7 years ago
David Cernat 708d3723eb [Client] Fix client script messagebox buttons that had always broken in tes3mp 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
David Cernat fec82dc033 Merge pull request #202 from OpenMW/master 
Add OpenMW commits up to 21 Apr 2017
 7 years ago
scrawl 1ffb9e1bf3 Remove renderWorldMap() 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 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
Koncord 9199446edd [Client] Add Files::Collections to Main::init() arguments 7 years ago
David Cernat a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 7 years ago
David Cernat 38ccc2671c Merge pull request #164 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
 7 years ago
scrawl 8f79fa3d72 Add resource statistics panel opened with F4 7 years ago
scrawl b40ca9b60a Set the window rectangle on the Viewer's EventQueue 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 cdffbc05f7 Merge pull request #159 from OpenMW/master 
Add OpenMW commits up to 19 Feb 2017
 7 years ago
scrawl 481c440698 Print OSG version on startup 7 years ago
David Cernat 2ed9ae5739 Merge pull request #149 from OpenMW/master 
Add OpenMW commits up to 14 Feb 2017
 7 years ago
scrawl 72c6b11cf8 Move global map render to the worker thread 7 years ago