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
|
7 years ago |
|
David Cernat
|
2ac334664b
|
[Server] Add deprecated alternatives for ObjectList functions
This will avoid server crashes in older scripts.
|
7 years ago |
|
David Cernat
|
51698bed48
|
[Client] Rename WorldProcessor into ObjectProcessor
|
7 years ago |
|
David Cernat
|
02d8e08c58
|
[Server] Rename WorldProcessor into ObjectProcessor
|
7 years ago |
|
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
|
7 years ago |
|
David Cernat
|
1e749938fb
|
Merge pull request #426 from OpenMW/master
Add OpenMW commits up to 15 May 2018
|
7 years ago |
|
David Cernat
|
bef36f77ca
|
[Server] Create WorldstateFunctions and move GameTime functions there
|
7 years ago |
Bret Curtis
|
c75d774356
|
Merge pull request #1692 from akortunov/playsound
Prevent PlaySound overlapping
|
7 years ago |
|
David Cernat
|
9b9dd4abaf
|
Merge pull request #425 from OpenMW/master
Add OpenMW commits up to 13 May 2018
|
7 years ago |
Marc Zinnschlag
|
bdfa430857
|
updated credits file
|
7 years ago |
|
Marc Zinnschlag
|
0f22600a98
|
Merged pull request #1703
|
7 years ago |
|
David Cernat
|
d4f7936a76
|
[Server] Rename WorldFunctions into ObjectFunctions
|
7 years ago |
|
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
|
7 years ago |
|
David Cernat
|
78234f9071
|
[General] Rename Event into ObjectList & WorldObject into BaseObject
|
7 years ago |
|
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
|
7 years ago |
|
David Cernat
|
6bf3a0be1e
|
[General] Rename WorldPackets into ObjectPackets for clarity
|
7 years ago |
|
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
|
7 years ago |
|
David Cernat
|
5458e09c8a
|
Merge pull request #420 from OpenMW/master
Add OpenMW commits up to 11 May 2018
|
7 years ago |
|
David Cernat
|
77389538e8
|
[General] Implement ActorAI packet, part 1
The server can now make actors become followers of players or other actors.
|
7 years ago |
|
Marc Zinnschlag
|
b7cce1a665
|
Merged pull request #1702
|
7 years ago |
|
Marc Zinnschlag
|
6630a02c3f
|
updated credits file
|
7 years ago |
|
David Cernat
|
c00b3bbe97
|
[Documentation] Update credits
|
7 years ago |
|
David Cernat
|
57b791ea2a
|
[Client] Show selected object's refNum & mpNum in console window title
This allows for much easier debugging of all objects and actors.
|
7 years ago |
|
David Cernat
|
c5f33e451f
|
Merge pull request #418 from TES3MP/0.6.3 while resolving conflicts
|
7 years ago |
|
David Cernat
|
12727b66ea
|
[Server] Use consistent variable names in map tile script functions
|
7 years ago |
|
David Cernat
|
7f00005f04
|
[Client] Fix GCC build
Based on 71040659ac
|
7 years ago |
Alf Henrik Sauge
|
d4f278a113
|
Replacing tab with spaces
|
7 years ago |
|
David Cernat
|
32d71de2f5
|
Update MapWindow every frame, not just when it's open (bug #4279)
|
7 years ago |
|
Alf Henrik Sauge
|
feeee50a88
|
Dropping a separate NPDTstruct12 object and instead use NPDTstruct52
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
|
7 years ago |
|
Marc Zinnschlag
|
3197ebd8e7
|
Merged pull request #1694
|
7 years ago |
|
David Cernat
|
715012f087
|
[General] Implement sending of image data for map tiles in PlayerMap
|
7 years ago |
Andrei Kortunov
|
2f89080b36
|
Load default markers definitions in editor
|
7 years ago |
|
Andrei Kortunov
|
b15bed8e22
|
Avoid excessive loadSound calls
|
7 years ago |
|
Marc Zinnschlag
|
53b6ef6f8c
|
minor code cleanup
|
7 years ago |
|
Marc Zinnschlag
|
57ee5f9b53
|
updated credits file
|
7 years ago |
|
Marc Zinnschlag
|
e661e3cf74
|
Merged pull request #1677
|
7 years ago |
|
Marc Zinnschlag
|
f5f8f62e8e
|
updated credits file
|
7 years ago |
|
Marc Zinnschlag
|
a255bdebd4
|
Merged pull request #1700
|
7 years ago |
Nelsson Huotari
|
a2745683e6
|
new run icon
|
7 years ago |
|
Alf Henrik Sauge
|
9b971caddc
|
CSVTools::ReportTable should now have case insensitive sorting
|
7 years ago |
|
Andrei Kortunov
|
17222eb821
|
Get rid of unnecessary find
|
7 years ago |
|
Bret Curtis
|
c44f87afd1
|
Merge pull request #1699 from Capostrophic/editorwarnings
Editor verifier updates
|
7 years ago |
|
Bret Curtis
|
0fc198be52
|
Merge pull request #1698 from Capostrophic/c++11
A bunch of C++11-related updates
|
7 years ago |
Capostrophic
|
2502d53816
|
Object record verifier updates
Removed light 0 duration warning
Spelling fixes
|
7 years ago |
|
Capostrophic
|
91b97a27ea
|
Remove empty class description warning
|
7 years ago |
|
Capostrophic
|
e22409c266
|
Fix sound range warning message
|
7 years ago |
|
Capostrophic
|
3d3bef94cd
|
Use range-based for loop
|
7 years ago |
|
Andrei Kortunov
|
1dd36329a3
|
Load default markers definitions (bug #4410)
|
7 years ago |
|
Bret Curtis
|
c219c89603
|
Merge pull request #1696 from Capostrophic/feature-2694
Rename "Model" column to "Model/Animation" (feature #2694)
|
7 years ago |
|
Capostrophic
|
9ac9f94638
|
Rename "Model" column to "Model/Animation" (feature #2694)
|
7 years ago |