openmw-tes3coop/apps/openmw-mp
David Cernat b6a7377692 Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try
Conflicts:
	apps/openmw-mp/Networking.cpp
	apps/openmw-mp/Script/Functions/Miscellaneous.cpp
	apps/openmw-mp/Script/Functions/Miscellaneous.hpp
	apps/openmw/mwmp/GUI/GUIChat.cpp
2018-01-05 21:24:14 +02:00
..
processors [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Script Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-05 21:24:14 +02:00
stackwalker [Server] Add StackWalker for Windows 2017-10-27 05:27:07 +08:00
Actors.cpp [General] Change "enum ACTOR_ACTION" to "enum class Action" 2018-01-05 09:40:11 +08:00
Actors.hpp [General] Change type of refNumIndex & mpNum to unsigned 2017-12-10 09:20:13 +08:00
BaseMgr.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
BaseMgr.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Books.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Books.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Cell.cpp [General] Change type of refNumIndex & mpNum to unsigned 2017-12-10 09:20:13 +08:00
Cell.hpp [General] Change type of refNumIndex & mpNum to unsigned 2017-12-10 09:20:13 +08:00
CellController.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
CellController.hpp [Server] Optimize CellController 2017-12-09 11:44:56 +08:00
Cells.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Cells.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
CellState.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
CellState.hpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
CharClass.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
CharClass.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
CMakeLists.txt [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Dialogue.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Dialogue.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Factions.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Factions.hpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
GUI.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
GUI.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Inventory.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Inventory.hpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
main.cpp [Server] Fix warning "implicit fallthrough" 2017-12-06 13:30:39 +08:00
MasterClient.cpp [Server] Clean up method and variable names 2017-12-04 10:39:20 +02:00
MasterClient.hpp [Server] Clean up method and variable names 2017-12-04 10:39:20 +02:00
NetActor.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
NetActor.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Networking.cpp Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-05 21:24:14 +02:00
Networking.hpp Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-05 21:24:14 +02:00
Object.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Object.hpp Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-01 12:04:25 +02:00
Player.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Player.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Players.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Players.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Quests.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Quests.hpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Settings.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Settings.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Spells.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Spells.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
stacktrace.cpp [Server] Add StackWalker for Windows 2017-10-27 05:27:07 +08:00
stacktrace.hpp [Server] Add stacktrace 2017-10-25 14:45:36 +08:00
Timer.cpp [Server] Change signature of TimerController::kill, validate callback 2018-01-02 08:17:26 +08:00
Timer.hpp [Server] Change signature of TimerController::kill, validate callback 2018-01-02 08:17:26 +08:00
Utils.cpp [Server] Make argument const reference 2017-12-10 11:46:50 +08:00
Utils.hpp [Server] Make argument const reference 2017-12-10 11:46:50 +08:00
Weather.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Weather.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Window.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Window.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00