David Cernat
|
cc25612b8d
|
Add OpenMW commits up to 18 Sep 2019
# Conflicts:
# apps/openmw/mwclass/container.cpp
# apps/openmw/mwclass/door.cpp
# apps/openmw/mwmechanics/security.cpp
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/miscextensions.cpp
|
5 years ago |
Andrei Kortunov
|
94a281370f
|
Continue scripts execution after player's death (bug #5166)
|
5 years ago |
David Cernat
|
353e7d530a
|
Add OpenMW commits up to 18 Aug 2019
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwworld/worldimp.hpp
|
5 years ago |
David Cernat
|
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 |
David Cernat
|
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 |
David Cernat
|
f671c0bddc
|
Add OpenMW commits up to 1 Apr 2019
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/engine.cpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/trainingwindow.cpp
# apps/openmw/mwgui/travelwindow.cpp
# apps/openmw/mwgui/waitdialog.cpp
|
5 years ago |
David Cernat
|
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 |
David Cernat
|
95a5607509
|
Add OpenMW commits up to 22 Feb 2019
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/containerextensions.cpp
|
5 years ago |
David Cernat
|
6205ff6b04
|
Add OpenMW commits up to 30 Jan 2019
# Conflicts:
# apps/openmw/mwworld/worldimp.cpp
|
5 years ago |
David Cernat
|
fba07194cf
|
Add OpenMW commits up to 29 Oct 2018
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
|
5 years ago |
David Cernat
|
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 |
David Cernat
|
0339958e21
|
[General] Rename Log class into TimedLog
|
5 years ago |
Alex Rice
|
e7ae7a8ca6
|
Allow user controller bindings
|
6 years ago |
Andrei Kortunov
|
ae935a8084
|
Add separate textures for scrollbars (feature #5051)
|
6 years ago |
Andrei Kortunov
|
57176ff8d4
|
Unload viewer and stop background jobs before resources unloading
|
6 years ago |
Ilya Zhuravlev
|
1d02c1ef37
|
engine: fix window creation when SDL returns different-sized window
|
6 years ago |
Andrei Kortunov
|
95d6a99c7f
|
Do not use the CPU affinity of OSG viewer (bug #4785)
|
6 years ago |
Andrei Kortunov
|
a302ec9c65
|
Make fallback map static to simplify constructors
|
6 years ago |
Andrei Kortunov
|
7995a92672
|
Initialize missing variables
|
6 years ago |
Bret Curtis
|
4e3de9b00c
|
Merge pull request #2206 from Capostrophic/title
Loop title screen music (bug #4896)
|
6 years ago |
elsid
|
4624f31788
|
Report navigator stats
|
6 years ago |
Capostrophic
|
abae35e88b
|
Loop title screen music (bug #4896)
|
6 years ago |
Capostrophic
|
dd03d3b231
|
Print SDL version at startup
|
6 years ago |
elsid
|
619a111a11
|
Run startup script once at engine start when game is running (bug #4877)
|
6 years ago |
elsid
|
33f6fb258d
|
Option to set specific random seed for random number generator
|
6 years ago |
Andrei Kortunov
|
3032b177a1
|
Remove redundant includes
|
6 years ago |
Andrei Kortunov
|
ff9afda18d
|
Avoid to keep reference to the local 'encoder' variable outside the Engine::go()
|
6 years ago |
Andrei Kortunov
|
ab0841cc3d
|
Split physics update from world update in the profiler
|
6 years ago |
Andrei Kortunov
|
e06f0b797a
|
Replace all NULLs to nullptr
|
6 years ago |
Andrei Kortunov
|
7a986f38da
|
Support for user-defined TrueType fonts
|
6 years ago |
David Cernat
|
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 |
Andrei Kortunov
|
5a4d0cec3a
|
Use new logging system for game itself
|
6 years ago |
Andrei Kortunov
|
12144de8ed
|
Initialize missing variables
|
7 years ago |
David Cernat
|
63a86f145d
|
[Client] Record type of each InterpreterContext for later checking
|
7 years ago |
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
|
7 years ago |
Bret Curtis
|
99e4d49e7c
|
Merge pull request #1787 from akortunov/profilierfont
Use the DejaVuLGCSansMono.ttf for profiler output
|
7 years ago |
Andrei Kortunov
|
70b6d4983d
|
Use the DejaVuLGCSansMono.ttf in profilier output
|
7 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
|
7 years ago |
Nikolay Kasyanov
|
5fcb091127
|
Replace FIXME with a detailed explanation of the issue
|
7 years ago |
Nikolay Kasyanov
|
9c78364c45
|
Revert "Merge pull request #1771 from Xenkhan/master"
This reverts commit 9667dd051c , reversing
changes made to f52e06fc19 .
|
7 years ago |
Bret Curtis
|
a55583a395
|
Merge branch 'master' into master
|
7 years ago |
Xenkhan
|
405a0caf29
|
Remove unneeded whitespace
|
7 years ago |
Xenkhan
|
5a4817c147
|
Get rid of reinterpret_cast<>
|
7 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
|
7 years ago |
Xenkhan
|
24ddb66af9
|
Retrieve SDL window settings instead of using magic numbers
|
7 years ago |
Nikolay Kasyanov
|
359f87ab9f
|
Change imageToSurface to return a unique_ptr to avoid manual surface cleanup
|
7 years ago |
Miloslav Číž
|
db6107f12f
|
Merge branch 'master' into screenshot360
|
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 |