David Cernat
|
3d5860d6f4
|
Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
apps/openmw-mp/Player.cpp
apps/openmw-mp/Script/Functions/Settings.cpp
apps/openmw-mp/Script/Functions/Settings.hpp
apps/openmw-mp/Script/Functions/World.cpp
apps/openmw-mp/Script/Functions/World.hpp
apps/openmw/mwgui/container.cpp
apps/openmw/mwmp/LocalActor.cpp
apps/openmw/mwmp/LocalPlayer.cpp
apps/openmw/mwmp/WorldEvent.cpp
apps/openmw/mwmp/processors/world/ProcessorContainer.hpp
components/openmw-mp/Base/BaseEvent.hpp
components/openmw-mp/Log.cpp
components/openmw-mp/Log.hpp
|
2018-03-30 09:32:43 +03:00 |
|
David Cernat
|
a3a341fee6
|
[Server] Reimplement 4ebfcc4a21 for 0.6
|
2018-03-10 22:19:44 +02:00 |
|
Koncord
|
7748e582a8
|
[Client] Mark derived processor classes as final
|
2017-12-09 10:18:17 +08:00 |
|
Koncord
|
587b53bfed
|
[Client] Reorder files
|
2017-06-07 00:06:10 +08:00 |
|
Koncord
|
f09dc2b65b
|
[Client] Add player processors
|
2017-04-18 11:38:40 +08:00 |
|