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-tes3mp/apps/openmw-mp/Script
David Cernat 176aa62b15 Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Script/Functions/Cells.cpp
	apps/openmw-mp/Script/Functions/Cells.hpp
	apps/openmw-mp/Script/Functions/Worldstate.cpp
	apps/openmw-mp/Script/Functions/Worldstate.hpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
	apps/openmw-mp/processors/player/ProcessorPlayerMap.hpp
	apps/openmw/mwmp/processors/player/ProcessorPlayerMap.hpp
	components/openmw-mp/Base/BasePlayer.hpp
	components/openmw-mp/Packets/Player/PacketPlayerMap.hpp
	components/openmw-mp/Packets/Worldstate/PacketWorldMap.cpp
7 years ago
..
CommandController.cpp [Server] Use std::move(tokens) 7 years ago
CommandController.hpp [Server] Use consistent code style and make all files end in newlines 7 years ago
EventController.cpp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 7 years ago
EventController.hpp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 7 years ago
LuaState.cpp [Server] Create Worldstate class and implement associated table 7 years ago
LuaState.hpp [Server] Clean up method and variable names 7 years ago
luaUtils.cpp [Server] Add sandboxed import() function 7 years ago
luaUtils.hpp [General] Modernize Script API 7 years ago