David Cernat
|
b801cf2c9e
|
Merge pull request #327 from TES3MP/master
Add master commits up to 26 Oct 2017
|
7 years ago |
|
David Cernat
|
37304655da
|
Merge pull request #326 from OpenMW/master
Add OpenMW commits up to 25 Oct 2017
|
7 years ago |
Koncord
|
916ada108f
|
[General] Modernize Log utility
* Reverse Log levels
* Add LOG_TRACE
* Spawn instance of Log in Get() function
|
7 years ago |
AnyOldName3
|
c1a871ff1f
|
Make indentation consistent.
|
7 years ago |
|
AnyOldName3
|
daf7d8451c
|
Switch to a more reliable method of passing the git-version targt the data it needs
|
7 years ago |
|
AnyOldName3
|
e3142b9643
|
Add missing variables to those forwarded to the git-version target
|
7 years ago |
|
David Cernat
|
76a4abd7c0
|
Merge pull request #325 from TES3MP/master while resolving conflicts
# Conflicts:
# apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp
|
7 years ago |
|
David Cernat
|
dd25c7db4e
|
Merge pull request #324 from OpenMW/master
Add OpenMW commits up to 24 Oct 2017
|
7 years ago |
scrawl
|
0c6ef17fb5
|
Add explicit variant of 'OnActivate'
|
7 years ago |
|
David Cernat
|
3a9e5e3a7b
|
Merge pull request #319 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
|
7 years ago |
Marcin Baszczewski
|
46b015d3d9
|
Fix assert with empty setting value
Local value could be empty, so it's important to check it size before read first char.
|
7 years ago |
Marc Zinnschlag
|
bdabace7e2
|
Merge remote-tracking branch 'aesylwinn/LLmerge'
|
7 years ago |
|
Koncord
|
d702845026
|
[General] Fix Clang warnings in Log.hpp
|
7 years ago |
|
David Cernat
|
b20df4b7cd
|
Merge pull request #316 from TES3MP/master
Add master commits up to 17 Oct 2017
|
7 years ago |
|
David Cernat
|
184c5f2b29
|
Merge pull request #315 from OpenMW/master
Add OpenMW commits up to 17 Oct 2017
|
7 years ago |
|
scrawl
|
7f8d996eff
|
Merge pull request #1502 from AnyOldName3/launcher-and-wizard-ampersand-escape-support
Launcher and wizard ampersand escape support
|
7 years ago |
|
David Cernat
|
17a8e32782
|
Merge pull request #314 from TES3MP/master
Add master commits up to 16 Oct 2017
|
7 years ago |
|
David Cernat
|
e164e6305e
|
Merge pull request #313 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
|
7 years ago |
|
scrawl
|
136ef1f738
|
Fix incomplete settings in recreateShaders()
|
7 years ago |
|
scrawl
|
03554b2f4b
|
Fix some style issues flagged by cppcheck
|
7 years ago |
|
scrawl
|
50d7eb8e54
|
Fix crash when adding a NULL object to the cache
|
7 years ago |
|
scrawl
|
97ec38affb
|
Merge pull request #1492 from drummyfish/master
fix rain/snow moving with player (issue #2698)
|
7 years ago |
AnyOldName3
|
49dbb4a9ca
|
Add a third copy of a comment where I felt clarification was missing
|
7 years ago |
|
AnyOldName3
|
7329e6a9ef
|
Load 'data=...' lines correctly when starting the wizard or launcher, and save them correctly when exiting the launcher.
|
7 years ago |
|
AnyOldName3
|
28ff677337
|
Save 'data=...' lines correctly when exiting the wizard
|
7 years ago |
Miloslav Číž
|
65977b910e
|
wrap weather around in all directions
|
7 years ago |
|
Miloslav Číž
|
380a5799dd
|
use bbox as wrap range & apply to all particle systems
|
7 years ago |
|
Miloslav Číž
|
33a1459b11
|
search for particle system by class name
|
7 years ago |
Kyle Cooley
|
11eae16645
|
Get rid of duplicate function, fix flag checking
|
7 years ago |
|
scrawl
|
5fbdb64bb9
|
Add OPENMW_DECOMPRESS_TEXTURES environment variable to decompress textures in software if not supported by graphics hardware
Disabled by default due to requiring new functionality that was just added to OSG 3.6 or OpenMW/OSG.
|
7 years ago |
|
scrawl
|
f3ca9832b0
|
Merge pull request #1500 from akortunov/extraspell
Implement ExtraSpell magic effect
|
7 years ago |
Andrei Kortunov
|
30b05b557b
|
ExtraSpell magic effect: a basic implementation
|
7 years ago |
|
AnyOldName3
|
c9e86a8ebc
|
Remove superfluous argument
|
7 years ago |
|
AnyOldName3
|
f9a3562ccd
|
Remove duplicate macro definition and fix warning
|
7 years ago |
|
AnyOldName3
|
2652a89df4
|
Fix mismatched indentation that apparently the .editorconfig file doesn't handle automatically
|
7 years ago |
|
AnyOldName3
|
f8fe992dc0
|
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
|
7 years ago |
|
Koncord
|
6cb9c3c713
|
[General] Remove explicit specifier
|
7 years ago |
|
Koncord
|
5c79e7106f
|
[Browser] Minor improvements
|
7 years ago |
|
David Cernat
|
4845599bda
|
Merge pull request #308 from TES3MP/master while resolving conflicts
# Conflicts:
# apps/openmw-mp/main.cpp
|
7 years ago |
|
David Cernat
|
182f8c1f06
|
[General] Print client version on startup
|
7 years ago |
|
David Cernat
|
61b1a59814
|
[General] Move server's version printing method to Utils
|
7 years ago |
|
David Cernat
|
7a38a0b223
|
Merge pull request #305 from TES3MP/master
Add master commits up to 6 Oct 2017
|
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 |
|
Marc Zinnschlag
|
dd17f70068
|
Merge remote-tracking branch 'aesylwinn/landrecords'
|
7 years ago |
|
scrawl
|
64e27c032b
|
Merge pull request #1481 from scrawl/keyfocus
WindowManager overhaul & improved keyboard support
|
7 years ago |
|
David Cernat
|
841a4f90c1
|
Merge pull request #301 from TES3MP/master
Add master commits up to 28 Sep 2017
|
7 years ago |
|
scrawl
|
44720bf41a
|
Allow MWList items to retain key focus
|
7 years ago |
|
scrawl
|
b9341925f2
|
Set AutoSizedEditBox as Static by default
Would look very odd anyway to use it for editable text, with the widget resizing as you type.
|
7 years ago |
|
scrawl
|
c88c535e0e
|
Fix HBox/VBox not using Client widget with MyGUI <= 3.2.2
|
7 years ago |
|
David Cernat
|
ddf0dfed55
|
Merge pull request #298 from OpenMW/master
Add OpenMW commits up to 26 Sep 2017
|
7 years ago |