e564dd842e
Refactor dialogue responses to make sure messages from scripts are printer afterwards, not before the dialogue response ( Fixes #4166 )
...
Don't delete Link objects prematurely (Fixes #4171 )
7 years ago
2a0b2c4e24
Hide modal window before deleting it ( Fixes #4168 )
7 years ago
3aedc2e5bc
[Server] Don't automatically share PlayerTopic packets between players
7 years ago
360cf2ead7
Merge pull request #321 from OpenMW/master
...
Add OpenMW commits up to 22 Oct 2017
7 years ago
32bdd500af
Updating OSG packages to 3.4.1
7 years ago
8b19a8b7f6
Merge pull request #1513 from lukago/feature4082b
...
Feature #4082 : use many ingredients/potions instantly
7 years ago
3d0094bd2e
Fix behavior of 'journal' command when invoked with already seen entry
7 years ago
768da57da2
Fix dialogue topics displayed in lower case
7 years ago
3a9e5e3a7b
Merge pull request #319 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
7 years ago
f3be39660b
Merge pull request #1516 from baszczewski/patch-1
...
Fix assert with empty setting value
7 years ago
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
b6cb3b445c
use getIndex to handle other windows, nullsafe fixes
7 years ago
bb4ffb7743
Merge pull request #1514 from akortunov/ringfix
...
Do not replace an equpped ring of the same value
7 years ago
075a7fee20
Merge pull request #1515 from akortunov/guifixes
...
Fix a 'Good Beast' companion window
7 years ago
5b2fe01375
Merge pull request #1508 from AnyOldName3/shut-up-travis
...
Mark worldimp functions as override to stop distracting Travis CI war…
7 years ago
eaff7e30aa
Fix a 'Good Beast' companion window
7 years ago
e64f14b7ce
Do not replace an equpped ring of the same value
7 years ago
a3225364ff
refactor, use dragItem method
7 years ago
03fc3353b9
Tidy up indentation 2
7 years ago
f3e6b26e6b
Tidy up indentation
7 years ago
9be27193a3
Merge pull request #1512 from Rhiyo/patch-1
...
fixed new clothing replacing old clothing of same value
7 years ago
43f94a8890
simplify drag and drop on avatar for potions and ingredients
7 years ago
0b163f0a50
Merge remote-tracking branch 'aesylwinn/forceNewProject'
7 years ago
bdabace7e2
Merge remote-tracking branch 'aesylwinn/LLmerge'
7 years ago
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
6d8666d80d
Force new project file when creating new project
7 years ago
9571cd8754
Switch defaultfilters to be handled by a binary-friendly version of the resource macro
7 years ago
2abff22c08
Make MWWorld::World final to enable compiler optimisations
7 years ago
7440cf37bc
Remove redundant virtual keywords implied by override keywords
7 years ago
260b3411c3
Merge pull request #317 from OpenMW/master
...
Add OpenMW commits up to 18 Oct 2017
7 years ago
69da89be39
Mark a method I missed out the first time as override
7 years ago
33ceddc58b
Merge pull request #1506 from akortunov/swimanimations
...
Use SwimTurnLeft/Right animations correctly
7 years ago
21a705fb75
Merge pull request #1507 from AnyOldName3/data-local-fix
...
Fix the loading of 'data-local' lines which I broke
7 years ago
7328de6c50
Merge pull request #1505 from drummyfish/master
...
Make snow create water ripples (fixes #4156 )
7 years ago
2aad5bed7a
Mark worldimp functions as override to stop distracting Travis CI warnings and prevent future typos
7 years ago
43e9e955c8
Do the same for the CS
7 years ago
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
4d4d247565
Use SwimTurnLeft/Right animations correctly
7 years ago
a7cad65aab
fix water shader switching bug
7 years ago
8a1e0e74fd
update uniform from one place
7 years ago
797e407269
make snow create water ripples
7 years ago
da47653625
move rain intensity uniform to water node
7 years ago
184c5f2b29
Merge pull request #315 from OpenMW/master
...
Add OpenMW commits up to 17 Oct 2017
7 years ago
a3a7b5b357
Merge pull request #1504 from AnyOldName3/escape-hash-oversight-fix-two-electric-boogaloo
...
Switch openmw-cs to the escape versions of option types
7 years ago
7f8d996eff
Merge pull request #1502 from AnyOldName3/launcher-and-wizard-ampersand-escape-support
...
Launcher and wizard ampersand escape support
7 years ago
6d7a24224b
Add documentation.
7 years ago
654bd401fb
Switch openmw-cs to the escape versions of option types
7 years ago
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
136ef1f738
Fix incomplete settings in recreateShaders()
7 years ago
03554b2f4b
Fix some style issues flagged by cppcheck
7 years ago
scrawl
David Cernat
Alexander "Ace" Olofsson
Marcin Baszczewski
lukago
Andrei Kortunov
AnyOldName3
Marc Zinnschlag
Rhiyo
Kyle Cooley
AnyOldName3
Miloslav Číž