Commit Graph

20346 Commits (8a93631e0899c8bfef6110c8505e9950b474e0e8)
 

Author SHA1 Message Date
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 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
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
Koncord ba8613a179 [Browser] Add "no password" filter to browser 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
scrawl 9be27193a3 Merge pull request #1512 from Rhiyo/patch-1
fixed new clothing replacing old clothing of same value
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
David Cernat fb67180809 [Server] Fix build in Visual Studio 7 years ago
Koncord 4530370e52 [Server] Use old style of Server Plugins location 7 years ago
Koncord ce6a4e4032 [Server] Fix indents 7 years ago
Koncord fc3f2483ee [Server] Add manual Server Plugins sort 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
Koncord dffd3bfa7d [Server] Add customData to Player
example:
counter = 0

Event.register(Events.ON_PLAYER_CONNECT, function(player)
    player.customData.counter = counter
    counter = counter + 1
    return true
end)

CommandController.registerCommand("test", function(player, args)
    player:message(player.customData.counter, false)
    return true
end, "")
7 years ago
Koncord 7a0b45d456 [Server] Load mods in dependencies order 7 years ago
Koncord 66283943c5 [Browser] Fix Clang warnings 7 years ago
Koncord d702845026 [General] Fix Clang warnings in Log.hpp 7 years ago
Koncord 0a0c9893b1 [General] Update sol submodule 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 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
Miloslav Číž da47653625 move rain intensity uniform to water node 7 years ago
David Cernat bbac26294f [Server] Fix typos and make all files end with newlines 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 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
scrawl 7f8d996eff Merge pull request #1502 from AnyOldName3/launcher-and-wizard-ampersand-escape-support
Launcher and wizard ampersand escape support
7 years ago
Kyle Cooley 6d7a24224b Add documentation. 7 years ago
AnyOldName3 654bd401fb Switch openmw-cs to the escape versions of option types 7 years ago