1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:53:51 +00:00
openmw-tes3mp/apps/openmw-mp
David Cernat d5b3d08ec9 Merge pull request #452 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Script/Functions/Worldstate.cpp
	apps/openmw/mwmp/Worldstate.cpp
	components/openmw-mp/Base/BaseWorldstate.hpp
2018-06-25 04:44:30 +03:00
..
processors Merge pull request #451 from TES3MP/0.6.3 while resolving conflicts 2018-06-21 22:31:10 +03:00
Script [General] Limit maximum imageData size in WorldMap packets 2018-06-23 02:33:34 +03:00
stackwalker Get rid of tab 2018-05-20 15:02:04 -05:00
Actors.cpp [Server] Fix variable name for actor table 2018-06-04 16:11:37 +03:00
Actors.hpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 18:01:01 +03:00
BaseMgr.cpp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 2018-06-07 23:23:19 +03:00
BaseMgr.hpp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 2018-06-07 23:23:19 +03:00
Books.cpp [Server] Use consistent code style and make all files end in newlines 2018-06-05 09:40:47 +03:00
Books.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Cell.cpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
Cell.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
CellController.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
CellController.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03: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 Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 2018-06-07 23:23:19 +03: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] Rework PacketPlayerFaction 2018-01-20 19:45:24 +08:00
Factions.hpp [General] Rework PacketPlayerFaction 2018-01-20 19:45:24 +08:00
GUI.cpp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 2018-06-07 23:23:19 +03:00
GUI.hpp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 2018-06-07 23:23:19 +03:00
Inventory.cpp [Server] Use consistent code style and make all files end in newlines 2018-06-05 09:40:47 +03:00
Inventory.hpp [General] Rework PacketPlayerInventory 2018-01-20 18:40:23 +08:00
main.cpp Merge pull request #451 from TES3MP/0.6.3 while resolving conflicts 2018-06-21 22:31:10 +03: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] Use consistent code style and make all files end in newlines 2018-06-05 09:40:47 +03:00
NetActor.hpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 18:01:01 +03:00
Networking.cpp Merge pull request #451 from TES3MP/0.6.3 while resolving conflicts 2018-06-21 22:31:10 +03:00
Networking.hpp [Server] Create Worldstate class and implement associated table 2018-06-04 18:51:17 +03:00
Object.cpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
Object.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
Player.cpp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 2018-06-07 23:23:19 +03:00
Player.hpp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 2018-06-07 23:23:19 +03:00
Players.cpp [Server] Use consistent code style and make all files end in newlines 2018-06-05 09:40:47 +03:00
Players.hpp [Server] Use regular Ptrs where possible to avoid seizure Ptrs by lua 2018-02-16 05:12:01 +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 Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 2018-03-30 09:32:43 +03:00
Settings.hpp Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 2018-03-30 09:32:43 +03: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 Fix travis build on master 2018-05-20 14:26:25 -05:00
stacktrace.hpp [Server] Add stacktrace 2017-10-25 14:45:36 +08:00
Timer.cpp [Server] Use consistent code style and make all files end in newlines 2018-06-05 09:40:47 +03:00
Timer.hpp [Server] Fix iterating killed timers when kill() called in the callback 2018-01-08 12:24:36 +08:00
Utils.cpp [Server] Add PreReading virtual method 2018-03-05 15:15:39 +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
Worldstate.cpp Merge pull request #452 from TES3MP/0.6.3 while resolving conflicts 2018-06-25 04:44:30 +03:00
Worldstate.hpp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 2018-06-07 23:23:19 +03:00