David Cernat
8a93631e08
Merge pull request #320 from TES3MP/master
...
Add master commits up to 22 Oct 2017
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
scrawl
bb4ffb7743
Merge pull request #1514 from akortunov/ringfix
...
Do not replace an equpped ring of the same value
7 years ago
scrawl
075a7fee20
Merge pull request #1515 from akortunov/guifixes
...
Fix a 'Good Beast' companion window
7 years ago
scrawl
5b2fe01375
Merge pull request #1508 from AnyOldName3/shut-up-travis
...
Mark worldimp functions as override to stop distracting Travis CI war…
7 years ago
Andrei Kortunov
eaff7e30aa
Fix a 'Good Beast' companion window
7 years ago
Andrei Kortunov
e64f14b7ce
Do not replace an equpped ring of the same value
7 years ago
AnyOldName3
03fc3353b9
Tidy up indentation 2
7 years ago
AnyOldName3
f3e6b26e6b
Tidy up indentation
7 years ago
Rhiyo
d9fe3aac99
fixed new clothing replacing old clothing of same value
...
Found on the bug http://bugs.openmw.org/issues/4165 .
In original Morrowind, new clothing of the same value wouldn't replace old clothing. Tested with common and expensive clothing by selling to merchants and using the AddItem console command in original Morrowind.
In OpenMW, before this change, new clothing of the same value would replace old clothing, tested with the same methods used above.
7 years ago
AnyOldName3
2abff22c08
Make MWWorld::World final to enable compiler optimisations
7 years ago
AnyOldName3
7440cf37bc
Remove redundant virtual keywords implied by override keywords
7 years ago
David Cernat
6e7c033a5d
Merge pull request #318 from TES3MP/master
...
Add master commits up to 18 Oct 2017
7 years ago
David Cernat
260b3411c3
Merge pull request #317 from OpenMW/master
...
Add OpenMW commits up to 18 Oct 2017
7 years ago
AnyOldName3
69da89be39
Mark a method I missed out the first time as override
7 years ago
scrawl
33ceddc58b
Merge pull request #1506 from akortunov/swimanimations
...
Use SwimTurnLeft/Right animations correctly
7 years ago
scrawl
21a705fb75
Merge pull request #1507 from AnyOldName3/data-local-fix
...
Fix the loading of 'data-local' lines which I broke
7 years ago
scrawl
7328de6c50
Merge pull request #1505 from drummyfish/master
...
Make snow create water ripples (fixes #4156 )
7 years ago
AnyOldName3
2aad5bed7a
Mark worldimp functions as override to stop distracting Travis CI warnings and prevent future typos
7 years ago
AnyOldName3
1f77f9654b
Strip quotes from the data-local setting if present (because for whatever reason it's a string, not a boost::filesystem::path)
7 years ago
Andrei Kortunov
4d4d247565
Use SwimTurnLeft/Right animations correctly
7 years ago
Miloslav Číž
a7cad65aab
fix water shader switching bug
7 years ago
Miloslav Číž
8a1e0e74fd
update uniform from one place
7 years ago
Miloslav Číž
797e407269
make snow create water ripples
7 years ago
Miloslav Číž
da47653625
move rain intensity uniform to water node
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
03554b2f4b
Fix some style issues flagged by cppcheck
7 years ago
scrawl
64d02f577e
Fix missing null check
7 years ago
scrawl
624046c558
Fix unused event handler
7 years ago
scrawl
bbf9b0c0a7
Merge pull request #1503 from akortunov/regressions
...
Handle Trespassing crime differently from Theft
7 years ago
scrawl
97ec38affb
Merge pull request #1492 from drummyfish/master
...
fix rain/snow moving with player (issue #2698 )
7 years ago
Andrei Kortunov
8f255a6b72
Handle Trespassing crime differently from Theft (bug #4158 )
7 years ago
Miloslav Číž
af6eeddbe5
use operator instead of drawcallback
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 Číž
38bfa64100
transform weather particles to world space
7 years ago
Miloslav Číž
8114126a62
make use of renderinfo
7 years ago
Miloslav Číž
33a1459b11
search for particle system by class name
7 years ago
Miloslav Číž
b95c9ba483
rain independent from camera plus wrap-around
7 years ago
scrawl
548af6dbfb
Fix jail screen fading
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
scrawl
09d7681254
Merge pull request #1499 from lukago/bug4155
...
Bugfix #4155 : NPCs don't equip a second ring in some cases
7 years ago
glbwsk
83a5c7c3d8
removed unnecessary comments, added gitignore for clion cmake
7 years ago
scrawl
548e90a7bc
Set cursor active when moving by controller
7 years ago
glbwsk
ff9cb22a58
npc swap cheaper ring during auto equip
7 years ago
glbwsk
e6e482ea98
added some comments for autoEquip
7 years ago
glbwsk
a25903b075
fixed autoequiping rings by npc - now checks if right hand is free
7 years ago
David Cernat
fe9a3088bd
Merge pull request #312 from TES3MP/master
...
Add master commits up to 10 Oct 2017
7 years ago