mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-06-30 04:21:34 +00:00
Code Issues Releases Wiki Activity
25245 commits 38 branches 54 tags 122 MiB
Commit graph

25245 commits

This branch
This branch
All branches
Author SHA1 Message Date
Capostrophic
7155e787b4 Clean up fallback record creation 2018-12-28 01:22:24 +03:00
Bret Curtis
807e0311b9
Merge pull request #2102 from nikolaykasyanov/macos-cmake-check 
[macOS] Fail CMake when trying to use CMake 3.13 for macOS packaging
 2018-12-26 22:14:13 +01:00
Nikolay Kasyanov
2306d904c7 [macOS] Fail CMake when trying to use CMake 3.13 for macOS packaging 2018-12-26 17:00:17 +01:00
David Cernat
343dd8b5ea [Client] Fix addition of items to player inventories 
Previously, multiple stacks of the same item ID could overwrite data in each other because of how the logic in ContainerStore::add() works. For example, a stack of 5 grand soul gems with no souls would get added to the player, then the attempt to add a grand soul gem with a particular soul would retrieve the previous stack first before setting all of it to that soul, resulting in 6 grand soul gems with that soul.
 2018-12-26 13:41:19 +02:00
David Cernat
76ac905efc [Client] Send PlayerInventory packets when trapping souls in soulgems 2018-12-26 12:25:00 +02:00
David Cernat
f853368641 [Client] Fix loss of player items in ContainerStore::unstack() 
Previously, unstacking items for a player led to a PlayerInventory packet being sent about the items' removal.

This change makes it so both a packet about their re-addition and their removal are sent instead, cancelling each other out, which is inelegant, but arguably preferable to complicating the sending of PlayerInventory packets again.
 2018-12-26 12:24:26 +02:00
Bret Curtis
f18f2d39e5
Merge pull request #2096 from xyzz/android-relative-mouse 
android: Add a method so that we can send relative mouse movements from java.
 2018-12-26 10:41:35 +01:00
Nikolay Kasyanov
956934911a [macOS, CI] Use CMake 3.12.4 
See https://gitlab.com/OpenMW/openmw/issues/4767 for details.
 2018-12-26 10:17:32 +01:00
Ilya Zhuravlev
1bdec2399f Make sure CopyFramebufferToTextureCallback is only called once and not every frame 2018-12-25 11:56:24 -05:00
Ilya Zhuravlev
07e9ce84b3 Replace volatile bools with std::atomic<bool> 2018-12-24 14:19:35 -05:00
Ilya Zhuravlev
8e7c01b561 loadingscreen: Fix UaF in loading screen. 
When the CopyFramebufferToTextureCallback callback is called, in its operator() it resets setInitialDrawCallback by providing a NULL pointer.
However, this causes the callback to get deleted. In turn, the "this" pointer is invalidated.
When execution returns to DrawCallback::run, it accesses a _nestedCallback member of deleted "this" which is UB.
 2018-12-24 14:18:26 -05:00
Ilya Zhuravlev
98b2c04404 android: Add a method so that we can send relative mouse movements from java. 2018-12-23 15:14:29 -05:00
Bret Curtis
a037e4c954
Merge pull request #2090 from xyzz/nulls-in-c 
android_main.c: Replace nullptr back to NULL since there are no nullptr in C
 2018-12-23 19:38:12 +01:00
Capostrophic
793c2a19d2 Cherry-pick cc9cii's editor improvements 2018-12-23 20:10:16 +03:00
Capostrophic
0bbcc0e787 Avoid falling height reset if onGround state didn't change (bug #4411) 2018-12-23 13:39:35 +03:00
Ilya Zhuravlev
09585b7208 android_main.c: Replace nullptr back to NULL since there are no nullptr in C 2018-12-22 22:21:26 -05:00
Bret Curtis
8e113a32b2
Merge pull request #2081 from nikolaykasyanov/unneed-macos-files 
Remove unnecessary Recastnavigation headers & static libs from macOS package
 2018-12-21 17:47:15 +01:00
