Commit Graph

4014 Commits (a236ffc4be4e28a8bb619b6d6021db0ade6d8ea9)

Author SHA1 Message Date
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
7 years ago
Koncord 79903c455c [General] Allow different types for vectorContains 7 years ago
Koncord 1f4e6e9114 [General] Add integrity checks to Handshake packet 7 years ago
Koncord f9ff5f10df [General] Reduce packets size and add integrity checks 7 years ago
Koncord fa2bf0663e [General] Simplify vectorContains 7 years ago
Koncord c69819e0db [General] Change type of refNumIndex & mpNum to unsigned 7 years ago
Koncord 99158beb2e [General] Change effectCount type to unsigned 7 years ago
Koncord 895634cd16 [General] Change type of MpNum to "unsigned int" 7 years ago
Koncord 779f2a564d [General] Change "unsigned long" to uint32_t for cross platform compatibility 7 years ago
Koncord 23684489da [General] Fix clang-tidy warning
Converting integer literal to bool, use bool literal instead
7 years ago
Koncord 7639db02f3 [General] RW functions return true on success 7 years ago
Koncord 45c7c3a0b6 [General] Add integrity checks to PacketPreInit 7 years ago
Koncord d999cc0d55 [General] Add packetValid flag to packets 7 years ago
Koncord 695fb7d4a7 [General] Reorder RW(string) arguments
Change limit of default max string size to 64 KiB
7 years ago
Koncord d162f6fd3a [General] Explicitly use limitations of the master server 7 years ago
Koncord a48d5b48ef [General] Add maxSize parameter to RW(std::string)
Minor type changes
7 years ago
David Cernat bef53749ed [General] Replace BaseObject's hasMaster variable with isSummon
Additionally, add a GetObjectSummonState() script function to the server.
7 years ago
David Cernat 958b220835 [General] Send summon duration to server in ObjectSpawn packets 7 years ago
David Cernat 9102df7fde [General] Make WorldCollisionOverride also work with specific refIds
For now, this only makes it possible to enforce collision for specific refIds for placed objects.
7 years ago
David Cernat c7f10892a9 [General] Add vectorContains util for checking strings in vectors 7 years ago
David Cernat 7ffdb18bf9 [General] Implement ActorDeath packet, part 1
ActorDeath packets are sent for dead actors before their StatsDynamic packets. They contain the actor's deathReason in a manner similar to that of PlayerDeath packets.

A future commit will replace the deathReason with a variable named killer which will be an mwmp::Target.
7 years ago
David Cernat 914b79fcc9 [General] Make it possible to check which placed objects have containers 7 years ago
Andrei Kortunov 359e748c28 Initialize some missing fields in constructors 7 years ago
David Cernat d53bd05424 [General] Use slightly larger maximum imageData size in WorldMap packets 7 years ago
David Cernat 5bb2ba1e9e [General] Limit maximum imageData size in WorldMap packets 7 years ago
Bret Curtis 6655b7e512
Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set
7 years ago
Bret Curtis 3ebebdf3c1
Merge pull request #1751 from wareya/terrainbleeding
Fix #4452
7 years ago
Bret Curtis c1eb9042b3
Merge branch 'master' into terrainbleeding 7 years ago
Andrei Kortunov 5fd3ec1035 Implement unlockable locks with 'lock 0' console command 7 years ago
Nikolay Kasyanov 75d79e98b9 Force software decompression if OPENMW_DECOMPRESS_TEXTURES is set 7 years ago
Nikolay Kasyanov 359f87ab9f Change imageToSurface to return a unique_ptr to avoid manual surface cleanup 7 years ago
Miloslav Číž 2a23b53515 Merge branch 'drummyfish/openmw-toggleborders' 7 years ago
Miloslav Číž 477e1437d2 Resolve conflicts 7 years ago
Miloslav Číž 34f8eca7bd Fix indent 7 years ago
Miloslav Číž ab8de9fa14 Set node mask to cell borders 7 years ago
Miloslav Číž 414e6caafe Make tb work with distant terrain 7 years ago
Miloslav Číž f18d57429e Move cell border management to World 7 years ago
Miloslav Číž 1b8d500c07 Make tb command work again 7 years ago
Miloslav Číž 1fd5ad3e56 Use REAL_SIZE constant 7 years ago
Miloslav Číž d629c30fdb
Merge branch 'master' into screenshot360 7 years ago
Bret Curtis a747318c90
Merge branch 'master' into terrainbleeding 7 years ago
Marc Zinnschlag 48711bbdde Merged pull request #1592 7 years ago
Miloslav Číž c3d7ee5a9e Resolve merge conflicts 7 years ago
wareya 94f695cffc Fix #4452 and remove dead code 7 years ago
Miloslav Číž db8aaa74d6 Start cell border debug drawing 7 years ago
Nikolay Kasyanov 224b94c0ce Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 7 years ago
Marc Zinnschlag 565922f9ad naked expressions beginning with the member operator were allowed erroneously outside of the console (Fixes issue #2971) 7 years ago
Marc Zinnschlag 8d0f717e72 Merged pull request #1739 7 years ago
Marc Zinnschlag 90febde783 Merged pull request #1742 7 years ago
Marc Zinnschlag 816a1733dc Allow comma after Begin and End script instruction (Fixes #4451) 7 years ago