mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 15:53:51 +00:00
Code Issues Releases Wiki Activity
openmw-tes3mp/apps/openmw
History
David Cernat d58efde3f1 Merge pull request #410 from TES3MP/0.6.3 while resolving conflicts 
Conflicts:
	apps/openmw-mp/Script/Functions/Actors.cpp
	apps/openmw-mp/Script/Functions/Chat.cpp
	apps/openmw-mp/Script/Functions/GUI.hpp
	apps/openmw-mp/Script/Functions/Items.cpp
	apps/openmw-mp/Script/Functions/Stats.cpp
	apps/openmw-mp/Script/Functions/Stats.hpp
	apps/openmw-mp/Script/ScriptFunctions.cpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
	apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp
	apps/openmw/mwmp/Cell.cpp
	apps/openmw/mwmp/DedicatedActor.cpp
	apps/openmw/mwmp/DedicatedPlayer.cpp
	apps/openmw/mwmp/LocalActor.cpp
	apps/openmw/mwmp/LocalPlayer.cpp
	apps/openmw/mwmp/LocalPlayer.hpp
	apps/openmw/mwmp/Main.cpp
	components/openmw-mp/Base/BaseActor.hpp
	components/openmw-mp/Base/BasePlayer.hpp
	components/openmw-mp/Packets/Player/PacketPlayerAttribute.cpp
	components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp
2018-04-21 16:55:05 +03:00
..
mwbase Merge pull request #400 from OpenMW/master while resolving conflicts 2018-04-03 01:25:17 +03:00
mwclass [General] Add sync for ranged weapon & projectile strike enchantments 2018-04-03 14:12:27 +03:00
mwdialogue Merge pull request #389 from OpenMW/master 2018-02-25 22:05:32 +02:00
mwgui Merge pull request #410 from TES3MP/0.6.3 while resolving conflicts 2018-04-21 16:55:05 +03:00
mwinput Merge pull request #400 from OpenMW/master while resolving conflicts 2018-04-03 01:25:17 +03:00
mwmechanics Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts 2018-04-18 18:29:00 +03:00
mwmp Merge pull request #410 from TES3MP/0.6.3 while resolving conflicts 2018-04-21 16:55:05 +03:00
mwphysics Merge pull request #395 from OpenMW/master while resolving conflicts 2018-03-29 07:28:30 +03:00
mwrender Merge pull request #1473 2018-04-09 20:23:43 +00:00
mwscript Merge pull request #408 from OpenMW/master 2018-04-18 18:05:09 +03:00
mwsound http to https for supported urls (#1625) 2018-03-08 21:23:24 +01:00
mwstate [Fix] Some PVS-Studio and cppcheck fixes 2018-04-18 12:36:10 +00:00
mwworld Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts 2018-04-18 18:29:00 +03:00
android_commandLine.cpp Fix tab indentations in apps/ and components/ 2015-09-16 20:45:37 +02:00
android_commandLine.h Remove empty line at the beginning of files 2015-08-18 23:06:12 +02:00
android_main.c android: Update for sdl 2.0.8 2018-03-30 12:44:38 -04:00
CMakeLists.txt Merge pull request #406 from TES3MP/0.6.3 while resolving conflicts 2018-04-13 18:05:38 +03:00
crashcatcher.cpp crashcatcher: complain when launching gdb fails 2017-02-23 23:28:49 +01:00
doc.hpp Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
engine.cpp Merge pull request #370 from TES3MP/0.6.2 2018-01-10 03:51:07 +02:00
engine.hpp Don't increase simulationTime while the game is minimized (Fixes #4211) 2017-11-16 18:48:49 +00:00
main.cpp Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts 2018-01-29 02:57:48 +02:00