1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 19:49:54 +00:00
Commit graph

20874 commits

Author SHA1 Message Date
AnyOldName3
e2515f6db7 Merge branch 'master' into osgshadow-test-vdsm 2018-12-18 19:51:27 +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
AnyOldName3
b6b1b39804 Make the terrain paging system use the view point rather than the eye point to determine which nodes to use so that it can be inherited by RTT cameras. 2018-12-10 21:20:29 +00: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
AnyOldName3
2d5da1a6fa Don't exclusively rely on a shadow map if its bounds have been expanded since the cull traversal. 2018-12-08 20:39:41 +00:00
Stanislaw Halik
56d79bd4e0 fix typo 2018-12-08 20:58:10 +01:00
Stanislaw Halik
44e60b708b fix missing _WIN32 guard 2018-12-08 03:13:18 +01:00
Stanislaw Halik
64e960aa22 enable win32 debug console when launching from console 2018-12-08 01:29:14 +01:00
AnyOldName3
0d5876f4bb
Merge pull request #2063 from AnyOldName3/nmake
Add NMake support to the Windows prebuild script.
2018-12-07 16:11:24 +00:00
AnyOldName3
2a2d9f0006 Fix if statements 2018-12-07 15:03:36 +00:00
AnyOldName3
14fcb9158f Add NMake support to the Windows prebuild script. 2018-12-07 14:46:32 +00:00
Bret Curtis
79eab6c55f
Merge pull request #2062 from sthalik/pr/fix-msvc-build
fix missing include
2018-12-07 10:43:59 +01:00
Stanislaw Halik
59d96d808e fix missing include 2018-12-07 04:23:52 +01:00
Marc Zinnschlag
d791dcfbf3 Merged pull request #2051 2018-12-06 13:10:48 +01:00
Bret Curtis
5700394c18
Merge pull request #2057 from Capostrophic/colors
Display Ambient, Sunlight and Fog field values as colors (bug #4745)
2018-12-06 09:59:24 +01:00
Bret Curtis
32624cb3ed
Merge branch 'master' into colors 2018-12-06 09:59:13 +01:00
Bret Curtis
b296c4a3bb
Merge pull request #2058 from Capostrophic/collision
Don't consider non-solid actors truly levitating (bug #4746)
2018-12-06 09:56:16 +01:00
Capostrophic
7b33838b33 Don't consider non-solid actors truly levitating (bug #4746) 2018-12-05 23:37:32 +03:00
Bret Curtis
35ea8ecb0b
Merge pull request #2056 from Capostrophic/esmtool
esmtool cleanup
2018-12-05 20:58:25 +01:00
Capostrophic
7cae0017ac Display Ambient, Sunlight and Fog field values as colors (bug #4745) 2018-12-05 17:25:26 +03:00
Bret Curtis
45d7c005ad
Merge pull request #2055 from Capostrophic/regression
[Regression] Fix incorrect event argument which messed with hidden light pointers
2018-12-04 16:33:18 +01:00
Capostrophic
5c8c079718 Fix incorrect event argument which messed with hidden light pointers 2018-12-04 17:07:03 +03:00
AnyOldName3
244bd289cb Change default colour mode (as apparently it actually gets used sometimes) 2018-12-03 18:56:37 +00:00
Bret Curtis
393bd982c0
Merge pull request #2054 from mp3butcher/master
fix a rig bug visible with OSG_VERTEX_BUFFER_HINT=VAO
2018-12-03 09:24:23 +01:00