Commit Graph

18710 Commits (5e69f6033fa59741ab1ec599e155b646d338680d)
 

Author SHA1 Message Date
scrawl 5e69f6033f
Merge pull request #1531 from drummyfish/cyclefix
Don't switch weapon when cycling to the same weapon (issue #4180)
7 years ago
Miloslav Číž 3c65bdaf14 weapon cycle fix 7 years ago
scrawl 9c9da7b49f
Merge pull request #1527 from drummyfish/master
Remove redundant condition
7 years ago
Miloslav Číž 03401bb5df remove redundant condition 7 years ago
scrawl ae14aa0c84 Merge pull request #1522 from AnyOldName3/yet-another-cmake-fix
Ensure the git-version target puts the version file in the appropriate directory/ies
7 years ago
scrawl 90f4e9530a Merge pull request #1517 from ace13/update-osg
Updating OSG packages to 3.4.1
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
scrawl 4a7be0ffda Don't reset journal index to a lower value (Fixes #4172) 7 years ago
scrawl 4437a72e47 Merge pull request #1519 from drummyfish/rainfix
fix rain ripple regression (bug #4169)
7 years ago
Miloslav Číž 3731e20228 fix rain ripple regression 7 years ago
scrawl 0c6ef17fb5 Add explicit variant of 'OnActivate' 7 years ago
scrawl 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
scrawl 2a0b2c4e24 Hide modal window before deleting it (Fixes #4168) 7 years ago
Alexander "Ace" Olofsson 32bdd500af Updating OSG packages to 3.4.1 7 years ago
scrawl 8b19a8b7f6 Merge pull request #1513 from lukago/feature4082b
Feature #4082: use many ingredients/potions instantly
7 years ago
scrawl 3d0094bd2e Fix behavior of 'journal' command when invoked with already seen entry 7 years ago
scrawl 768da57da2 Fix dialogue topics displayed in lower case 7 years ago
scrawl f3be39660b Merge pull request #1516 from baszczewski/patch-1
Fix assert with empty setting value
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
lukago b6cb3b445c use getIndex to handle other windows, nullsafe fixes 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
lukago a3225364ff refactor, use dragItem method 7 years ago
AnyOldName3 03fc3353b9 Tidy up indentation 2 7 years ago
AnyOldName3 f3e6b26e6b Tidy up indentation 7 years ago
scrawl 9be27193a3 Merge pull request #1512 from Rhiyo/patch-1
fixed new clothing replacing old clothing of same value
7 years ago
lukago 43f94a8890 simplify drag and drop on avatar for potions and ingredients 7 years ago
Marc Zinnschlag 0b163f0a50 Merge remote-tracking branch 'aesylwinn/forceNewProject' 7 years ago
Marc Zinnschlag bdabace7e2 Merge remote-tracking branch 'aesylwinn/LLmerge' 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
Kyle Cooley 6d8666d80d Force new project file when creating new project 7 years ago
AnyOldName3 9571cd8754 Switch defaultfilters to be handled by a binary-friendly version of the resource macro 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
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 43e9e955c8 Do the same for the CS 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