Commit Graph

20370 Commits (d44848ecbb35056dc7441b23219686787a69f5ee)
 

Author SHA1 Message Date
Koncord d44848ecbb [Server] Fix build 7 years ago
Koncord 05abb8ace3 [Server] Add Log level constants to lua 7 years ago
Koncord 04a844a9c0 [Server] Use sol's default_handler 7 years ago
Koncord dad0b38f25 [Server] Add custom terminate handler with stacktrace 7 years ago
Koncord a3d5fbbdcd [Server] Add stacktrace 7 years ago
Koncord 916ada108f [General] Modernize Log utility
* Reverse Log levels
* Add LOG_TRACE
* Spawn instance of Log in Get() function
7 years ago
David Cernat d6dc75e94b Merge branch 'new-script-api' of https://github.com/TES3MP/openmw-tes3mp into new-script-api 7 years ago
David Cernat 76a4abd7c0 Merge pull request #325 from TES3MP/master while resolving conflicts
# Conflicts:
#	apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp
7 years ago
David Cernat dd25c7db4e Merge pull request #324 from OpenMW/master
Add OpenMW commits up to 24 Oct 2017
7 years ago
David Cernat a94d4ce6f5 Merge pull request #323 from TES3MP/0.6.1
Add hotfix commit for 0.6.1 from 23 Oct 2017
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
David Cernat 3aedc2e5bc [Server] Don't automatically share PlayerTopic packets between players 7 years ago
David Cernat 0e73571111 Merge pull request #322 from TES3MP/master
Add master commits up to 23 Oct 2017
7 years ago
David Cernat 360cf2ead7 Merge pull request #321 from OpenMW/master
Add OpenMW commits up to 22 Oct 2017
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
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
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
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
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
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