Commit Graph

354 Commits (6cb5ac6e63fb9bf6b27e827a227161f6dbc82f0a)

Author SHA1 Message Date
David Cernat 6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
6 years ago
Doc West 467989cdd5 Moved crashcatcher to a component and also use it in CS
Reworked debugger detection (failed on gdb 7.11), it now uses /proc to detect the debugger
6 years ago
David Cernat a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	README.md
#	apps/openmw/mwgui/quickkeysmenu.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/combat.cpp
6 years ago
Miloslav Číž c3d7ee5a9e Resolve merge conflicts 6 years ago
Miloslav Číž db8aaa74d6 Start cell border debug drawing 6 years ago
David Cernat 72862dc255 [General] Turn PlayerMap into WorldMap, now a Worldstate packet 6 years ago
David Cernat c24157f6f9 [General] Fix CMakeLists in components for BaseObject 6 years ago
David Cernat 416ee77639 [General] Add placeholder for WorldCollisionOverride packet 6 years ago
David Cernat 0be6de6607 [General] Turn RecordDynamic into a Worldstate packet 6 years ago
David Cernat da66face25 [General] Rename GameTime packet into WorldTime 6 years ago
David Cernat 5af1150ab2 [General] Turn GameTime into a Worldstate packet 6 years ago
David Cernat 43a944ddaf [General] Add and implement new Worldstate packet type 6 years ago
David Cernat 78234f9071 [General] Rename Event into ObjectList & WorldObject into BaseObject 6 years ago
David Cernat 6bf3a0be1e [General] Rename WorldPackets into ObjectPackets for clarity 6 years ago
David Cernat 9e5ddeac50
Merge pull request #408 from OpenMW/master
Add OpenMW commits up to 18 Apr 2018
6 years ago
Andreas Sturmlechner 2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) 6 years ago
David Cernat 365f485e8d Merge pull request #397 from OpenMW/master while resolving conflicts
Conflicts:
	components/CMakeLists.txt
6 years ago
bret curtis 4890ecd357 remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb 6 years ago
David Cernat 3d80e2db62 [General] Add placeholders for new packet types, part 2 6 years ago
David Cernat 02af7f6ba1 [General] Add placeholders for new packet types 6 years ago
David Cernat cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 6 years ago
David Cernat 37304655da Merge pull request #326 from OpenMW/master
Add OpenMW commits up to 25 Oct 2017
7 years ago
David Cernat 50d5fffb7f [General] Add and implement PlayerQuickKeys packet 7 years ago
AnyOldName3 c1a871ff1f Make indentation consistent. 7 years ago
AnyOldName3 daf7d8451c Switch to a more reliable method of passing the git-version targt the data it needs 7 years ago
AnyOldName3 e3142b9643 Add missing variables to those forwarded to the git-version target 7 years ago
David Cernat e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
AnyOldName3 c9e86a8ebc Remove superfluous argument 7 years ago
AnyOldName3 f9a3562ccd Remove duplicate macro definition and fix warning 7 years ago
AnyOldName3 2652a89df4 Fix mismatched indentation that apparently the .editorconfig file doesn't handle automatically 7 years ago
AnyOldName3 f8fe992dc0 Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files 7 years ago
David Cernat b64f379949 Merge pull request #286 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/actors.hpp
7 years ago
scrawl 5d524a6a10 Add custom version of MorphGeometry replacing osgAnimation
Double buffering, custom bounding box and the update in the cull visitor (instead of update) are now all handled internally rather than needing hacks and/or callbacks.
7 years ago
David Cernat 43a3daf0aa [General] Add & implement PlayerShapeshift packet for werewolf states 7 years ago
David Cernat 3529f9b090 [General] Add placeholders for PlayerJail, ObjectState & ConsoleCommand 7 years ago
David Cernat ebf7740969 [General] Repurpose GameConsole packet as GameSettings & add difficulty to it 7 years ago
David Cernat 70d9374a6a [General] Implement PlayerKillCount packets 7 years ago
David Cernat 27148ce9eb [General] Add placeholders for 12 new packets, to be implemented soon
Additionally, make it slightly clearer who created which previously existing packets.
7 years ago
Koncord 056ec2d434 [General] Fix CMake errors 7 years ago
David Cernat 08de349133 [General] Add placeholders for PlayerTopic & ObjectTrap packets 7 years ago
David Cernat 870fd9a78b [General] Remove ObjectUnlock packet, use ObjectLock with 0 lock instead 7 years ago
David Cernat ad388c7e12 [General] Add placeholders for ActorEquipment & PlayerFaction packets
Also reorder packets and packet processors.
7 years ago
David Cernat 7b07d6651f [General] Add and use PlayerBounty packet and matching script functions 7 years ago
Koncord c35d5a2c6c [Master] Implement Master server 7 years ago
Koncord 4c939f6d0a [General] Split tes3mp components in CMakeLists by group 7 years ago
David Cernat 00aa8839d4 [General] Update CMakeLists in components folder 7 years ago
David Cernat ca8fd1aa72 [General] Remove ActorHeadRotation packet because it would be too spammy 7 years ago
David Cernat e7960eee76 [General] Rename DrawState packets into AnimFlags ones for clarity 7 years ago
David Cernat 0d196af685 [General] Add placeholders for 7 new ActorPackets 7 years ago
David Cernat 742d6f653a [General] Add ActorPosition packet 7 years ago