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

18444 commits

This branch
This branch
All branches
Author SHA1 Message Date
scrawl
c231b06320 Remove boneOffset node after using it 2017-02-23 23:28:50 +01:00
scrawl
d75a3fd0fb Add SharedStateManager to the stats panel 2017-02-23 23:28:49 +01:00
scrawl
732212070d crashcatcher: complain when launching gdb fails 2017-02-23 23:28:49 +01:00
David Cernat
0d6636018f Merge pull request #166 from OpenMW/master 
Add OpenMW commits up to 23 Feb 2017
 2017-02-23 14:37:14 +02:00
Koncord
cbace41e14 [Client] Fix crash on LInux 2017-02-23 17:40:22 +08:00
Marc Zinnschlag
8e82c161c6 updated credits file 2017-02-23 09:11:36 +01:00
Marc Zinnschlag
765401531d Merge remote-tracking branch 'origin/master' 2017-02-23 09:03:31 +01:00
David Cernat
ed2176c984 [Client] Reuse 1 BaseEvent over and over instead of creating new ones 2017-02-23 09:19:09 +02:00
Koncord
b158e89f77 [Server] Change signatures of GetLastEventAction & SetScriptEventAction 2017-02-23 15:17:00 +08:00
Koncord
059043fea9 [General] Change signature of BaseEvent::action 2017-02-23 15:16:28 +08:00
Koncord
cbe31149e3 [Server] Remove redundant constructor 2017-02-23 14:36:35 +08:00
David Cernat
af35ee38d1 [Server] Rename ClearScriptEvent into InitScriptEvent with pid argument 2017-02-23 08:23:46 +02:00
Koncord
868c837aa0 [Server] Move baseEvent from Networking.cpp to class as member 2017-02-23 13:53:10 +08:00
David Cernat
7065569f9b [Server] Reuse 2 BaseEvents over and over instead of creating new ones 2017-02-23 07:47:00 +02:00
David Cernat
1b59ce8c8f [Client] Send ID_PLAYER_DRAWSTATE when teleported by server 2017-02-23 06:26:42 +02:00
Koncord
f8a25747ba [Client] Some tabs have been killed in GUIChat 2017-02-23 11:48:10 +08:00
Stanislav Zhukov
8f9b831662 Update tes3mp-credits.md 2017-02-23 11:14:08 +08:00
David Cernat
586a7f6656 [Client] Prevent DedicatedPlayer from spawning on ground from 0 fatigue 2017-02-23 04:35:07 +02:00
David Cernat
fb34e2c4ba Revert "[Build] Fix for MSYS2 build while maintaining MSVC fix" 
This reverts commit faf1c416f3.
 2017-02-23 02:29:25 +02:00
David Cernat
4b497a18c6 Merge pull request #165 from Battlerax/battlerax-dev 
[Build] Fix for MSVC linking issue with RakNet while maintaining MSYS2 compatibility
 2017-02-23 02:23:27 +02:00
Battlerax
79e996aed3 Merge pull request #3 from Battlerax/master 
tes3mp & openmw changes
 2017-02-22 17:49:29 -06:00
Battlerax
090b9af987 Merge pull request #2 from TES3MP/master 
tes3mp & openmw changes
 2017-02-22 17:47:49 -06:00
David Cernat
d4ff136837 [Client] Add comments about spellcasting as a result of merge conflict 2017-02-23 01:05:45 +02:00
David Cernat
38ccc2671c Merge pull request #164 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
 2017-02-23 00:52:53 +02:00
Battlerax
faf1c416f3 [Build] Fix for MSYS2 build while maintaining MSVC fix 2017-02-22 16:22:05 -06:00
Battlerax
b47260f9dc [Build] Fixed linker issue 2017-02-22 15:49:46 -06:00
David Cernat
b373a3e0ba Merge pull request #163 from Battlerax/battlerax-dev 
[Client] You can now cancel the chat box by pressing enter without a message
 2017-02-22 23:13:28 +02:00
Battlerax
fd845198ad [Client] You can now cancel the chat box by pressing enter without a message. 2017-02-22 15:03:59 -06:00
Battlerax
ba4b77f2c3 Merge pull request #1 from TES3MP/master 
tes3mp changes
 2017-02-22 14:54:33 -06:00
scrawl
d163228199 Fix updatePtr 2017-02-22 21:02:34 +01:00
scrawl
00d4fea91c Derive Animation from osg::Referenced to allow the UnrefQueue to delete it 2017-02-22 15:27:20 +01:00
scrawl
a5247394dc (Re)set the inventory listener outside of the Animation class 2017-02-22 15:08:22 +01:00
scrawl
8f79fa3d72 Add resource statistics panel opened with F4 2017-02-22 14:28:45 +01:00
Koncord
68c288761a [Server] Send other players position to loader 2017-02-22 16:56:09 +08:00
Koncord
b0ebad8b83 [Client] Fix crash on Linux 2017-02-22 16:30:07 +08:00
Koncord
b1460cf010 [Server] Send ID_PLAYER_POS every ID_PLAYER_CELL_CHANGE 2017-02-22 14:05:40 +08:00
David Cernat
90275f777e [Client] Don't crash when dying while inside a container 2017-02-22 06:41:25 +02:00
Koncord
443c0ed309 [Server] Fix Cell iterators 2017-02-22 12:03:03 +08:00
David Cernat
67b67ce1c4 [Client] Don't automatically rescale objects on cell change 2017-02-22 04:21:25 +02:00
scrawl
b40ca9b60a Set the window rectangle on the Viewer's EventQueue 2017-02-22 01:49:54 +01:00
David Cernat
e4ae8c5f9f [Client] Cancel drag for teleported players, fix ID_OBJECT_SCALE debug 2017-02-22 02:44:00 +02:00
scrawl
3693f05ef5 Transform world-space particle systems in update callback so that animations are accounted for 2017-02-21 23:27:20 +01:00
scrawl
0fbd29ccb8 Use additive alpha blending on the character preview 2017-02-21 18:29:18 +01:00
scrawl
e38221edc9 Set character preview's simulationTime to 0 to avoid flickering lights 2017-02-21 18:25:25 +01:00
scrawl
c45013c983 Fix particle systems not being rendered in their first frame 2017-02-21 18:15:30 +01:00
scrawl
a45335ffc3 Do not reduce magicka in god mode 2017-02-21 16:33:18 +01:00
scrawl
eefe1ed1a8 Fix being affected by Silence in god mode 2017-02-21 15:48:45 +01:00
FedeWar
e9076088ca Another tab fix 2017-02-21 11:51:11 +01:00
FedeWar
4e7f7cf84f Fixed tabs 2017-02-21 11:49:04 +01:00
Koncord
3d88e657cd [Server] Fix printVersion() for ARM 2017-02-21 18:25:41 +08:00