1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 20:19:57 +00:00
Commit graph

18320 commits

Author SHA1 Message Date
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
Koncord
3d88e657cd [Server] Fix printVersion() for ARM 2017-02-21 18:25:41 +08:00
Koncord
a75da18f31 [Server] Fix argument in log message 2017-02-21 18:14:02 +08:00
Koncord
7dde4db1fb [Server] Add FORCE_LUA parameter to CMakeLists.txt 2017-02-21 18:04:06 +08:00
David Cernat
a1988ac6ef Merge pull request #161 from OpenMW/master
Add OpenMW commits up to 21 Feb 2017
2017-02-21 07:02:59 +02:00
scrawl
b9740fd2a1 Fix btHeightFieldTerrainShape triangle layout to match rendering 2017-02-21 04:47:11 +01:00
scrawl
4aa40d16bc Increase the importance of light radius when sorting lights (Bug #2759) 2017-02-21 04:32:59 +01:00
scrawl
3f27c8cc97 Always print context for script warnings to remove the need for verbose option
(Fixes #2813)
2017-02-21 04:32:59 +01:00
David Cernat
d9229071ef [Browser] Move password column to the right and shorten its name 2017-02-21 02:56:00 +02:00
David Cernat
58795119b6 [Server] Add debug about information exchange in ID_PLAYER_CELL_CHANGE 2017-02-21 02:41:07 +02:00
David Cernat
37e7d2c15b [Client] Don't get invalid cells in LocalPlayer::sendJournalEntry() 2017-02-21 02:09:39 +02:00
David Cernat
b320910c5f [Client] Don't add/remove all spells from ingame scripts for LocalPlayer 2017-02-21 01:22:21 +02:00
David Cernat
bf2f932e18 [Client] If in a container, don't crash when teleported to another cell 2017-02-21 01:01:30 +02:00
David Cernat
f5470e0b49 [Client] Print cell descriptions for WorldEvents only once 2017-02-21 00:20:19 +02:00
David Cernat
92439e6e62 [Client] Reduce WorldPacket debug because it can cause freezes 2017-02-20 23:48:08 +02:00
David Cernat
96d01fcde4 [Server] Stop resending attacks because they cause infinite death loops 2017-02-20 22:19:39 +02:00
scrawl
9728a6967e Reset fall height when teleporting (Fixes #2629) 2017-02-20 20:27:05 +01:00
scrawl
05ad0dca34 Use ActionTeleport in COE/COC commands 2017-02-20 20:26:45 +01:00
David Cernat
ca0b1a8813 [Browser] Change column names slightly 2017-02-20 20:58:56 +02:00
scrawl
7e02bb7348 Preload summoned creature models before the spell is cast 2017-02-20 19:58:00 +01:00
scrawl
22482b7eec Don't use xmesh.nif over mesh.nif for classes that don't make use of the separated keyframes 2017-02-20 19:04:02 +01:00
Koncord
81513082ff [Browser] Some tweaks to password column 2017-02-21 01:13:09 +08:00
Koncord
edfade2a90 [Server] Some fixes in requests to the master server 2017-02-21 01:02:00 +08:00