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
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
Alexander Kolodeev
7c3ef213ce
Fix error when create new OpenCS addon
2018-12-19 18:47:02 +03: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
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
Bret Curtis
6d7aacab5e
Merge pull request #2053 from akortunov/animatedContainers
...
Native animated containers support
2018-12-17 10:00:07 +01: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
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
AnyOldName3
9067731a96
Adapt to CMake 3.13's new meaning of OSGDB_LIBRARY (i.e. that it can now be a list) while allowing for the possibility that the found libraries may be in different directories when debug and optimised versions exist.
2018-12-13 02:08:35 +00:00
terrabyte25
c31fa3074e
Sanity check for text input in toggleWalking
2018-12-12 14:40:15 -06:00
Bret Curtis
97aa6f58e3
Merge pull request #2064 from sthalik/pr/win32-debug-parent-console
...
enable win32 debug console when launching from console
2018-12-12 21:15:07 +01:00
Bret Curtis
f4c863a730
Update graphicspage.cpp
2018-12-12 16:19:07 +01:00
Bret Curtis
83e346e1e6
add new bugtracker
2018-12-12 16:18:49 +01:00
Bret Curtis
b8b1a52216
add commit date; revert boost as we are not breaking anything yet
2018-12-12 10:27:09 +01:00
Stanislaw Halik
c5c160870d
fix accidental header namespace inclusion
2018-12-12 00:48:27 +01:00
Stanislaw Halik
f6c8842457
move to debugging.[ch]pp
2018-12-12 00:41:53 +01:00
Stanislaw Halik
74955555b9
remove verbose comments and example
2018-12-12 00:02:09 +01:00
Bret Curtis
6596c400f3
indentation
2018-12-11 21:34:11 +01:00
Bret Curtis
fc10adb608
makes openmw.appdata.xml a template that accepts @OPENMW_VERSION@ so we do not have to update it all the time; fix deprecated warning for boost header; un-ignore openmw.appdata.xml
2018-12-11 21:30:37 +01:00
Bret Curtis
401ccedb36
Merge pull request #2072 from elsid/navmesh_tiles_cache_item_fix
...
Navmesh tiles cache item fix (bug #4751 )
2018-12-11 09:53:52 +01:00
elsid
da431135fa
Use pointer to check is NavMeshTilesCache::Value initialized
2018-12-10 23:51:15 +03:00
elsid
aab7f2e8b9
Don't check for equality in move assignment
...
Assume it is undefined behavior to move-assing value to itself.
2018-12-10 23:45:31 +03:00
Capostrophic
6083e5ed4b
Don't interrupt sneak and swim idles in first person view (bug #4750 )
2018-12-10 00:05:06 +03:00
Stanislaw Halik
56d79bd4e0
fix typo
2018-12-08 20:58:10 +01:00
