You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3coop/apps/openmw-mp
David Cernat 3f7e163c92 Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/CMakeLists.txt
	apps/openmw-mp/Script/Functions/GUI.cpp
	apps/openmw-mp/Script/Functions/GUI.hpp
	apps/openmw-mp/Script/Functions/Worldstate.cpp
	apps/openmw-mp/Script/Functions/Worldstate.hpp
	apps/openmw-mp/processors/worldstate/ProcessorRecordDynamic.hpp
	apps/openmw/mwmp/processors/worldstate/ProcessorRecordDynamic.hpp
	components/CMakeLists.txt
	components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
7 years ago
..
Script Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts 7 years ago
processors Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts 7 years ago
stackwalker [Server] Add StackWalker for Windows 7 years ago
Actors.cpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Actors.hpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 7 years ago
BaseMgr.cpp [Server] Iterate only through updated players on each frame 7 years ago
BaseMgr.hpp [Server] Iterate only through updated players on each frame 7 years ago
Books.cpp [Server] Iterate only through updated players on each frame 7 years ago
Books.hpp [Server] Iterate only through updated players on each frame 7 years ago
CMakeLists.txt Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Cell.cpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Cell.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 7 years ago
CellController.cpp [General] Change regular enums to enum class 7 years ago
CellController.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 7 years ago
CellState.cpp [General] Change regular enums to enum class 7 years ago
CellState.hpp [General] Change regular enums to enum class 7 years ago
Cells.cpp [Server] Iterate only through updated players on each frame 7 years ago
Cells.hpp [Server] Iterate only through updated players on each frame 7 years ago
CharClass.cpp [Server] Iterate only through updated players on each frame 7 years ago
CharClass.hpp [Server] Iterate only through updated players on each frame 7 years ago
Dialogue.cpp [Server] Iterate only through updated players on each frame 7 years ago
Dialogue.hpp [Server] Iterate only through updated players on each frame 7 years ago
Factions.cpp [General] Rework PacketPlayerFaction 7 years ago
Factions.hpp [General] Rework PacketPlayerFaction 7 years ago
GUI.cpp Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts 7 years ago
GUI.hpp Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Inventory.cpp [General] Rework PacketPlayerInventory 7 years ago
Inventory.hpp [General] Rework PacketPlayerInventory 7 years ago
MasterClient.cpp [Server] Clean up method and variable names 7 years ago
MasterClient.hpp [Server] Clean up method and variable names 7 years ago
NetActor.cpp Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts 7 years ago
NetActor.hpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Networking.cpp Merge pull request #434 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Networking.hpp Merge pull request #430 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Object.cpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Object.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Player.cpp Merge pull request #418 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Player.hpp Merge pull request #418 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Players.cpp [Server] Use regular Ptrs where possible to avoid seizure Ptrs by lua 7 years ago
Players.hpp [Server] Use regular Ptrs where possible to avoid seizure Ptrs by lua 7 years ago
Quests.cpp [General] Change regular enums to enum class 7 years ago
Quests.hpp [General] Change regular enums to enum class 7 years ago
Settings.cpp Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Settings.hpp Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Spells.cpp [Server] Iterate only through updated players on each frame 7 years ago
Spells.hpp [Server] Iterate only through updated players on each frame 7 years ago
Timer.cpp [Server] Fix uninitialized variable 7 years ago
Timer.hpp [Server] Fix iterating killed timers when kill() called in the callback 7 years ago
Utils.cpp [Server] Add PreReading virtual method 7 years ago
Utils.hpp [Server] Make argument const reference 7 years ago
Weather.cpp [Server] Iterate only through updated players on each frame 7 years ago
Weather.hpp [Server] Iterate only through updated players on each frame 7 years ago
Window.cpp [Server] Iterate only through updated players on each frame 7 years ago
Window.hpp [Server] Iterate only through updated players on each frame 7 years ago
main.cpp [Server] Fix warning "implicit fallthrough" 7 years ago
stacktrace.cpp [Server] Add StackWalker for Windows 7 years ago
stacktrace.hpp [Server] Add stacktrace 7 years ago