176aa62b15
Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Cells.cpp
apps/openmw-mp/Script/Functions/Cells.hpp
apps/openmw-mp/Script/Functions/Worldstate.cpp
apps/openmw-mp/Script/Functions/Worldstate.hpp
apps/openmw-mp/Script/ScriptFunctions.hpp
apps/openmw-mp/processors/player/ProcessorPlayerMap.hpp
apps/openmw/mwmp/processors/player/ProcessorPlayerMap.hpp
components/openmw-mp/Base/BasePlayer.hpp
components/openmw-mp/Packets/Player/PacketPlayerMap.hpp
components/openmw-mp/Packets/Worldstate/PacketWorldMap.cpp
7 years ago
72862dc255
[General] Turn PlayerMap into WorldMap, now a Worldstate packet
7 years ago
c5f33e451f
Merge pull request #418 from TES3MP/0.6.3 while resolving conflicts
7 years ago
715012f087
[General] Implement sending of image data for map tiles in PlayerMap
7 years ago
4846497078
Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Positions.cpp
apps/openmw-mp/Script/Functions/Positions.hpp
apps/openmw-mp/Script/Functions/World.cpp
apps/openmw-mp/Script/Functions/World.hpp
apps/openmw-mp/Script/Script.hpp
apps/openmw-mp/Script/ScriptFunctions.cpp
components/openmw-mp/Base/BasePlayer.hpp
7 years ago
099f85be0a
[General] Implement PlayerMomentum packet & associated script functions
7 years ago
d58efde3f1
Merge pull request #410 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Actors.cpp
apps/openmw-mp/Script/Functions/Chat.cpp
apps/openmw-mp/Script/Functions/GUI.hpp
apps/openmw-mp/Script/Functions/Items.cpp
apps/openmw-mp/Script/Functions/Stats.cpp
apps/openmw-mp/Script/Functions/Stats.hpp
apps/openmw-mp/Script/ScriptFunctions.cpp
apps/openmw-mp/Script/ScriptFunctions.hpp
apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp
apps/openmw/mwmp/Cell.cpp
apps/openmw/mwmp/DedicatedActor.cpp
apps/openmw/mwmp/DedicatedPlayer.cpp
apps/openmw/mwmp/LocalActor.cpp
apps/openmw/mwmp/LocalPlayer.cpp
apps/openmw/mwmp/LocalPlayer.hpp
apps/openmw/mwmp/Main.cpp
components/openmw-mp/Base/BaseActor.hpp
components/openmw-mp/Base/BasePlayer.hpp
components/openmw-mp/Packets/Player/PacketPlayerAttribute.cpp
components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp
7 years ago
28f1c1b0d3
[General] Rework CharGen slightly for clarity purposes
...
Previously, charGenStage.end was doing double duty as both the variable indicating the number of CharGen stages and – when set to 0 – the variable indicating that CharGen was over. The latter role is now filled by a new boolean.
(cherry picked from commit 926106cf8c
7 years ago
2390744b45
Merge pull request #404 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Player.hpp
apps/openmw-mp/Script/Functions/Mechanics.cpp
apps/openmw-mp/Script/Functions/Mechanics.hpp
apps/openmw-mp/Script/Functions/Settings.hpp
apps/openmw-mp/Script/Functions/Stats.cpp
apps/openmw-mp/Script/Functions/Stats.hpp
components/openmw-mp/Base/BasePlayer.hpp
7 years ago
73dea494c4
[General] Allow changes from PlayerBaseInfo without player stat reset
7 years ago
ac374a8ef9
Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Player.cpp
apps/openmw-mp/Script/Functions/Mechanics.cpp
apps/openmw-mp/Script/Functions/Mechanics.hpp
apps/openmw-mp/Script/Functions/Quests.cpp
apps/openmw-mp/Script/Functions/Quests.hpp
apps/openmw-mp/Script/ScriptFunctions.hpp
apps/openmw-mp/processors/player/ProcessorRecordDynamic.hpp
apps/openmw/mwmp/LocalPlayer.hpp
apps/openmw/mwmp/WorldEvent.cpp
apps/openmw/mwworld/worldimp.cpp
components/openmw-mp/Base/BasePlayer.hpp
7 years ago
74765b3ace
[General] Implement selected spell sync as part of PlayerMiscellaneous
7 years ago
029dfc56ba
[General] Implement player scale as part of PlayerShapeshift
7 years ago
66078bfea7
[General] Implement Mark location sync as part of PlayerMiscellaneous
7 years ago
989f6e6b51
[General] Implement PlayerReputation packet
7 years ago
1a8a518897
Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
README.md
apps/openmw-mp/Script/Functions/World.cpp
apps/openmw/mwmp/LocalPlayer.cpp
apps/openmw/mwmp/LocalPlayer.hpp
apps/openmw/mwworld/scene.cpp
components/openmw-mp/Version.hpp
7 years ago
ce11a1dfa9
[Client] Fix potential invalid pointer when storing cell unloads
...
Notably, builds of the client done with Clang were crashing on startup before this.
7 years ago
5cf71a4e67
Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp
7 years ago
d70b93e095
Merge pull request #373 from TES3MP/0.6.2 while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmp/DedicatedActor.cpp
# apps/openmw/mwmp/processors/player/ProcessorPlayerResurrect.hpp
7 years ago
6c4bb8c423
[Client] Move resurrection code for local player to LocalPlayer
7 years ago
29ba07fe8c
[General] Rework PacketPlayerInventory
...
Save the Action for each item. Now you can add or remove multiple items
7 years ago
c4949ac5d9
[General] Change regular enums to enum class
7 years ago
5777759aae
[General] Change enum QuickKey::QUICKKEY_TYPE to enum class
7 years ago
09958681cd
Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try
7 years ago
cac2c6c1e8
Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts
7 years ago
535fba0cb3
[Client] Finish drag and drops when arrested or teleported by server
7 years ago
cd03d59056
[Client] Fix invalid read (memcheck warning)
7 years ago
6668b9ab42
[General] Implement ConsoleCommand packet
7 years ago
926106cf8c
[General] Rework CharGen slightly for clarity purposes
...
Previously, charGenStage.end was doing double duty as both the variable indicating the number of CharGen stages and – when set to 0 – the variable indicating that CharGen was over. The latter role is now filled by a new boolean.
7 years ago
be25decee2
[General] Implement PlayerSpeech packet
7 years ago
413893aa51
[General] Implement PlayerAnimPlay packet
7 years ago
50d5fffb7f
[General] Add and implement PlayerQuickKeys packet
7 years ago
711c4d83da
[Client] Fix build after recent OpenMW changes to GUI
7 years ago
43a3daf0aa
[General] Add & implement PlayerShapeshift packet for werewolf states
8 years ago
e36c0afc59
[General] Send faction reputation via PlayerFaction packets
8 years ago
1d504a665f
[General] Add RANK, EXPULSION and BOTH actions to PlayerFaction packets
8 years ago
71313c5aa6
[General] Implement PlayerMap packet, part 1
8 years ago
813a3c89c4
[General] Implement PlayerBook packet to track skill books read
8 years ago
70d9374a6a
[General] Implement PlayerKillCount packets
8 years ago
11369f6513
[General] Implement sending and reading of PlayerTopic packets
8 years ago
e6983993c2
[General] Implement sending and reading of PlayerFaction packets
8 years ago
7b07d6651f
[General] Add and use PlayerBounty packet and matching script functions
8 years ago
2e8714afaa
[Client] Rethink and restructure tes3mp combat code so it works for NPCs
8 years ago
a6111b6599
[Client] Add PlayerProcessor & WorldProcessor
8 years ago
678edffb5a
[Client] Rename updateDynamicStats() into updateStatsDynamic()
8 years ago
e7960eee76
[General] Rename DrawState packets into AnimFlags ones for clarity
8 years ago
60d6a6d463
[Client] See when other players remove items from containers
8 years ago
c1427b2558
[General] Simultaneously send loads & unloads in ID_PLAYER_CELL_STATE
8 years ago
b5b5551fcd
[Client] Add LocalPlayer::hasFinishedCharGen() method
8 years ago
97aabf4a7d
[General] Sketch out sending of cell loading/unloading info in packets
8 years ago
David Cernat
Koncord