David Cernat
|
ad4214d3e2
|
Merge pull request #434 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
apps/openmw-mp/Networking.cpp
apps/openmw/mwmp/processors/worldstate/ProcessorGameTime.hpp
components/CMakeLists.txt
components/openmw-mp/Base/BasePlayer.hpp
components/openmw-mp/Packets/Worldstate/PacketGameTime.hpp
|
2018-05-21 09:26:08 +03:00 |
|
David Cernat
|
5af1150ab2
|
[General] Turn GameTime into a Worldstate packet
|
2018-05-21 07:14:08 +03:00 |
|
David Cernat
|
e87e1dbb30
|
[General] Fix Worldstate packets by adding missing lines
|
2018-05-21 07:12:55 +03:00 |
|
David Cernat
|
815d17d9db
|
Merge pull request #433 from OpenMW/master
Add OpenMW commits up to 21 May 2018
|
2018-05-21 02:07:08 +03:00 |
|
Bret Curtis
|
5775f420e2
|
Merge pull request #1714 from ananace/patch-9
Switch Appveyor CI to x64 VS2015 / 2017
|
2018-05-21 00:03:07 +02:00 |
|
David Cernat
|
e690ff0e29
|
Merge pull request #432 from OpenMW/master
Add OpenMW commits up to 18 May 2018
|
2018-05-20 23:48:53 +03:00 |
|
Alexander "Ananace" Olofsson
|
d05de8e411
|
Give boost the correct toolset for 2017
|
2018-05-20 18:51:28 +02:00 |
|
Alexander "Ananace" Olofsson
|
4f758bdd48
|
Use different environments for 2015 and 2017
|
2018-05-20 18:24:06 +02:00 |
|
Alexander "Ananace" Olofsson
|
3bd8dc3ef6
|
Use the right boost version for Appveyor
|
2018-05-20 18:22:02 +02:00 |
|
Alexander "Ananace" Olofsson
|
bcfa2a13a6
|
Use the VS2017 packaging of Qt5 for Appveyor
|
2018-05-20 18:09:31 +02:00 |
|
Alexander "Ananace" Olofsson
|
e1e7a4b11a
|
Change Appveyor to use Visual Studio 2017
|
2018-05-20 18:04:59 +02:00 |
|
Alexander "Ananace" Olofsson
|
12b201348a
|
Switch to the supported VS versions on Appveyor
|
2018-05-20 17:17:04 +02:00 |
|
Alexander "Ananace" Olofsson
|
ea6c73333b
|
Bumping Qt to 5.10 for Appveyor
|
2018-05-20 17:14:32 +02:00 |
|
Alexander "Ananace" Olofsson
|
f8304a52c4
|
Enable verbose logging for CI
|
2018-05-20 17:04:52 +02:00 |
|
Marc Zinnschlag
|
ec900ef4ad
|
Merged pull request #1710)
|
2018-05-18 12:34:16 +02:00 |
|
David Cernat
|
8a393d2984
|
Merge pull request #430 from TES3MP/0.6.3 while resolving conflicts
# Conflicts:
# apps/openmw-mp/Networking.cpp
# apps/openmw-mp/Networking.hpp
# components/CMakeLists.txt
|
2018-05-18 08:12:28 +03:00 |
|
David Cernat
|
43a944ddaf
|
[General] Add and implement new Worldstate packet type
|
2018-05-18 06:40:28 +03:00 |
|
David Cernat
|
e8b22a2e5e
|
[Server] Use correct source group for ObjectProcessors
|
2018-05-18 05:06:19 +03:00 |
|
David Cernat
|
18167a734e
|
Merge pull request #419 from Aesylwinn/Travis-0.6.3
Travis 0.6.3
|
2018-05-17 19:07:34 +03:00 |
|
Capostrophic
|
4e485dbd44
|
Rename Original Creature column to Parent Creature (fixes #2897)
|
2018-05-17 13:00:48 +03:00 |
|
David Cernat
|
049d0d9ba7
|
[General] Fix remaining references to world packets/events
|
2018-05-17 00:08:37 +03:00 |
|
David Cernat
|
dc9a3bf73f
|
Merge pull request #429 from OpenMW/master
Add OpenMW commits up to 16 May 2018
|
2018-05-16 19:20:01 +03:00 |
|
Bret Curtis
|
67c381df4e
|
Merge pull request #1708 from akortunov/refidfix
fix GCC warnings
|
2018-05-16 15:59:31 +02:00 |
|
Andrei Kortunov
|
a68de93308
|
Initialize srate variable in openal_output
|
2018-05-16 16:34:58 +04:00 |
|
Andrei Kortunov
|
e5db5e2651
|
Fix 'maybe-uninitialized' warning in openal_output
|
2018-05-16 16:13:22 +04:00 |
|
Andrei Kortunov
|
df459199dd
|
Avoid left shift of negative value
|
2018-05-16 12:59:05 +04:00 |
|
Bret Curtis
|
caf1760251
|
Merge pull request #1707 from akortunov/weaponreach
Display weapon reach on tooltips in feet
|
2018-05-16 10:27:53 +02:00 |
|
Andrei Kortunov
|
164e3d12fe
|
Display weapon reach on tooltips in feet.
|
2018-05-16 11:18:22 +04:00 |
|
Bret Curtis
|
e410c47660
|
Merge pull request #1706 from akortunov/refidfix
Fix compiler warning in getNestedData()
|
2018-05-16 09:00:25 +02:00 |
|
Andrei Kortunov
|
6a3ff5ed81
|
Fix compiler warning in getNestedData
|
2018-05-16 10:10:42 +04:00 |
|
David Cernat
|
b5922d18fd
|
Merge pull request #428 from TES3MP/0.6.3 while resolving conflicts
# Conflicts:
# apps/openmw-mp/Networking.cpp
# apps/openmw-mp/Script/Functions/Objects.cpp
# apps/openmw-mp/Script/Functions/Objects.hpp
# apps/openmw-mp/processors/ObjectProcessor.cpp
# apps/openmw-mp/processors/object/ProcessorContainer.hpp
# apps/openmw-mp/processors/object/ProcessorDoorState.hpp
# apps/openmw-mp/processors/object/ProcessorMusicPlay.hpp
# apps/openmw-mp/processors/object/ProcessorObjectAnimPlay.hpp
# apps/openmw-mp/processors/object/ProcessorObjectDelete.hpp
# apps/openmw-mp/processors/object/ProcessorObjectLock.hpp
# apps/openmw-mp/processors/object/ProcessorObjectMove.hpp
# apps/openmw-mp/processors/object/ProcessorObjectPlace.hpp
# apps/openmw-mp/processors/object/ProcessorObjectRotate.hpp
# apps/openmw-mp/processors/object/ProcessorObjectScale.hpp
# apps/openmw-mp/processors/object/ProcessorObjectSpawn.hpp
# apps/openmw-mp/processors/object/ProcessorObjectState.hpp
# apps/openmw-mp/processors/object/ProcessorObjectTrap.hpp
# apps/openmw-mp/processors/object/ProcessorScriptGlobalFloat.hpp
# apps/openmw-mp/processors/object/ProcessorScriptGlobalShort.hpp
# apps/openmw-mp/processors/object/ProcessorScriptLocalFloat.hpp
# apps/openmw-mp/processors/object/ProcessorScriptLocalShort.hpp
# apps/openmw-mp/processors/object/ProcessorScriptMemberFloat.hpp
# apps/openmw-mp/processors/object/ProcessorScriptMemberShort.hpp
# apps/openmw-mp/processors/object/ProcessorVideoPlay.hpp
# apps/openmw/mwmp/Networking.cpp
# apps/openmw/mwmp/processors/object/BaseObjectProcessor.hpp
# apps/openmw/mwmp/processors/object/ProcessorMusicPlay.hpp
# apps/openmw/mwmp/processors/object/ProcessorScriptGlobalFloat.hpp
# apps/openmw/mwmp/processors/object/ProcessorScriptGlobalShort.hpp
# apps/openmw/mwmp/processors/object/ProcessorScriptMemberFloat.hpp
# apps/openmw/mwmp/processors/object/ProcessorScriptMemberShort.hpp
# apps/openmw/mwmp/processors/object/ProcessorVideoPlay.hpp
|
2018-05-16 06:28:24 +03:00 |
|
David Cernat
|
2ac334664b
|
[Server] Add deprecated alternatives for ObjectList functions
This will avoid server crashes in older scripts.
|
2018-05-16 02:16:27 +03:00 |
|
David Cernat
|
51698bed48
|
[Client] Rename WorldProcessor into ObjectProcessor
|
2018-05-15 22:56:47 +03:00 |
|
David Cernat
|
02d8e08c58
|
[Server] Rename WorldProcessor into ObjectProcessor
|
2018-05-15 22:07:06 +03:00 |
|
David Cernat
|
98eece808b
|
Merge pull request #427 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
apps/openmw-mp/CMakeLists.txt
apps/openmw-mp/Script/Functions/Objects.cpp
apps/openmw-mp/Script/Functions/Objects.hpp
apps/openmw-mp/Script/ScriptFunctions.hpp
|
2018-05-15 21:10:47 +03:00 |
|
David Cernat
|
1e749938fb
|
Merge pull request #426 from OpenMW/master
Add OpenMW commits up to 15 May 2018
|
2018-05-15 21:01:33 +03:00 |
|
David Cernat
|
bef36f77ca
|
[Server] Create WorldstateFunctions and move GameTime functions there
|
2018-05-15 20:58:09 +03:00 |
|
Bret Curtis
|
c75d774356
|
Merge pull request #1692 from akortunov/playsound
Prevent PlaySound overlapping
|
2018-05-15 19:03:01 +02:00 |
|
David Cernat
|
9b9dd4abaf
|
Merge pull request #425 from OpenMW/master
Add OpenMW commits up to 13 May 2018
|
2018-05-13 19:27:34 +03:00 |
|
Marc Zinnschlag
|
bdfa430857
|
updated credits file
|
2018-05-13 09:24:24 +02:00 |
|
Marc Zinnschlag
|
0f22600a98
|
Merged pull request #1703
|
2018-05-13 09:08:40 +02:00 |
|
David Cernat
|
d4f7936a76
|
[Server] Rename WorldFunctions into ObjectFunctions
|
2018-05-13 04:11:05 +03:00 |
|
David Cernat
|
d4dbfdfdb6
|
Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
apps/openmw-mp/Networking.cpp
apps/openmw-mp/Script/Functions/World.cpp
apps/openmw-mp/Script/Functions/World.hpp
apps/openmw-mp/processors/WorldProcessor.cpp
apps/openmw-mp/processors/WorldProcessor.hpp
apps/openmw-mp/processors/world/ProcessorContainer.hpp
apps/openmw-mp/processors/world/ProcessorDoorState.hpp
apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp
apps/openmw-mp/processors/world/ProcessorObjectLock.hpp
apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp
apps/openmw-mp/processors/world/ProcessorObjectScale.hpp
apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp
apps/openmw-mp/processors/world/ProcessorObjectState.hpp
apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp
apps/openmw/mwgui/container.cpp
apps/openmw/mwmp/Networking.cpp
apps/openmw/mwmp/ObjectList.cpp
apps/openmw/mwmp/ObjectList.hpp
apps/openmw/mwmp/processors/world/ProcessorContainer.hpp
components/CMakeLists.txt
components/openmw-mp/Base/BaseObject.hpp
components/openmw-mp/Packets/Object/ObjectPacket.cpp
components/openmw-mp/Packets/Object/PacketConsoleCommand.cpp
components/openmw-mp/Packets/Object/PacketContainer.cpp
components/openmw-mp/Packets/Object/PacketDoorState.hpp
components/openmw-mp/Packets/Object/PacketMusicPlay.hpp
components/openmw-mp/Packets/Object/PacketObjectAnimPlay.hpp
components/openmw-mp/Packets/Object/PacketObjectLock.hpp
components/openmw-mp/Packets/Object/PacketObjectMove.hpp
components/openmw-mp/Packets/Object/PacketObjectPlace.hpp
components/openmw-mp/Packets/Object/PacketObjectRotate.hpp
components/openmw-mp/Packets/Object/PacketObjectScale.hpp
components/openmw-mp/Packets/Object/PacketObjectSpawn.hpp
components/openmw-mp/Packets/Object/PacketObjectState.hpp
components/openmw-mp/Packets/Object/PacketObjectTrap.hpp
components/openmw-mp/Packets/Object/PacketScriptGlobalShort.hpp
components/openmw-mp/Packets/Object/PacketScriptLocalFloat.hpp
components/openmw-mp/Packets/Object/PacketScriptLocalShort.hpp
components/openmw-mp/Packets/Object/PacketScriptMemberShort.hpp
components/openmw-mp/Packets/Object/PacketVideoPlay.hpp
|
2018-05-13 03:20:01 +03:00 |
|
David Cernat
|
78234f9071
|
[General] Rename Event into ObjectList & WorldObject into BaseObject
|
2018-05-13 00:42:24 +03:00 |
|
David Cernat
|
672bb707a7
|
Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts
# Conflicts:
# apps/openmw-mp/Networking.cpp
# apps/openmw-mp/Networking.hpp
# apps/openmw-mp/Script/Functions/World.cpp
# apps/openmw-mp/processors/WorldProcessor.cpp
# apps/openmw-mp/processors/WorldProcessor.hpp
# apps/openmw-mp/processors/world/ProcessorContainer.hpp
# apps/openmw-mp/processors/world/ProcessorDoorState.hpp
# apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp
# apps/openmw-mp/processors/world/ProcessorObjectLock.hpp
# apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp
# apps/openmw-mp/processors/world/ProcessorObjectScale.hpp
# apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp
# apps/openmw-mp/processors/world/ProcessorObjectState.hpp
# apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp
# apps/openmw/mwmp/Networking.cpp
# components/CMakeLists.txt
# components/openmw-mp/Controllers/ObjectPacketController.hpp
# components/openmw-mp/Controllers/WorldPacketController.cpp
# components/openmw-mp/Packets/Object/ObjectPacket.cpp
# components/openmw-mp/Packets/Object/ObjectPacket.hpp
# components/openmw-mp/Packets/Object/PacketConsoleCommand.hpp
# components/openmw-mp/Packets/Object/PacketContainer.hpp
# components/openmw-mp/Packets/Object/PacketDoorState.hpp
# components/openmw-mp/Packets/Object/PacketMusicPlay.hpp
# components/openmw-mp/Packets/Object/PacketObjectAnimPlay.hpp
# components/openmw-mp/Packets/Object/PacketObjectDelete.hpp
# components/openmw-mp/Packets/Object/PacketObjectLock.hpp
# components/openmw-mp/Packets/Object/PacketObjectMove.hpp
# components/openmw-mp/Packets/Object/PacketObjectPlace.hpp
# components/openmw-mp/Packets/Object/PacketObjectRotate.hpp
# components/openmw-mp/Packets/Object/PacketObjectScale.hpp
# components/openmw-mp/Packets/Object/PacketObjectSpawn.hpp
# components/openmw-mp/Packets/Object/PacketObjectState.hpp
# components/openmw-mp/Packets/Object/PacketObjectTrap.hpp
# components/openmw-mp/Packets/Object/PacketScriptGlobalShort.hpp
# components/openmw-mp/Packets/Object/PacketScriptLocalFloat.hpp
# components/openmw-mp/Packets/Object/PacketScriptLocalShort.hpp
# components/openmw-mp/Packets/Object/PacketScriptMemberShort.hpp
# components/openmw-mp/Packets/Object/PacketVideoPlay.hpp
|
2018-05-12 20:35:34 +03:00 |
|
David Cernat
|
6bf3a0be1e
|
[General] Rename WorldPackets into ObjectPackets for clarity
|
2018-05-12 19:40:00 +03:00 |
|
David Cernat
|
7c8dd7380f
|
Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
apps/openmw-mp/Script/Functions/Actors.cpp
apps/openmw-mp/Script/Functions/Actors.hpp
apps/openmw-mp/Script/Functions/Cells.cpp
|
2018-05-12 18:01:01 +03:00 |
|
David Cernat
|
5458e09c8a
|
Merge pull request #420 from OpenMW/master
Add OpenMW commits up to 11 May 2018
|
2018-05-12 06:32:01 +03:00 |
|
David Cernat
|
77389538e8
|
[General] Implement ActorAI packet, part 1
The server can now make actors become followers of players or other actors.
|
2018-05-12 06:29:11 +03:00 |
|
Marc Zinnschlag
|
b7cce1a665
|
Merged pull request #1702
|
2018-05-11 10:11:17 +02:00 |
|