1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-28 18:45:33 +00:00
openmw-tes3mp/apps/openmw-mp
David Cernat a13cef9913 Merge branch '0.7.0reset' of https://github.com/uramer/openmw into 0.7.1
# Conflicts:
#	apps/openmw-mp/Script/Functions/Worldstate.cpp
#	apps/openmw-mp/Script/Functions/Worldstate.hpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwmp/CellController.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
2020-02-11 15:41:38 +02:00
..
processors [General] Include ScriptLocalFloat as part of ClientScriptLocal 2020-02-10 07:58:35 +02:00
Script Merge branch '0.7.0reset' of https://github.com/uramer/openmw into 0.7.1 2020-02-11 15:41:38 +02:00
Cell.cpp [General] Remove "created by" stamps added by IntelliJ 2019-08-26 12:33:28 +03:00
Cell.hpp [General] Remove "created by" stamps added by IntelliJ 2019-08-26 12:33:28 +03:00
CellController.cpp [General] Modernize packet style for PlayerCellState 2019-10-23 17:46:21 +03:00
CellController.hpp [Server] Remove unused function 2018-12-29 14:02:08 +08:00
CMakeLists.txt [General] Include ScriptLocalFloat as part of ClientScriptLocal 2020-02-10 07:58:35 +02:00
main.cpp [General] Ignore carriage returns in resources/version file 2019-12-03 13:21:10 +02:00
MasterClient.cpp [General] Remove "created by" stamps added by IntelliJ 2019-08-26 12:33:28 +03:00
MasterClient.hpp [General] Remove "created by" stamps added by IntelliJ 2019-08-26 12:33:28 +03:00
Networking.cpp Merge remote-tracking branch 'nalal/patch-1' into 0.7.1 2020-02-10 10:00:30 +02:00
Networking.hpp [General] Create SystemPacket category and move Handshake packet to it 2019-11-09 05:12:00 +02:00
Player.cpp [General] Remove "created by" stamps added by IntelliJ 2019-08-26 12:33:28 +03:00
Player.hpp [General] Remove "created by" stamps added by IntelliJ 2019-08-26 12:33:28 +03:00
Utils.cpp [Server] Turn GetArguments() from ScriptFunctions into Utils function 2019-02-24 01:43:04 +02:00
Utils.hpp [General] Rename Log class into TimedLog 2019-08-19 21:39:33 +03:00