teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
20369 commits 34 branches 0 tags 66 MiB
Commit graph

15302 commits

Author SHA1 Message Date
Koncord
05abb8ace3 [Server] Add Log level constants to lua 2017-10-25 15:22:07 +08:00
Koncord
04a844a9c0 [Server] Use sol's default_handler 2017-10-25 15:21:11 +08:00
Koncord
dad0b38f25 [Server] Add custom terminate handler with stacktrace 2017-10-25 14:45:36 +08:00
Koncord
a3d5fbbdcd [Server] Add stacktrace 2017-10-25 14:45:36 +08:00
Koncord
916ada108f [General] Modernize Log utility 
* Reverse Log levels
* Add LOG_TRACE
* Spawn instance of Log in Get() function
 2017-10-25 14:45:36 +08:00
David Cernat
76a4abd7c0 Merge pull request #325 from TES3MP/master while resolving conflicts 
# Conflicts:
#	apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp
 2017-10-24 19:45:11 +03:00
David Cernat
dd25c7db4e Merge pull request #324 from OpenMW/master 
Add OpenMW commits up to 24 Oct 2017
 2017-10-24 19:36:14 +03:00
David Cernat
a94d4ce6f5 Merge pull request #323 from TES3MP/0.6.1 
Add hotfix commit for 0.6.1 from 23 Oct 2017
 2017-10-24 19:34:34 +03:00
scrawl
4437a72e47 Merge pull request #1519 from drummyfish/rainfix 
fix rain ripple regression (bug #4169)
 2017-10-24 15:31:16 +00:00
Miloslav Číž
3731e20228 fix rain ripple regression 2017-10-24 14:12:41 +02:00
scrawl
0c6ef17fb5 Add explicit variant of 'OnActivate' 2017-10-23 23:33:06 +00:00
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)
 2017-10-23 23:33:06 +00:00
scrawl
2a0b2c4e24 Hide modal window before deleting it (Fixes #4168) 2017-10-23 23:33:05 +00:00
David Cernat
3aedc2e5bc [Server] Don't automatically share PlayerTopic packets between players 2017-10-23 19:39:35 +03:00
David Cernat
360cf2ead7 Merge pull request #321 from OpenMW/master 
Add OpenMW commits up to 22 Oct 2017
 2017-10-23 14:51:29 +03:00
scrawl
8b19a8b7f6 Merge pull request #1513 from lukago/feature4082b 
Feature #4082: use many ingredients/potions instantly
 2017-10-22 20:51:14 +00:00
scrawl
3d0094bd2e Fix behavior of 'journal' command when invoked with already seen entry 2017-10-22 20:50:15 +00:00
scrawl
768da57da2 Fix dialogue topics displayed in lower case 2017-10-22 20:50:15 +00:00
David Cernat
3a9e5e3a7b Merge pull request #319 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwworld/worldimp.hpp
 2017-10-22 20:27:44 +03:00
lukago
b6cb3b445c use getIndex to handle other windows, nullsafe fixes 2017-10-21 23:34:57 +02:00
scrawl
bb4ffb7743 Merge pull request #1514 from akortunov/ringfix 
Do not replace an equpped ring of the same value
 2017-10-21 13:35:55 +00:00
scrawl
075a7fee20 Merge pull request #1515 from akortunov/guifixes 
Fix a 'Good Beast' companion window
 2017-10-21 13:35:29 +00:00
scrawl
5b2fe01375 Merge pull request #1508 from AnyOldName3/shut-up-travis 
Mark worldimp functions as override to stop distracting Travis CI war…
 2017-10-21 13:34:48 +00:00
Andrei Kortunov
eaff7e30aa Fix a 'Good Beast' companion window 2017-10-21 16:56:21 +04:00
Koncord
ba8613a179 [Browser] Add "no password" filter to browser 2017-10-21 12:42:38 +08:00
Andrei Kortunov
e64f14b7ce Do not replace an equpped ring of the same value 2017-10-20 23:05:12 +04:00
lukago
a3225364ff refactor, use dragItem method 2017-10-19 17:43:27 +02:00
AnyOldName3
03fc3353b9 Tidy up indentation 2 2017-10-19 16:34:50 +01:00
AnyOldName3
f3e6b26e6b Tidy up indentation 2017-10-19 16:34:11 +01:00
scrawl
9be27193a3 Merge pull request #1512 from Rhiyo/patch-1 
fixed new clothing replacing old clothing of same value
 2017-10-19 14:54:27 +00:00
lukago
43f94a8890 simplify drag and drop on avatar for potions and ingredients 2017-10-19 16:50:04 +02:00
Marc Zinnschlag
0b163f0a50 Merge remote-tracking branch 'aesylwinn/forceNewProject' 2017-10-19 14:44:30 +02:00
Marc Zinnschlag
bdabace7e2 Merge remote-tracking branch 'aesylwinn/LLmerge' 2017-10-19 14:24:58 +02:00
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.
 2017-10-19 22:46:08 +10:30
David Cernat
fb67180809 [Server] Fix build in Visual Studio 2017-10-19 13:04:37 +03:00
Koncord
4530370e52 [Server] Use old style of Server Plugins location 2017-10-19 11:55:49 +08:00
Koncord
ce6a4e4032 [Server] Fix indents 2017-10-19 10:26:03 +08:00
Koncord
fc3f2483ee [Server] Add manual Server Plugins sort 2017-10-19 10:24:17 +08:00
Kyle Cooley
6d8666d80d Force new project file when creating new project 2017-10-18 20:21:44 -04:00
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, "")
 2017-10-18 22:32:03 +08:00
Koncord
7a0b45d456 [Server] Load mods in dependencies order 2017-10-18 21:30:36 +08:00
Koncord
66283943c5 [Browser] Fix Clang warnings 2017-10-18 21:30:36 +08:00
AnyOldName3
2abff22c08 Make MWWorld::World final to enable compiler optimisations 2017-10-18 13:48:31 +01:00
AnyOldName3
7440cf37bc Remove redundant virtual keywords implied by override keywords 2017-10-18 13:37:37 +01:00
David Cernat
6e7c033a5d Merge pull request #318 from TES3MP/master 
Add master commits up to 18 Oct 2017
 2017-10-18 15:14:37 +03:00
David Cernat
260b3411c3 Merge pull request #317 from OpenMW/master 
Add OpenMW commits up to 18 Oct 2017
 2017-10-18 15:13:48 +03:00
AnyOldName3
69da89be39 Mark a method I missed out the first time as override 2017-10-18 13:05:04 +01:00
scrawl
33ceddc58b Merge pull request #1506 from akortunov/swimanimations 
Use SwimTurnLeft/Right animations correctly
 2017-10-18 10:03:30 +00:00
scrawl
21a705fb75 Merge pull request #1507 from AnyOldName3/data-local-fix 
Fix the loading of 'data-local' lines which I broke
 2017-10-18 09:59:43 +00:00
scrawl
7328de6c50 Merge pull request #1505 from drummyfish/master 
Make snow create water ripples (fixes #4156)
 2017-10-18 09:59:21 +00:00