AnyOldName3
02a8c6a7ce
Merge branch 'master' into pr/fix-hidpi-resolution
2018-11-08 23:05:07 +00:00
Bret Curtis
376599533b
Merge pull request #2000 from Capostrophic/prisonmarker
...
Add prison marker record fallback definition (bug #4701 )
2018-11-08 21:11:39 +01:00
Bret Curtis
228f6b572f
Merge branch 'master' into prisonmarker
2018-11-08 21:11:24 +01:00
Bret Curtis
f6243fae83
Merge pull request #1615 from akortunov/holstered_weapons
...
Weapon sheathing
2018-11-08 20:44:20 +01:00
Bret Curtis
9ae077c033
use c++11 std::align from <memory> ( #2026 )
...
* use c++11 std::align from <memory>
* for Ubuntu, use gcc5 instead of 4.8
* use travis to set gcc to 5
eval
and sudo
* use eval in .travis.yml
* use gcc-8
* replace precise with trusty llvm toolchain, because we have been using trusty for awhile now
* push things to matrix, so we can support multiple releases if we want
* we should not be allowing for failures, we are ready to start trusting clang and its analyzer
* scan-build was pushed to another package
* use gcc-8 still but wrap in scan-build
* travis.yml cleanup, have output of scripts go to stdout, make search for substring a regex
use double []
fix missing ,
use bash to use regex
black spaces matter
* set human readable names for our various builds, split out our static analysis between openmw and openmw-cs
* test if not set, then set otherwise ignore
* use quotes
* do not eval it, set it in travis env
* no more &&
* what does clang7 have to say?
* use sourceline for now
* use clang-7 instead of clang-7.0
* yes, llvm-toolchain-trusty-7 not llvm-toolchain-trusty-7.0
* for static analysis, openmw is compiled and checked on its own while openmw-cs is build with all the rest. this might change in the future.
and actually do it the other way around
2018-11-08 17:38:09 +01:00
Bret Curtis
3751bc2c11
Merge pull request #2030 from akortunov/warnfix
...
Fix some compiler warnings
2018-11-08 12:19:04 +01:00
Bret Curtis
4d3a52781d
Merge pull request #2020 from sthalik/pr/fix-rain-delay
...
fix rain delay when exiting water
2018-11-08 10:19:41 +01:00
Andrei Kortunov
ad36834671
Fix some compiler warnings
2018-11-08 13:16:04 +04:00
Stanislaw Halik
8fd71fe4ad
fix rain delay when exiting water
...
When the particle system updates its internal state noting that it's
been culled, it stops emitting any further particles. Prevent it from
having that knowledge.
v2: Fix off-by-one-frame error following review by @AnyOldName3
2018-11-07 20:55:45 +00:00
Bret Curtis
6c47725260
Merge pull request #2027 from Capostrophic/grammar
...
Tweak the default chargen and level up messages
2018-11-07 20:28:15 +01:00
Capostrophic
fcb2cde1dd
Tweak the default chargen and level up messages
2018-11-07 18:00:20 +03:00
Bret Curtis
33535eb1bd
Merge pull request #2024 from OpenMW/update_recast
...
fix msvc warnings with recast
2018-11-05 17:56:04 +01:00
Capostrophic
4efe1bc892
Add prison marker record fallback definition (bug #4701 )
2018-11-05 19:37:46 +03:00
Stanislaw Halik
5e3e01cac0
fix resolution on HiDPI displays under Windows
...
The same Windows functionality as scaling user interface elements,
confuses fullscreen games unless they set a particular of metadata to
indicate that they perform the scaling by themselves.
What happened was treating 2160p as 1440p despite the former being
chosen. The same occured with other game title prior to introducing the
metadata bits.
Fortunately with CMake there's no need to invoke the mt.exe "manifest
tool" manually.
Note that the setting of "per-monitor DPI aware" still leaves openmw
confused, hence the choice of global-DPI-aware.
2018-11-05 16:16:09 +00:00
Bret Curtis
63a2487630
bump /extern/recastnavigation to commit 3087e805b02d5eb8fff7851234fa2b3f71290eba; fixes clang warning about missing delete: https://github.com/recastnavigation/recastnavigation/issues/359
2018-11-05 16:37:47 +01:00
Andrei Kortunov
92e45507d8
Weapon sheathing support, including quivers and scabbards (feature #4673 )
2018-11-05 11:18:20 +04:00
Bret Curtis
c114e1278e
Merge pull request #1978 from akortunov/ffmpeg3
...
Migrate to FFMPEG3
2018-11-05 07:52:43 +01:00
Bret Curtis
a8d944e756
Merge pull request #2023 from elsid/navmesh_cache_limit
...
Navmesh cache limit
2018-11-05 07:51:48 +01:00
Bret Curtis
28913758ce
Merge pull request #2021 from elsid/recast_global_allocator
...
Recast global allocator
2018-11-05 07:51:10 +01:00
elsid
6e78fbb538
Double key size for item cache size
2018-11-05 02:21:19 +03:00
elsid
696bb9adc8
Add missing decrease for free navmesh data size
2018-11-05 02:21:18 +03:00
elsid
d2c2bdadb5
Add align implementation
2018-11-04 21:56:15 +03:00
elsid
b477775e16
Use callback to iterate over chunks
2018-11-04 18:34:31 +03:00
elsid
db5638bf6d
Add global recast allocator to allocate temp buffers on stack
2018-11-04 18:11:15 +03:00
Bret Curtis
d3633bbada
Merge pull request #2019 from akortunov/warnfix
...
Attempt to fix MSVC2015 C4503 warnings
2018-11-04 09:29:33 +01:00
Andrei Kortunov
a387c6b910
Fix MSVC2015 C4503 warning
2018-11-04 11:11:55 +04:00
Andrei Kortunov
f88d5e808c
Rewrite media decoder to use FFMpeg 3.2+ API (task #4686 )
2018-11-03 22:34:25 +04:00
Bret Curtis
261bbded00
Merge pull request #2016 from elsid/navmesh_update_change_type
...
Use new change type for update object
2018-11-03 17:30:05 +01:00
Bret Curtis
97af3f3b60
Merge pull request #2015 from elsid/fix_navmesh_cache_size_limit
...
Fix navmesh cache size limit
2018-11-03 16:28:19 +01:00
elsid
41319eb2bf
Use new change type for update object
...
To perform jobs for updated animated objects and doors with lowest
priority.
2018-11-03 16:44:23 +03:00
elsid
b77684a135
Add TODOs
2018-11-03 16:15:32 +03:00
elsid
2ba026e2b2
Limit navmesh cache size by data size + key size
2018-11-03 16:14:07 +03:00
Bret Curtis
851c2f55cd
Merge pull request #2014 from akortunov/actorpaths
...
Improve toggleactorspaths console command
2018-11-03 11:37:05 +01:00
Andrei Kortunov
829faf7b2c
Improve toggleactorspaths console command
2018-11-03 10:42:14 +04:00
AnyOldName3
3c25e7b93d
Merge pull request #2010 from AnyOldName3/windows-debug-build-fix
...
Include missing Windows header before calling Windows-specific functions and switch CMake compile definitions to the new style.
2018-11-02 23:57:44 +00:00
AnyOldName3
719c9f0766
Remove compile definition which inadvertently broke other compile definitons
2018-11-02 18:39:46 +00:00
AnyOldName3
e2ddb39591
Remove incorrect comment
2018-11-02 17:30:54 +00:00
AnyOldName3
a5afae71e6
Remove unwanted compile definition.
2018-11-02 17:18:10 +00:00
Bret Curtis
4814e35802
Merge pull request #2012 from Capostrophic/pathfinding
...
AI packages cleanup
2018-11-02 14:25:41 +01:00
Capostrophic
1de9674c81
AI package cleanup
2018-11-02 14:58:30 +03:00
Bret Curtis
782aa3e584
Merge pull request #2011 from elsid/fix_misc_guarded_msvc2015_crash
...
Use explicit default ctors call
2018-11-02 10:29:38 +01:00
elsid
264ea99af6
Use explicit default ctors call
...
Special change for MSVC2015.
2018-11-02 10:35:57 +03:00
AnyOldName3
a6d3210a9c
Include missing Windows header before calling Windows-specific functions
2018-11-02 01:05:39 +00:00
Bret Curtis
5f5773f7df
Merge pull request #2009 from elsid/pathfinder_update_tolerance
...
Use default tolerance to drop last point from path
2018-11-02 00:21:08 +01:00
Bret Curtis
9c3b4b6324
Merge pull request #2008 from Capostrophic/pathfinding
...
Fix isWithinMaxRange function in AiTravel [0.45.0 regression]
2018-11-02 00:08:53 +01:00
elsid
c52db75545
Use default tolerance to drop last point from path
...
Fixes AiEscort. Before actor tried to reach target with 0 tolerance.
Back to logic like it was before 4fe764c3a5bbd82a743
2018-11-02 01:12:41 +03:00
Capostrophic
a4eff1c871
Fix isWithinMaxRange function
2018-11-02 00:22:37 +03:00
AnyOldName3
540e93e983
Merge pull request #2007 from OpenMW/remove-findrecastnavigation.cmake
...
Remove FindRecastNavigation.cmake
2018-11-01 18:53:16 +00:00
AnyOldName3
8acbdf70b7
Remove FindRecastNavigation.cmake
2018-11-01 18:52:50 +00:00
Bret Curtis
c1a3eec456
Merge branch 'elsid-extern_recastnavigation' into 'master'
...
Elsid extern recastnavigation
See merge request OpenMW/openmw!45
2018-11-01 16:06:51 +00:00