Andrei Kortunov
8687a49c19 Editor: Added basic info window 2018-12-21 18:51:02 +04:00
Andrei Kortunov
b4f3ce2a0a Editor: Implement faction ranks table (feature #4209) 2018-12-21 14:16:40 +04:00
Bret Curtis
d4e56b73ae
Merge pull request #2086 from Capostrophic/aidata 
Editor: avoid overflows in certain fields (bug #2987)
 2018-12-21 11:05:42 +01:00
Bret Curtis
d3ed3c2b0d
Merge pull request #2087 from nikolaykasyanov/update-macos-deps 
Update macOS dependencies, use Xcode 10.1
 2018-12-21 11:02:40 +01:00
Nikolay Kasyanov
e0161bb2bf Update macOS dependencies, use Xcode 10.1 2018-12-20 22:36:06 +01:00
Nikolay Kasyanov
c3a2a2d73f Do not package Recastnavigation headers and static libs 2018-12-20 21:18:41 +01:00
Nikolay Kasyanov
f98a454ec1 Add a script to verify macOS package contents 2018-12-20 21:18:41 +01:00
Capostrophic
2681435857 Editor: handle AI settings, regional sound and levelled list "none" chances as shorts (bug #2987) 2018-12-20 19:51:55 +03:00
AnyOldName3
199e6ed82d Revert "Use forward declaration to reduce build times." 
This reverts commit 305b9826df.
 2018-12-19 23:53:14 +00:00
AnyOldName3
305b9826df Use forward declaration to reduce build times. 2018-12-19 16:23:32 +00:00
Alexander Kolodeev
7c3ef213ce Fix error when create new OpenCS addon 2018-12-19 18:47:02 +03:00
AnyOldName3
7b108ae9a2 Disable depth sorting for translucent objects in the shadow maps 2018-12-19 01:45:05 +00:00
Chris Djali
0f9f7f0b59
Merge pull request #2083 from AnyOldName3/fix-vao-rig-bug 
Fix animation bug with VAOs
 2018-12-19 00:54:52 +00:00
AnyOldName3
e2515f6db7 Merge branch 'master' into osgshadow-test-vdsm 2018-12-18 19:51:27 +00:00
AnyOldName3
53188f61fc Fix animation bug with VAOs 2018-12-18 19:44:30 +00:00
Chris Djali
066b74eb43
Merge pull request #2078 from AnyOldName3/cmake-13.1-osg-lib-fix 
Adapt to CMake 3.13's new meaning of OSGDB_LIBRARY
 2018-12-18 19:23:44 +00:00
AnyOldName3
a58a8db030 Uncomment commented lines 2018-12-18 18:42:20 +00:00
Bret Curtis
922f696aaf bump bullet version for gitlab-ci 2018-12-17 16:52:49 +01:00
Bret Curtis
44a408635a wrap git command in gitfound 2018-12-17 16:30:12 +01:00
David Cernat
5e38e8abdb [Server] Add GetArchitectureType() script function 
Additionally, bring GetOperatingSystem() up-to-date by making it use the renamed function in Utils.
 2018-12-17 11:55:50 +02:00
David Cernat
9fe54aa8c6 [General] Add getArchitectureType() to multiplayer Utils 
Additionally, rename getOperatingSystem() into getOperatingSystemType() for clarity.
 2018-12-17 11:46:51 +02:00
David Cernat
fa1700e2ab [Server] Add GetOperatingSystemType() script function 2018-12-17 11:32:31 +02:00
Bret Curtis
6d7aacab5e
Merge pull request #2053 from akortunov/animatedContainers 
Native animated containers support
 2018-12-17 10:00:07 +01:00
David Cernat
da6b89c185 [General] Add getOperatingSystem() to multiplayer Utils 2018-12-17 10:47:34 +02:00
Bret Curtis
d2c88f0983
Merge pull request #2071 from Capostrophic/sneaking 
Don't interrupt sneak and swim idles in attack ready state in first person view (bug #4750)
 2018-12-17 09:34:27 +01:00
David Cernat
50714599d9 [Client] Spawn at exterior 0, -7 by default 2018-12-17 08:25:22 +02:00
Bret Curtis
76d380e852 if unable to run git at this moment, use empty string 2018-12-16 20:58:14 +01:00
Bret Curtis
81fdecc48c
Merge pull request #2073 from OpenMW/appdata_template_and_fixes 
various fixes
 2018-12-14 15:43:39 +01:00
AnyOldName3
dcbca4b90b Use if(EXISTS ${OSGDB_LIB} AND NOT IS_DIRECTORY ${OSGDB_LIB}) 2018-12-14 14:30:56 +00:00
Bret Curtis
6ef974f4eb
Merge pull request #2079 from OpenMW/revert-2054-master 
Revert "fix a rig bug visible with OSG_VERTEX_BUFFER_HINT=VAO"
 2018-12-14 10:08:14 +01:00
Andrei Kortunov
a53333c3d5 Native animated containers support (feature #4730) 2018-12-13 23:11:16 +04:00
Bret Curtis
fc19c842cf
Revert "fix a rig bug visible with OSG_VERTEX_BUFFER_HINT=VAO" 2018-12-13 20:09:46 +01:00
Bret Curtis
708a4f85ce
Merge pull request #2077 from terabyte25/patch-14 
Sanity check for text input in toggleWalking
 2018-12-13 14:29:41 +01:00