krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
openmw-tes3coop/apps/openmw/mwmp
History
David Cernat a037193e79 Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts 
Conflicts:
	apps/openmw-mp/Script/Functions/Actors.cpp
	apps/openmw-mp/Script/Functions/Actors.hpp
	apps/openmw-mp/Script/Functions/Items.cpp
	apps/openmw-mp/Script/Functions/Items.hpp
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw-mp/Script/Functions/World.hpp
	apps/openmw/mwmp/WorldEvent.cpp
	components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp
	components/openmw-mp/Version.hpp
2018-01-18 13:40:13 +02:00
..
GUI Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-05 21:24:14 +02:00
processors [General] Change "enum ACTOR_ACTION" to "enum class Action" 2018-01-05 09:40:11 +08:00
ActorList.cpp [General] Change "enum ACTOR_ACTION" to "enum class Action" 2018-01-05 09:40:11 +08:00
ActorList.hpp [General] Modernize Script API 2017-08-28 00:15:56 +08:00
Cell.cpp Merge pull request #370 from TES3MP/0.6.2 2018-01-10 03:51:07 +02:00
Cell.hpp [Client] Fix warnings 2017-07-03 23:41:16 +08:00
CellController.cpp Merge pull request #370 from TES3MP/0.6.2 2018-01-10 03:51:07 +02:00
CellController.hpp Merge pull request #370 from TES3MP/0.6.2 2018-01-10 03:51:07 +02:00
DedicatedActor.cpp Fix build for gcc-5.4.0 2018-01-04 21:41:00 -05:00
DedicatedActor.hpp [Client] Fix problems with NPC equipment sync 2017-06-09 04:58:56 +03:00
DedicatedPlayer.cpp Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-01 12:04:25 +02:00
DedicatedPlayer.hpp Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-01 12:04:25 +02:00
GUIController.cpp Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-05 21:24:14 +02:00
GUIController.hpp [General] Introduce chat channels 2017-12-08 07:43:29 +08:00
LocalActor.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
LocalActor.hpp [Client] Use update timer in mwmp::Cell instead of LocalActor 2017-06-10 03:29:51 +03:00
LocalPlayer.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
LocalPlayer.hpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Main.cpp [Client] Share WeatherManager to the mwmp::Main class 2017-12-10 09:53:36 +08:00
Main.hpp [Client] Share WeatherManager to the mwmp::Main class 2017-12-10 09:53:36 +08:00
MechanicsHelper.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
MechanicsHelper.hpp [Client] Convert MechanicsHelper to namespace 2017-06-27 16:43:53 +08:00
Networking.cpp Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts 2018-01-18 13:40:13 +02:00
Networking.hpp [Client] Add network statistics (CTRL+F2) 2017-10-28 00:39:46 +08:00
PlayerList.cpp [General] Change NULL to nullptr 2017-06-27 22:49:28 +08:00
PlayerList.hpp [General] Introduce chat channels 2017-12-08 07:43:29 +08:00
WorldEvent.cpp Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts 2018-01-18 13:40:13 +02:00
WorldEvent.hpp Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-01 12:04:25 +02:00