David Cernat
|
e7f20e7daf
|
Merge pull request #351 from OpenMW/master while resolving conflicts
# Conflicts:
# CMakeLists.txt
# README.md
|
7 years ago |
scrawl
|
a4d8aef40d
|
Merge branch openmw-43 into master
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
|
7 years ago |
David Cernat
|
d06817a356
|
Merge pull request #347 from OpenMW/master
Add OpenMW commits up to 25 Nov 2017
|
7 years ago |
Andrei Kortunov
|
94c0e3ed10
|
Move toUpper() from StringUtils to the JournalViewModel
|
7 years ago |
David Cernat
|
656453725b
|
Merge pull request #343 from OpenMW/master
Add OpenMW commits up to 23 Nov 2017
|
7 years ago |
Andrei Kortunov
|
67acb83b62
|
Add missing include
|
7 years ago |
Andrei Kortunov
|
5f41f7c48d
|
Clean code up a bit
|
7 years ago |
Andrei Kortunov
|
ba91cd658b
|
Convert topic name to Unicode
|
7 years ago |
Andrei Kortunov
|
f0ca3eabd3
|
Merge from upstream master
|
7 years ago |
scrawl
|
9fda3b6db4
|
Fix NumericEditBox behavior broken by switch to std::stoi
For some reason stoi doesn't throw an error for '1foo' while 'foo1' does.
Now the edit box flat out rejects any non-digit key events.
|
7 years ago |
Andrei Kortunov
|
a391990f2a
|
Provide multibyte toLower() and single chars comparator
|
7 years ago |
Alexander Stillich
|
93e9df15c9
|
Fixed parameter naming
|
7 years ago |
Alexander Stillich
|
52b3507a2b
|
Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all
|
7 years ago |
Alexander Stillich
|
09aac22782
|
Added StringUtil::replaceAll()
|
7 years ago |
Alexander Stillich
|
92aaff3b78
|
Fixed escaping @ in boost program options filter
|
7 years ago |
David Cernat
|
01db219de4
|
Merge pull request #333 from OpenMW/master
Add OpenMW commits up to 11 Nov 2017
|
7 years ago |
scrawl
|
a5ba1caed1
|
Merge pull request #1541 from astillich/4189
Fixed escaping @ in boost program options filter
|
7 years ago |
scrawl
|
a5adc5b018
|
Add NPC base skeleton files to the optimizer blacklist (Fixes #4159)
|
7 years ago |
David Cernat
|
f2a6957e16
|
Merge pull request #331 from OpenMW/master while resolving conflicts
|
7 years ago |
scrawl
|
244cc5b861
|
Reduce error spam
|
7 years ago |
scrawl
|
7b4add2ae4
|
Fall back to non-shader material if creating the shader fails
Also fixes an uncaught exception that will break the whole game.
|
7 years ago |
Alexander Stillich
|
43b5c2e36b
|
Fixed parameter naming
|
7 years ago |
Alexander Stillich
|
70d578d050
|
Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all
|
7 years ago |
Alexander Stillich
|
af3e1f92ec
|
Added StringUtil::replaceAll()
|
7 years ago |
Alexander Stillich
|
7d39c5450c
|
Fixed escaping @ in boost program options filter
|
7 years ago |
David Walley
|
41dc82abad
|
Update Links to Documentation in settings.cfg files (#1523)
* Update settings-default.cfg
* Update settings.cpp
|
7 years ago |
David Cernat
|
37304655da
|
Merge pull request #326 from OpenMW/master
Add OpenMW commits up to 25 Oct 2017
|
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
|
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 |
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
|
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 |