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-tes3coop/apps/openmw
David Cernat 502751cae0 Merge pull request #413 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp
	components/openmw-mp/Base/BasePlayer.hpp
	components/openmw-mp/Packets/Player/PacketPlayerEquipment.hpp
	components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp
7 years ago
..
mwbase Merge pull request #400 from OpenMW/master while resolving conflicts 7 years ago
mwclass [General] Add sync for ranged weapon & projectile strike enchantments 7 years ago
mwdialogue Merge pull request #389 from OpenMW/master 7 years ago
mwgui Merge pull request #413 from TES3MP/0.6.3 while resolving conflicts 7 years ago
mwinput Merge pull request #400 from OpenMW/master while resolving conflicts 7 years ago
mwmechanics Merge pull request #413 from TES3MP/0.6.3 while resolving conflicts 7 years ago
mwmp Merge pull request #413 from TES3MP/0.6.3 while resolving conflicts 7 years ago
mwphysics Merge pull request #395 from OpenMW/master while resolving conflicts 7 years ago
mwrender Merge pull request #1473 7 years ago
mwscript Merge pull request #412 from OpenMW/master while resolving conflicts 7 years ago
mwsound Merge pull request #1686 7 years ago
mwstate [Fix] Some PVS-Studio and cppcheck fixes 7 years ago
mwworld Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts 7 years ago
CMakeLists.txt Merge pull request #406 from TES3MP/0.6.3 while resolving conflicts 7 years ago
android_commandLine.cpp
android_commandLine.h
android_main.c android: Update for sdl 2.0.8 7 years ago
crashcatcher.cpp
doc.hpp
engine.cpp Merge pull request #370 from TES3MP/0.6.2 7 years ago
engine.hpp Don't increase simulationTime while the game is minimized (Fixes #4211) 7 years ago
main.cpp Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts 7 years ago