elsid
82e2739bae
Notify workers when only at least one job is posted
2019-03-08 15:27:16 +03:00
elsid
b9b8ed177c
Store priority values as named fields
2019-03-08 15:23:36 +03:00
elsid
0c16fef285
Add navmesh update status builder
2019-03-08 15:07:07 +03:00
elsid
14c9190f49
Move tile replacement into separate function
2019-03-08 15:06:11 +03:00
elsid
b6243e7d1f
Fix name styleguide
2019-03-08 15:02:49 +03:00
Bret Curtis
551563cbfb
Merge branch 'clsb-warning' into 'master'
...
Hopefully fix Clang warning about hiding overloaded virtual functions
See merge request OpenMW/openmw!82
2019-03-08 08:50:03 +00:00
Bret Curtis
0764271999
Merge pull request #2224 from elsid/fix_odr_violation
...
Fix ODR violation for VDSMCameraCullCallback
2019-03-08 09:09:36 +01:00
Bret Curtis
a381a1aff4
Merge pull request #2222 from akortunov/warnfix
...
Attempt to fix Clang warnings about hidden virtual methods
2019-03-08 00:09:31 +01:00
elsid
47e87cc2bd
Fix ODR violation for VDSMCameraCullCallback
...
This class is also defined in OpenSceneGraph at global namespace.
2019-03-07 23:49:23 +03:00
AnyOldName3
d34724a3c4
Hopefully fix Clang warning about hiding overloaded virtual functions
2019-03-07 20:46:10 +00:00
Bret Curtis
c55141d18d
Merge pull request #2217 from Capostrophic/shader
...
Move forcePPL and clamp to global shader defines (task #4869 )
2019-03-07 16:56:09 +01:00
Andrei Kortunov
72db11b56c
Fix Clang warnings about hidden virtual methods
2019-03-07 17:53:59 +04:00
Capostrophic
0cdc46dfd6
Move forcePPL and clamp to global shader defines (bug #4869 )
2019-03-05 23:36:08 +03:00
Capostrophic
59f7df187d
Add explicit variant of Journal
2019-03-05 20:47:05 +03:00
elsid
27d7452267
Update scaled objects in navigator
2019-03-04 22:59:39 +03:00
Bret Curtis
14c93b3df0
Revert "Merge pull request #2204 from elsid/fix_navigator_update"
...
This reverts commit 26fb0e7a0f
, reversing
changes made to 42b2391303
.
2019-03-04 11:06:15 +01:00
elsid
133d7447f3
Update scaled objects in navigator
2019-03-03 16:46:41 +03:00
Andrei Kortunov
bf5f68a4d8
Replace boost GCD to the homebrew implementation
2019-03-02 17:32:05 +04:00
Bret Curtis
cd70354f34
Merge pull request #2190 from akortunov/terrain
...
Make Distant Terrain configurable
2019-03-02 11:19:45 +01:00
Bret Curtis
3b8b0b5dd7
Merge pull request #2197 from akortunov/quadtree
...
Optimize terrain QuadTree build
2019-03-01 17:09:06 +01:00
Andrei Kortunov
56fea4b062
Add setting to control composite geometry size
2019-03-01 18:02:40 +04:00
bzzt
9d44e18af6
Allow to configure terrain vertex LOD
2019-03-01 18:02:38 +04:00
bzzt
03f23b235a
Optimize terrain QuadTree build
2019-03-01 16:17:11 +04:00
bzzt
fd94d7f7ff
Make Distant Terrain more configurable (feature #4890 )
2019-03-01 14:51:13 +04:00
Grigory Latyshev
3872d7476b
Move makeOsgVec3f() to settingsutils.hpp
...
Remove all other makeOsgVec3f() implementations
2019-02-28 20:03:42 +00:00
Bret Curtis
fe23acdd14
Merge branch 'misc_stringutils_tolower' into 'master'
...
Simplify Misc::StringUtils::toLower
See merge request OpenMW/openmw!71
2019-02-28 19:59:05 +00:00
David Cernat
12cef51122
Merge pull request #2192 from Capostrophic/bzzt
...
Port minor fixes from bzzt's branch
2019-02-28 12:55:58 +02:00
AnyOldName3
6de1deeb2d
Include gldebug attribution and licence
2019-02-28 00:02:07 +00:00
AnyOldName3
e147f6fed9
Finsih gldebug move completely this time
2019-02-28 00:02:07 +00:00
AnyOldName3
ac18983f37
Finish gldebug location move
2019-02-28 00:02:07 +00:00
AnyOldName3
d42c976852
Add detailed OpenGL debug messages
2019-02-28 00:02:07 +00:00
AnyOldName3
aaa3eedf99
Move gldebug from components/misc to components/debug
2019-02-28 00:02:07 +00:00
AnyOldName3
3d917fcbad
Add basic OpenGL debug callback
2019-02-28 00:02:07 +00:00
bzzt
567ad293fd
Don't discard object cache with uninitialized timestamp
...
This can happen during terrain loading
2019-02-28 03:01:32 +03:00
bzzt
b2000b7642
Fix quad tree node child bounding box dimensions
2019-02-28 02:51:46 +03:00
bzzt
172cb74763
Delete composite map layers on demand
2019-02-28 02:47:00 +03:00
bzzt
4f387fdf1c
Prune empty quad tree nodes
2019-02-28 02:47:00 +03:00
bzzt
aecbc2f01c
Fix crash when incremental compile operation is not used
2019-02-28 02:46:59 +03:00
Grigory
af7b6a09a8
Simplify Misc::StringUtils::toLower
2019-02-28 00:24:43 +03:00
bzzt
8c649f05e6
Don't reallocate light list vector unnecessarily
2019-02-27 00:12:14 +03:00
bzzt
a567111400
Use emplace instead of find-assign
2019-02-27 00:10:34 +03:00
bzzt
5bce3cbc68
Don't use MWRender namespace in common terrain components
2019-02-27 00:04:01 +03:00
Capostrophic
9bc360267b
Ignore stray explicit references for names in expressions
2019-02-26 17:47:18 +03:00
Capostrophic
cc855e065a
Ignore stray references for variables in Set instruction
2019-02-26 16:58:16 +03:00
elsid
33f6fb258d
Option to set specific random seed for random number generator
2019-02-26 09:36:34 +03:00
Bret Curtis
3316938dfc
Merge pull request #2182 from Capostrophic/format
...
Replace Boost format and replace_all where possible
2019-02-24 20:17:31 +01:00
Bret Curtis
56d5fc788c
Merge pull request #2163 from Capostrophic/hello
...
AI data handling minor revisions
2019-02-24 20:14:08 +01:00
Capostrophic
e70cc10305
Some more de-boosting
2019-02-24 03:20:20 +03:00
Capostrophic
8ecd0b82a4
Replace Boost format and replace_all where possible
2019-02-24 03:20:20 +03:00
Bret Curtis
d4564a9be7
Merge pull request #2180 from akortunov/includes
...
Remove redundant includes
2019-02-24 01:14:16 +01:00
Bret Curtis
8cf2523a8d
Merge pull request #2176 from akortunov/rollcontroller
...
Add support for NiRollController
2019-02-23 23:55:27 +01:00
Bret Curtis
44920352ce
Merge pull request #2181 from Capostrophic/boost
...
Get rid of Boost.Array
2019-02-23 23:54:30 +01:00
Capostrophic
594ea39f5d
Revise AI data handling
...
Make Hello 16-bit unsigned as it's intended to be
Get rid of redundant mHasAI boolean
Always save AI data subrecord
Adjust creature and NPC default rating values to Morrowind defaults
2019-02-23 21:00:47 +03:00
Bret Curtis
4a69d96483
Merge branch 'esm_name_template_fix' into 'master'
...
Make sure that proper operator function of ESM:FIXED_STRING is used for char[N] argument
See merge request OpenMW/openmw!63
2019-02-23 13:39:15 +00:00
Adam Fandrejewski
75c204cdd8
Fix #4835 - undefined behavior - uninitialized mCtx
2019-02-23 13:35:25 +00:00
Andrei Kortunov
3032b177a1
Remove redundant includes
2019-02-23 08:02:12 +04:00
Capostrophic
58788de7c4
Get rid of Boost.Array
2019-02-22 23:16:34 +03:00
Bret Curtis
212f097b3c
Merge pull request #2172 from akortunov/pvs_fix
...
Fix some issues, found by PVS-Studio
2019-02-22 15:01:37 +01:00
elsid
73734fc04d
Fix update navmesh for not changed objects
...
When update method is called for not changed object befor this change
all object tiles were considered as not object tiles and were removed.
Also this marked those tiles as changed. This lead to alternation
between remove and add each tile update method was called. Problem was
detected by using Animated Containers mod.
2019-02-22 11:48:31 +03:00
Andrei Kortunov
60f112d11c
Add support for NiRollController (feature #4675 )
2019-02-21 12:34:35 +04:00
Chris Djali
cb5a57e41b
Merge pull request #1547 from AnyOldName3/osgshadow-test-vdsm
...
Shadows
2019-02-20 15:35:49 +00:00
AnyOldName3
0c8ad0a3bb
Double buffer debug HUD frustum geometries to prevent race conditions.
2019-02-19 18:13:03 +00:00
Bret Curtis
7a9ff9f7b3
Merge pull request #2161 from akortunov/switchnode
...
Do not create a redundant parent node for LOD and Switch nodes
2019-02-18 19:46:25 +01:00
Bret Curtis
09262e0336
Merge pull request #2170 from elsid/disable_navigator_option
...
Add option to disable DetourNavigator component (feature #4833 )
2019-02-18 16:01:30 +01:00
Andrei Kortunov
18a59df050
Throw exceptions by value instead of reference
2019-02-17 10:24:25 +04:00
elsid
da6df818ff
Fix update navmesh
...
Every updated object should produce a set of changed tiles where it is
placed. Before this change only current object tiles were updated. If
object was moved to another set of tiles then navmesh were not changed
in new tiles.
TileCachedRecastMeshManager::updateObject should add all new tiles if object
was moved and remove all no more used tiles. Both new and old tiles should be
marked as changed.
Also add tests to show desired result for add, update, remove.
2019-02-17 01:50:53 +03:00
elsid
9626b6ec42
Add option to disable DetourNavigator component to find paths
2019-02-16 15:50:58 +03:00
elsid
34c594f01e
Add default initializators for settings fields
2019-02-16 15:39:06 +03:00
elsid
16675fd254
Return empty path when navmesh is not found for agent
2019-02-16 15:37:06 +03:00
elsid
1d3668cd22
Add Navigator interface
2019-02-16 15:37:06 +03:00
elsid
d63881e054
Make Navigator::findPath independent from class fields
2019-02-16 15:14:05 +03:00
elsid
a0ed981a7c
Fix operator ++ for OutputTransformIterator
2019-02-16 15:09:57 +03:00
elsid
c68e64a2a7
Make navigator from settings manager setting in separate function
2019-02-16 14:41:11 +03:00
Andrei Kortunov
058e289162
Do not create a redundant parent node for LOD and Switch nodes (bug #4837 )
2019-02-09 12:02:09 +04:00
Andrei Kortunov
573b3f4f1d
Init target for AI packages from old saves
2019-02-05 08:03:31 +04:00
Bret Curtis
f4313c02e1
Merge pull request #2153 from akortunov/glowing_windows
...
Native glowing windows support
2019-02-04 14:50:13 +01:00
Andrei Kortunov
60c9806d62
Share RigGeometry node data
2019-02-03 13:09:49 +04:00
Azdul
7940317e42
Make sure that proper operator function is used for char[N] argument
2019-02-03 09:32:32 +01:00
Andrei Kortunov
9e4a339ad3
Daytime node switch support (feature #4836 )
2019-02-02 10:50:15 +04:00
AnyOldName3
15547750ba
Correct behaviour of use front face culling setting to not use back face culling either when disabled.
2019-02-01 00:29:13 +00:00
AnyOldName3
cfe921fb82
Remove uneeded includes.
2019-01-31 20:12:42 +00:00
AnyOldName3
2761a38562
Prettify shadow define map setup.
2019-01-31 20:12:17 +00:00
AnyOldName3
57e10e26b2
Make variable name less confusing
2019-01-31 14:58:57 +00:00
AnyOldName3
a24b8ec3d2
Fix enable/disable mixup.
2019-01-31 14:57:56 +00:00
AnyOldName3
556c9a3382
Add normal-offset shadow mapping to remove shadow acne (flicker)
2019-01-30 22:28:00 +00:00
Bret Curtis
e748abde7d
Merge pull request #2147 from akortunov/uvcontroller
...
Apply UVControllers only for given UV Set
2019-01-28 10:20:43 +01:00
Andrei Kortunov
03b71d3c30
Improve switchable nodes handling by optimizer
2019-01-27 15:19:48 +04:00
Andrei Kortunov
87598f9419
Fill Switch and LOD nodes names
2019-01-27 15:18:57 +04:00
Andrei Kortunov
b2126c2b6b
Apply UVControllers only for given UV Set (bug #4827 )
2019-01-26 14:53:33 +04:00
AnyOldName3
8482236a82
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2019-01-24 23:09:23 +00:00
AnyOldName3
d82c85913a
Don't bother multiplying a matrix by its inverse and applying that to the light direction.
...
Hopefully this will improve numerical stability and reduce shadow flicker a little.
2019-01-24 23:07:38 +00:00
AnyOldName3
4438ab4493
Use CullVisitor traversal mask for light manager.
2019-01-24 22:42:23 +00:00
Bret Curtis
8ddb45eb22
Merge pull request #2141 from akortunov/switchnode
...
Support NiSwitchNode
2019-01-23 21:32:21 +01:00
Andrei Kortunov
2c38e337ae
Support NiSwitchNode (feature #4812 )
2019-01-23 21:01:54 +04:00
Capostrophic
c9df63ffd1
Replace BSAOpt hash calculation with a custom function
2019-01-22 02:22:57 +03:00
Capostrophic
be5faadff8
Fix compressed BSA loading on non-Windows systems
2019-01-21 01:23:02 +03:00
Bret Curtis
e1d7a8415d
Merge branch 'bugfix/file-list-emptying-error' into 'master'
...
Fix error when create new OpenCS addon
Closes #4757
See merge request OpenMW/openmw!50
2019-01-20 19:59:05 +00:00
Bret Curtis
9cfc97a37a
Merge branch 'tes4_bsa' into 'master'
...
Read BSA files in TES4 / TES5 formats
See merge request OpenMW/openmw!56
2019-01-20 19:03:57 +00:00
Bret Curtis
6fd4d016eb
Merge pull request #2132 from akortunov/particlefix
...
Fix an exception when try to load a particle node with empty sizes array
2019-01-20 19:52:29 +01:00
Azdul
7880e6f761
CompressedBSAFile::FileRecord::isCompressed implementation simplified.
...
Double space in CompressedBSAFile::FileRecord::getSizeWithoutCompressionFlag removed.
2019-01-19 14:41:17 +01:00
Azdul
6aa6b2dc89
Removed TES4 from file names. Correct Git file history / attribution.
2019-01-18 21:14:44 +01:00
Azdul
a3bcd95546
Merge branch 'cc9cii' of https://github.com/cc9cii/openmw into tes4_bsa
2019-01-18 09:11:41 +01:00
Azdul
42ea609d1d
Remove files with incorrect Git history / attribution
2019-01-18 09:03:34 +01:00
Frederic Chardon
a78d98df27
Fix crashcatcher
2019-01-17 10:38:34 +00:00
Adam.Fandrejewski
777a50cb64
Replaced C++ 14 make_unique with C++ 11 compliant code
2019-01-17 09:56:11 +01:00
Azdul
0c3a3ea241
Strange issue with Linux compilation (<memory> header)
2019-01-17 09:11:19 +01:00
Azdul
4c499983ca
Fixed warnings reported by GCC
2019-01-17 08:58:25 +01:00
Azdul
d55cc4d3ea
Linux requires <memory> header
2019-01-17 08:52:30 +01:00
Azdul
caa0487c6a
Replace raw pointer in BsaArchive with unique_ptr
2019-01-17 08:42:43 +01:00
Azdul
e502819246
Proper conversion from shared_ptr<bsa::MemoryinputStream> to shared_ptr<std::istream>
2019-01-17 08:08:03 +01:00
Azdul
b9a7514278
Memory leak fixed. Proper file names in headers.
2019-01-17 07:08:25 +01:00
Azdul
c6fd979c42
Spaces instead of tabs in CMakeLists.txt
2019-01-17 05:42:26 +01:00
Azdul
96d19e07ca
Fix Linux build
2019-01-16 20:59:07 +01:00
Azdul
25650e65bf
Read any BSA file - detection based on version in BSA header
2019-01-16 20:19:15 +01:00
Andrei Kortunov
39c4a7833c
Fix out of range exception when try to load a particle node with empty sizes array (bug #4804 )
2019-01-16 22:00:50 +04:00
Capostrophic
166d757a19
Allow stray special characters before a begin statement
2019-01-16 01:12:16 +03:00
Bret Curtis
8834ee95be
Merge pull request #2120 from Capostrophic/macros
...
Get rid of some remaining instances of C numeric limits
2019-01-10 18:59:34 +01:00
Bret Curtis
590b393c8e
Merge pull request #2123 from akortunov/skinning
...
Optimize skinning, part 2
2019-01-10 18:56:52 +01:00
Bret Curtis
4617dea154
Merge pull request #2119 from akortunov/stringstream
...
Get rid of unnecessary string streams
2019-01-10 11:42:27 +01:00
Andrei Kortunov
8e6fd348d1
RigGeometry optimization: optimize geometry optimization
2019-01-09 21:01:33 +04:00
Capostrophic
a71cfca580
Get rid of some remaining instances of C limit macros
2019-01-09 16:06:18 +03:00
Andrei Kortunov
254f01b89d
RigGeometry optimization: vector iteration is more cheap than map iteration
2019-01-09 11:52:11 +04:00
Andrei Kortunov
71227ffc04
Handle possible invalid iterator issue during settings parsing
2019-01-08 12:37:46 +04:00
Andrei Kortunov
0937f02598
Get rid of unnecessary string streams
2019-01-07 21:08:16 +04:00
Bret Curtis
65a6b10995
Merge pull request #2066 from akortunov/guifixes
...
Do not read font size just for every single widget
2019-01-07 17:17:57 +01:00
Capostrophic
d1e0a10136
Make sure AI data is initialized when loading actor records
2019-01-06 21:03:19 +03:00
Capostrophic
ee2560edc3
Fix constant raining
2018-12-31 14:47:00 +03:00
Capostrophic
e412e1b41c
Revert to lexical_cast<float>, catch out-of-range exceptions
2018-12-29 20:20:27 +03:00
Capostrophic
467724d5e8
Improve fallback numerical value handling (bug #4768 )
2018-12-28 23:49:06 +03:00
Bret Curtis
91b962c095
Merge pull request #2099 from xyzz/replace-volatile-atomic
...
Replace volatile bools with std::atomic<bool>
2018-12-28 16:41:07 +01:00
Capostrophic
7155e787b4
Clean up fallback record creation
2018-12-28 01:22:24 +03:00
Ilya Zhuravlev
07e9ce84b3
Replace volatile bools with std::atomic<bool>
2018-12-24 14:19:35 -05: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
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
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
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
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
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
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
Andrei Kortunov
e073e0d8c9
Do not read font size just for every single widget
2018-12-08 21:18:42 +04: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
244bd289cb
Change default colour mode (as apparently it actually gets used sometimes)
2018-12-03 18:56:37 +00:00
mp3butcher
7a85e10d2f
fix a rig bug visible with OSG_VERTEX_BUFFER_HINT=VAO
2018-12-02 23:36:27 +01:00
AnyOldName3
0a409c0ab8
Make shadow map front-face culling configurable
2018-12-01 00:26:43 +00:00
AnyOldName3
dd207d9e54
Make the shadow polygon offset parameters configurable
2018-11-30 00:55:54 +00:00
AnyOldName3
642002b302
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-29 01:19:01 +00:00
AnyOldName3
aa11832949
Resolve bugs with depth-clamped shadow maps
2018-11-29 01:17:58 +00:00
AnyOldName3
7ad4882f0c
Fix debug hud frustum outline disappearence
2018-11-21 23:45:47 +00:00
AnyOldName3
061fa57335
Switch to better-performing data types for debug hud geometry
2018-11-21 22:38:50 +00:00
AnyOldName3
632b0d8979
Make shadow maps use their whole depth range for the overlap with the view frustum and rely on depth clamping to ensure objects outside the frustum still cast shadows.
2018-11-20 23:02:28 +00:00
AnyOldName3
660e423e99
Correct debug hud frustum colour
2018-11-20 23:01:04 +00:00
Bret Curtis
419e7ea5a2
Merge pull request #2035 from akortunov/coverity
...
Fix many Coverity Scan warnings
2018-11-14 09:44:30 +01:00
Andrei Kortunov
4ee15ddcb9
Fix many Coverity Scan warnings
2018-11-14 11:21:49 +04:00
Andrei Kortunov
d2613e35a2
Fix some Clang 7 warnings
2018-11-09 19:42:59 +04: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
Andrei Kortunov
ad36834671
Fix some compiler warnings
2018-11-08 13:16:04 +04:00
Capostrophic
4efe1bc892
Add prison marker record fallback definition (bug #4701 )
2018-11-05 19:37:46 +03:00
Andrei Kortunov
92e45507d8
Weapon sheathing support, including quivers and scabbards (feature #4673 )
2018-11-05 11:18:20 +04:00
Bret Curtis
a8d944e756
Merge pull request #2023 from elsid/navmesh_cache_limit
...
Navmesh cache limit
2018-11-05 07:51:48 +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
Andrei Kortunov
a387c6b910
Fix MSVC2015 C4503 warning
2018-11-04 11:11:55 +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
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
Andrei Kortunov
829faf7b2c
Improve toggleactorspaths console command
2018-11-03 10:42:14 +04:00
AnyOldName3
b178e1868a
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-03 00:27:40 +00: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
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
AnyOldName3
d0c254bc7e
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-01 16:48:21 +00:00
elsid
792a0585c0
Add recastnavigation as subdirectory
2018-11-01 17:01:22 +01:00
AnyOldName3
0208cb8616
Merge pull request #2001 from AnyOldName3/enable-osg-logging
...
Allow OSG objects to be sent to the debug log.
2018-10-31 22:14:36 +00:00
AnyOldName3
4489f23005
Remove recastnavigation conflicts
2018-10-31 15:15:01 +00:00
Andrei Kortunov
a615076c61
Add default return value
2018-10-31 10:18:29 +04:00
AnyOldName3
3785ba6aa0
Merge upstream/master
2018-10-30 22:38:09 +00:00
AnyOldName3
90986df81c
Allow OSG objects to be sent to the debug log.
2018-10-30 22:15:32 +00:00
Bret Curtis
d6c674660a
Merge pull request #1633 from elsid/pathfinder_detour
...
Use recastnavigation for pathfinding (#2229 )
2018-10-30 20:44:13 +01:00
AnyOldName3
1ca7ea23d1
Add extra uniforms to the disabled shadows StateSet so that the shadow texture samplers are bound ot the dummy shadow maps correctly.
2018-10-30 17:07:11 +00:00
Bret Curtis
3c53fe16e9
Merge pull request #1986 from akortunov/rootfix
...
[Regression] Handle RootCollisionNode exactly as in original engine
2018-10-29 22:47:04 +01:00
elsid
49d81241db
Merge branch 'master' into pathfinder_detour
2018-10-28 17:08:09 +03:00
elsid
50b6ae3e10
Fix calculation for shape local AABB
2018-10-28 16:58:22 +03:00
elsid
af2f4e8424
Allow to use zero cache size
2018-10-28 16:54:06 +03:00
elsid
abc51a8a17
Add settings option to set max number of polygons per navmesh tile
2018-10-28 15:36:47 +03:00
Andrei Kortunov
6e05853478
Center progress bar when there are active messageboxes (bug #4691 )
2018-10-28 14:40:48 +04:00
Andrei Kortunov
61da6b6ecf
Print warning if the RootCollisionNode is attached to non-root node (bug #4311 )
2018-10-26 17:11:08 +04:00
Andrei Kortunov
6d91fe69b2
Revert "Handle RootCollisionNode, attached to non-root node (bug #4311 )"
...
This reverts commit ec9a1b0d05
.
2018-10-26 12:51:04 +04:00
Marc Zinnschlag
4d88d6dd58
Merged pull request #1980
2018-10-25 11:06:22 +02:00
AnyOldName3
1e2bf9c447
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-10-24 20:13:13 +01:00
Andrei Kortunov
61e6e359c4
Allow creatures to use the autogenerated collision box (feature #2787 )
2018-10-22 15:48:23 +04:00
Andrei Kortunov
41e90bd56c
Unify random generator usage
2018-10-19 16:16:18 +04:00
AnyOldName3
b0907f8929
Add todos in case they're left until after the shadow PR is merged
2018-10-18 16:01:36 +01:00
AnyOldName3
a41ce42208
Move setting of colorMode to ShaderRequirements in case they're reused
2018-10-18 16:00:51 +01:00
AnyOldName3
474770eca8
Switch shadow map rendering to a specialised, simplified shader.
2018-10-16 21:23:31 +01:00
AnyOldName3
ce15369bbd
Convert colorMode shader define to a uniform
2018-10-15 23:12:15 +01:00
elsid
03d4ce5e49
Log find path exception with level verbose, add more info to message
2018-10-15 23:25:42 +03:00
elsid
dc2eb2e16b
Do not write to global log async navmesh updater exceptions
2018-10-15 22:47:07 +03:00
Bret Curtis
53ccce1867
Merge pull request #1966 from akortunov/logfix
...
Allow apps without logging system to display log messages
2018-10-14 11:20:36 +02:00
Andrei Kortunov
b5df385111
Allow apps without logging system to display log messages
2018-10-14 12:07:15 +04:00
elsid
e57504ae7c
Lower log level
2018-10-13 22:22:15 +03:00
elsid
0f6a64ad54
Split makeNavMeshTileData
2018-10-13 22:22:15 +03:00
elsid
fb655cb04f
Remove macroses to check recastnavigation functions result
2018-10-13 22:22:15 +03:00
elsid
ed73d130f9
Cache navmesh tiles
...
Use LRU modification to hold currently used items. Use RecastMesh binary
data for item key.
Store original pointer of btCollisionShape in user pointer to make available
it as an identifier within all duplicates. Use pointer to heights data array
for btHeightfieldTerrainShape.
2018-10-13 22:22:12 +03:00
elsid
69b5834c64
Add doc for Navigator
2018-10-13 22:16:35 +03:00
elsid
ae7285e960
Use ScopeGuarded instead of raw mutex
2018-10-13 22:16:35 +03:00
elsid
cf4066751c
Add classes to encapsulate value guarded by mutex
2018-10-13 22:16:35 +03:00
elsid
1a27489904
Add special type for object id
2018-10-13 22:16:35 +03:00
elsid
7c80bb9411
Support multiple threads for async nav mesh updater
2018-10-13 22:16:34 +03:00
elsid
ff478aba6d
Use actor half extent for interior cells
2018-10-13 22:16:33 +03:00
elsid
346e9e3141
Add off mesh connections for doors without teleport
2018-10-13 22:16:33 +03:00
elsid
d02beae5a8
Find path for actors according to their abilities to swim and walk
2018-10-13 22:16:33 +03:00
elsid
dc09674362
Add command and settings option to enable actors paths render
2018-10-13 22:16:32 +03:00
elsid
c95cea414c
Support water for NavMesh
2018-10-13 22:16:32 +03:00
elsid
72f211ef28
Add enums for area type and flags
2018-10-13 22:16:32 +03:00
elsid
fa23b590a4
Add unwalkable areas to NavMesh
2018-10-13 22:16:32 +03:00
elsid
c771986c56
Prioritise NavMesh jobs first to remove and last to add
...
When player move fast enough, tiles update for specific area square
couldn't catch player move. Tiles to be removed are left in the queue
with lower priority then tiles to be added which are nearest to player.
This can lead to overflow for amount of tiles. So we try to do remove
first. But we detect change type approximately using mixed change type,
because even if we do it precise, change type could change while job
is in queue.
2018-10-13 22:16:31 +03:00
elsid
b33a291a67
Log thread id
2018-10-13 22:16:31 +03:00
elsid
f6a60790f8
Create collision shape for all avoided nodes
2018-10-13 22:16:31 +03:00
elsid
e24d4d7052
Explicitly use RC_NULL_AREA constant to mark unwalkable areas
2018-10-13 22:16:31 +03:00
elsid
330e596c64
Remove useless parameter
2018-10-13 22:16:31 +03:00
elsid
c3298d13a6
Add log sinks (stdout and file)
2018-10-13 22:16:31 +03:00
elsid
84949bedb1
Remove and add tile in single critical section
2018-10-13 22:16:30 +03:00
elsid
144e1a063b
Support animated objects
2018-10-13 22:16:30 +03:00
elsid
4aba0fa85f
Limit number of NavMesh tiles to add by distance from player tile
2018-10-13 22:16:30 +03:00
elsid
d2fd9abd51
Split RecastMesh into tiles
2018-10-13 22:16:30 +03:00
elsid
dbb1d99bff
Add NavMeshItem generation to fix update NavMesh for render
2018-10-13 22:16:30 +03:00
elsid
f268ec5d34
Measure total time for NavMesh build from first pop
2018-10-13 22:16:29 +03:00
elsid
c26773bd29
Log update NavMesh status
2018-10-13 22:16:29 +03:00
elsid
937e8e1803
Allow to create empty RecastMesh
2018-10-13 22:16:29 +03:00
elsid
dd5f4498f6
Increment NavMesh revision on remove or add tile
2018-10-13 22:16:29 +03:00
elsid
ed3a255f65
Do not use NavMesh to find changed tiles
2018-10-13 22:16:28 +03:00
elsid
d1e71f9322
Support btBoxShape for RecastMesh
2018-10-13 22:16:28 +03:00
elsid
70a369f70e
Add command to enable NavMesh render
...
togglenavmesh or tnm
2018-10-13 22:16:28 +03:00
elsid
1caa18bb4f
Use one recast mesh for all jobs
2018-10-13 22:16:27 +03:00
elsid
794cfc4aa3
Write detournavigator log to file
2018-10-13 22:16:27 +03:00
elsid
dd5e6a61a3
Support btCompoundShape for RecastMesh
2018-10-13 22:16:27 +03:00
elsid
373adc6ec4
Option to enable/disable file names revisions
2018-10-13 22:16:27 +03:00
elsid
f8909218ee
Store recast mesh bounds
2018-10-13 22:16:27 +03:00
elsid
d1d034a1ec
Update NavMesh one by one tile in order from nearest to player
2018-10-13 22:16:26 +03:00
elsid
41caca24ee
Options to enable/disable write recast mesh and nav mesh into file
2018-10-13 22:16:26 +03:00
elsid
6d233ae868
Option in settings to enable/disable detour navigator debug log
2018-10-13 22:16:26 +03:00
elsid
430ba9d7a5
Build NavMesh tile data only for changed tiles
2018-10-13 22:16:25 +03:00
elsid
fafba8ea0c
Use recastnavigation to find path
2018-10-13 22:16:25 +03:00
elsid
4f2bfa1e9d
Add operators for osg types
2018-10-13 22:16:25 +03:00
elsid
c01be7b07f
Add operators for bullet types
2018-10-13 22:16:25 +03:00
jvoisin
ca8744af56
Fix crash in the ESM reader, when SCVR has no variable names
...
Fixes bug [#4678 ](https://gitlab.com/OpenMW/openmw/issues/4678 )
The `loadSCVR` method assumes that the list of variable
names won't be empty, which it might.
Instead of crashing, we show a warning and ignore the record.
2018-10-12 11:28:14 +02:00
Andrei Kortunov
f9271fd7f0
Fix crash in the ESM reader, when list is empty (bug #4677 )
2018-10-12 10:38:32 +04:00
AnyOldName3
0124be5713
Merge upstream/master
2018-10-10 21:23:19 +01:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
cc9cii
6ec6b9bc2a
OpenMW Integration.
...
Read the ESM/ESP records but do nothing with them for the moment.
2018-10-07 08:55:30 +11:00
cc9cii
15d5cdf3cf
Allow TES4 ESM/ESP to co-exist with TES3 ESM/ESP.
...
This change aims to allow TES4/TE5 content to OpenMW. i.e. a standalone TES4 would be implemented quite differently. That said, the key changes are:
* Use pointers rather than references for ESM readers so that they can be switched to another variant on the fly.
* Content file dependencies to be checked within each group (only 3 groups for now, TES3/TES4/TES5)
2018-10-06 20:38:53 +10:00
cc9cii
3982573035
BSA enhancements.
...
* Implement hash based lookup for TES3 BSA files.
* Added TES4/TES5 BSA support.
* Implemented a hack (non-portable code) in an attempt to reduce startup time under Windows because Boost::filesystem seems to take forever on GetFileAttributeW. This implementation uses FindFirstFile/FindNextFile/FindClose instead.
2018-10-06 13:35:51 +10:00
cc9cii
4cd4cf8479
Resolved conflicts and build fixes.
2018-10-05 21:54:29 +10:00
scrawl
f456174af8
Rename to lowerCaseInPlace
...
(cherry picked from commit 07b064f616
)
# Conflicts:
# apps/opencs/model/world/commanddispatcher.cpp
# apps/opencs/model/world/regionmap.cpp
# apps/opencs/model/world/scriptcontext.cpp
# apps/openmw/mwrender/animation.cpp
# apps/openmw/mwscript/statsextensions.cpp
# apps/openmw/mwworld/store.cpp
# components/misc/stringops.hpp
2018-10-05 19:16:46 +10:00
scrawl
b4cdb965dc
Move rng to components
...
(cherry picked from commit 8c810e3620
)
# Conflicts:
# apps/openmw/engine.cpp
# apps/openmw/mwclass/npc.cpp
# components/misc/rng.cpp
# components/sceneutil/lightcontroller.cpp
# libs/openengine/CMakeLists.txt
2018-10-05 18:53:47 +10:00
dteviot
4b0aeb4066
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
(cherry picked from commit 3f28634d1f
)
# Conflicts:
# apps/openmw/mwclass/creature.cpp
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwgui/pickpocketitemmodel.cpp
# apps/openmw/mwgui/waitdialog.cpp
# apps/openmw/mwmechanics/combat.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# components/CMakeLists.txt
# libs/openengine/misc/rng.cpp
2018-10-05 18:45:57 +10:00
Andrei Kortunov
87394f2ebb
Revert "Take in account transformations of NiTriShape and NiSkinData in skinning (bug #4437 )"
...
This reverts commit 09427d3f5e
since the
fix is not entirely correct.
2018-09-29 16:21:40 +04:00
Marc Zinnschlag
38758a9555
Merged pull request #1944
2018-09-29 11:16:14 +02:00
Capostrophic
f20f49daa6
Content selector: allow to copy paths to clipboard (feature #2847 )
2018-09-29 02:09:13 +03:00
Andrei Kortunov
43c7438e8e
Move WeakCache to components/misc
2018-09-28 16:47:47 +04:00
Kyle Cooley
7eb1b14b21
Periodically prune empty elements in weak cache
2018-09-27 13:14:59 +04:00
Kyle Cooley
031502b2ab
Reorganize ActorAdapter data, use weak cache for sharing
2018-09-27 13:14:59 +04:00
Kyle Cooley
6bece13a32
Use new Log class for error message
2018-09-27 13:14:59 +04:00
Kyle Cooley
e2ac392a40
Move common stuff to scene util, fix errors with 1st person meshes
2018-09-27 13:14:59 +04:00
Kyle Cooley
8444ee9981
Start rendering npc's
2018-09-27 13:14:59 +04:00
Marc Zinnschlag
43880ca47b
Merged pull request #1919
2018-09-27 11:06:00 +02:00
Andrei Kortunov
0176ee389e
Handle length of UTF-8 strings properly in plugin metadata (bug #4653 )
2018-09-25 21:40:26 +04:00
Andrei Kortunov
bce8de5fe9
Respect selected encoding in the content selector (bug #4467 )
2018-09-25 21:39:18 +04:00
Capostrophic
92259c6cca
Discard count arguments for AddSoulGem and RemoveSpell (bug #3762 )
2018-09-23 22:30:06 +03:00
Marc Zinnschlag
7be9f2ca45
Merged pull request #1891
2018-09-21 11:38:19 +02:00
Andrei Kortunov
01b3f92f7e
Make coc and fixme console commands close to vanilla (bug #4292 , bug #4217 )
2018-09-20 16:25:02 +04:00
Andrei Kortunov
276b7830a9
Mass potion creation (feature #4642 )
2018-09-20 15:45:14 +04:00
Andrei Kortunov
70ed8fd1a9
Use constants instead of widely used magic numbers (task #4645 )
2018-09-17 19:22:50 +04:00
Marc Zinnschlag
06b2a23e74
Merged pull request #1768
2018-09-17 12:10:21 +02:00
Marc Zinnschlag
d76367918a
Merged pull request #1907
2018-09-17 12:10:00 +02:00
Marc Zinnschlag
107165d36d
Merged pull request #1923
2018-09-17 11:59:28 +02:00
Andrei Kortunov
2961f0d810
Allow to use the %Name for creatures (bug #4644 )
2018-09-16 21:53:28 +04:00
Capostrophic
95aa05e41b
Tweaks to script parser messages and pathgrid warnings
2018-09-16 16:47:33 +03:00
Andrei Kortunov
09427d3f5e
Take in account transformations of NiTriShape and NiSkinData in skinning (bug #4437 )
2018-09-16 14:38:58 +04:00
Capostrophic
363516049d
Actually fix General number formatting
2018-09-14 18:38:24 +03:00
Andrei Kortunov
7a986f38da
Support for user-defined TrueType fonts
2018-09-12 14:31:01 +04:00
Andrei Kortunov
c9c0230d2a
Scale journal fonts separately from common ones
2018-09-12 14:31:01 +04:00
Andrei Kortunov
adbaeb7cca
Improve GUI scaling (bug #3288 )
2018-09-12 14:31:01 +04:00
Marc Zinnschlag
6100e34051
Merged pull request #1912
2018-09-12 12:04:49 +02:00
Andrei Kortunov
f0919f51e9
Fix integer result formatting of scripting functions
2018-09-11 14:05:44 +04:00
Andrei Kortunov
c2c24a76a4
Handle MyGUI exceptions inside destructors
2018-09-11 11:11:27 +04:00
Andrei Kortunov
aca6625af4
Avoid possible memory leak by using the unique_ptr
2018-09-11 11:11:27 +04:00
Andrei Kortunov
a262e4b342
Print warning, if can not close or remove temporary file
2018-09-11 11:11:27 +04:00
Andrei Kortunov
d5bcc49079
Initialize missing struct fields
2018-09-11 11:11:24 +04:00
Andrei Kortunov
e5a81b1f99
Fix some issues, found by Coverity Scan
2018-09-10 16:35:27 +04:00
Andrei Kortunov
5693ceca74
Remove redundant declaration
2018-09-04 17:56:19 +04:00
Capostrophic
65ff346b61
Make NPC record reputation, disposition and faction rank have unsigned char type
2018-09-03 16:45:38 +03:00
Andrei Kortunov
7e2bda459b
Check if there are textures in FlipController to avoid division by zero (bug #4614 )
2018-09-02 17:36:37 +04:00
Marc Zinnschlag
78a84042ad
Merged pull request #1901
2018-09-01 11:08:24 +02:00
Capostrophic
7ef6fa9f61
Remove deprecated GMST get* functions
2018-08-29 18:38:12 +03:00
Andrei Kortunov
b0ac0b0b22
Do not initialize map every call
2018-08-29 16:47:12 +04:00
Marc Zinnschlag
24ce8cce72
Merged pull request #1898
2018-08-29 12:04:52 +02:00
Andrei Kortunov
0ddd0e4edc
Fix light flicker amplitude calculation
2018-08-28 14:57:11 +04:00
Andrei Kortunov
c677f7ca27
Rework pulsing light sources (bug #4615 )
2018-08-28 14:57:08 +04:00
Marc Zinnschlag
232ea4f793
Merged pull request #1887
2018-08-27 12:52:30 +02:00
Sophie Kirschner
c412f99963
Remove commented lines in UnrefWorkItem::doWork
2018-08-26 11:08:06 +03:00
Marc Zinnschlag
327f36b081
Merged pull request #1876
2018-08-26 09:15:38 +02:00
Andrei Kortunov
ff241fb787
Optimize skinning (task #4605 )
2018-08-25 20:45:59 +04:00
Sophie Kirschner
4dd9386c4f
Fix error: member access into incomplete type 'SceneUtil::UnrefWorkItem'
...
Fixes compile error encountered on OSX 10.9 with g++
sophie:build pineapple$ g++ --version
Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/usr/include/c++/4.2.1
Apple LLVM version 6.0 (clang-600.0.56) (based on LLVM 3.5svn)
Target: x86_64-apple-darwin13.4.0
Thread model: posix
The compilation error:
[ 24%] Building CXX object apps/openmw/CMakeFiles/openmw.dir/mwrender/renderingmanager.cpp.o
In file included from /Users/pineapple/git/openmw/apps/openmw/mwrender/renderingmanager.cpp:1:
In file included from /Users/pineapple/git/openmw/apps/openmw/mwrender/renderingmanager.hpp:4:
/Users/pineapple/git/openmw/openmw-deps/include/osg/ref_ptr:35:36: error: member access into incomplete type 'SceneUtil::UnrefWorkItem'
~ref_ptr() { if (_ptr) _ptr->unref(); _ptr = 0; }
^
/Users/pineapple/git/openmw/./components/sceneutil/unrefqueue.hpp:14:11: note: in instantiation of member function
'osg::ref_ptr<SceneUtil::UnrefWorkItem>::~ref_ptr' requested here
class UnrefQueue : public osg::Referenced
^
/Users/pineapple/git/openmw/./components/sceneutil/unrefqueue.hpp:10:11: note: forward declaration of 'SceneUtil::UnrefWorkItem'
class UnrefWorkItem;
2018-08-24 16:41:52 +03:00
Andrei Kortunov
a560a9e00d
Allow messageboxes arguments to have newline characters (bug #3836 )
2018-08-24 15:48:18 +04:00
AnyOldName3
db707a31ec
Add clipping planes when allow shadow map overlap is enabled
2018-08-23 13:14:02 +01:00
AnyOldName3
25e92481f4
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-08-21 14:00:58 +01:00
AnyOldName3
15e820825f
Fix another convex hull clipping issue and restore z-clipping
2018-08-21 14:00:29 +01:00
Capostrophic
a06c9c767d
Treat <> and << operators as < and >< and >> as > in scripts
...
(bug #4597 )
2018-08-19 18:40:33 +03:00
Marc Zinnschlag
dc9aedca7d
Merged merge request !33
2018-08-18 12:08:05 +02:00
AnyOldName3
3ce96997d1
Remove sneaky tabs.
2018-08-18 00:09:40 +01:00
AnyOldName3
80082308f0
Merge upstream (shadermanager log system revamp)
2018-08-17 18:22:13 +01:00
AnyOldName3
dd501f4132
Make ConvexHull::clip more resilient against large values.
2018-08-17 17:47:52 +01:00
AnyOldName3
987306feb9
Fix ConvexHull::extendTowardsNegativeZ
2018-08-16 23:48:19 +01:00
Bret Curtis
dcd381049c
Merge pull request #1872 from akortunov/extended_logging
...
Use new logging system
2018-08-16 11:38:29 +02:00
Andrei Kortunov
c7a5548475
Use new logging system for editor
2018-08-14 20:01:09 +04:00
Andrei Kortunov
1452684d9e
Use new logging system for components
2018-08-14 19:42:41 +04:00
Bret Curtis
c0e50b2c02
Merge pull request #1865 from elsid/material_race_condition
...
Fix race condition (bug #4584 )
2018-08-14 10:29:58 +02:00
Andrei Kortunov
9a5b016293
Move crashcatcher initialization to components
2018-08-14 11:17:05 +04:00
Andrei Kortunov
5e172ed831
Move cerr initialization out of 'try' block
2018-08-14 10:30:27 +04:00
James Carty
1c49698053
Implement 'g' flag
2018-08-13 20:31:11 +01:00
Bret Curtis
61b34124e2
Merge pull request #1847 from akortunov/extended_logging
...
Improve console logging
2018-08-13 10:19:25 +02:00
James Carty
579f35511a
Add support for scietific notation flag for MessageBox
2018-08-12 22:45:03 +01:00
Andrei Kortunov
7d6e3673e0
Implement advanced logging system (feature #4581 )
2018-08-12 13:38:15 +04:00
elsid
c2b8c7086a
Fix race condition
...
Values are accessed from main thread and cell preloader threads.
2018-08-12 01:06:58 +03:00
elsid
2de38142e2
Replace raw pointers by unique_ptr
2018-08-11 18:00:52 +03:00
elsid
f2a63bcf35
Add unit tests for BulletNifLoader
2018-08-11 18:00:52 +03:00
elsid
6afc1dc3a0
Support build with coverage for components and test suite
2018-08-11 17:24:40 +03:00
Marc Zinnschlag
b67b17010d
Merged pull request #1826
2018-08-10 12:21:49 +02:00
Andrei Kortunov
ec9a1b0d05
Handle RootCollisionNode, attached to non-root node (bug #4311 )
2018-08-10 11:11:40 +04:00
Bret Curtis
03bf599426
Merge pull request #1856 from Capostrophic/hidden
...
Revert untextured shapes rendering changes
2018-08-09 12:36:03 +02:00
Capostrophic
348c6f848e
Fix a bunch of MSVC warnings
2018-08-09 02:27:33 +03:00
AnyOldName3
3b3721897d
Make indoor shadows disableable.
2018-08-08 23:56:11 +01:00
AnyOldName3
a2b54714d4
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-08-08 23:28:06 +01:00
AnyOldName3
6286f5a1d4
Ensure RigGeometry child geometries have sensible bounds without actually computing them.
2018-08-08 23:24:57 +01:00
Capostrophic
85208eff7f
Revert untextured shapes rendering changes
2018-08-08 21:10:00 +03:00
Capostrophic
bda23c6ad6
Fix nodemask
2018-08-07 20:49:10 +03:00
Capostrophic
a1e3b2e586
Don't render NiTriShapes without NiTexturingProperty (bug #4483 )
2018-08-05 16:24:24 +03:00
Andrei Kortunov
1f4dd3b393
Make partial binary search case insensitive, as it supposed to be (bug #4558 )
2018-08-05 13:26:12 +04:00
Marc Zinnschlag
452a706047
Merged pull request #1837
2018-08-04 10:26:44 +02:00
Andrei Kortunov
e2519226aa
Move boost include
2018-08-03 17:04:07 +04:00
Andrei Kortunov
c2a175c2e0
Move crash catcher wrapper to separate file
2018-08-03 15:51:17 +04:00
Andrei Kortunov
ac98797999
Add missing file
2018-08-03 15:05:13 +04:00
Andrei Kortunov
c454f1bdad
Use log file for editor (feature #4012 )
2018-08-03 09:05:08 +04:00
AnyOldName3
8f4125134f
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-08-02 15:51:06 +01:00
Andrei Kortunov
369ea7e177
Check if a temporary file was successfully closed
2018-08-01 20:36:29 +04:00
Andrei Kortunov
12144de8ed
Initialize missing variables
2018-08-01 20:18:37 +04:00
AnyOldName3
cc23a968d1
Merge upstream/master
2018-08-01 14:13:45 +01:00
AnyOldName3
71778e2552
Disable convex hull clipping based on render leaf traverser results in the z direction.
2018-07-31 23:42:44 +01:00
AnyOldName3
02ab3b466a
Use simplified convex hull clipping maths from the other function doing hte same thing
2018-07-31 23:30:15 +01:00
Andrei Kortunov
469bb29621
Do not try to handle shape controllers as node controllers
2018-07-30 21:45:17 +04:00
Andrei Kortunov
7e0df01c83
Do not optimize animated shapes (bug #3950 )
2018-07-28 16:48:57 +04:00
Nikolay Kasyanov
21f198af7a
Fix debugger detection on macOS ( #4511 )
2018-07-15 12:36:01 +02:00
Bret Curtis
99e4d49e7c
Merge pull request #1787 from akortunov/profilierfont
...
Use the DejaVuLGCSansMono.ttf for profiler output
2018-07-11 16:00:34 +02:00
Andrei Kortunov
70b6d4983d
Use the DejaVuLGCSansMono.ttf in profilier output
2018-07-11 14:41:49 +04:00
elsid
3f21c49479
Put check for nif file name into separate function
2018-07-10 23:46:06 +03:00
elsid
2599aba196
Fix check whether file name starts with x or X
...
If path doens't contains / or \, then slashpos will be 0.
Therefore slashpos + 1 = 1 doesn't point to first symbol.
xmesh.nif
^
slashpos + 1
2018-07-10 23:46:06 +03:00
Andrei Kortunov
c921d1c7e9
Refactor NifStream class (eliminate LNK4221 MSVC warning)
2018-07-10 13:32:52 +04:00
Andrei Kortunov
16a4df25d6
Make void function to do not return value
2018-07-10 09:36:39 +04:00
Alexander Stillich
725cc94210
Renamed cc_install to something less cryptic (crashCatcherInstall)
2018-07-09 16:25:55 +02:00
Doc West
467989cdd5
Moved crashcatcher to a component and also use it in CS
...
Reworked debugger detection (failed on gdb 7.11), it now uses /proc to detect the debugger
2018-07-09 16:25:55 +02:00
AnyOldName3
85aba2e1da
Add toggleable shadow debug overlay.
2018-06-28 17:24:36 +01:00
Andrei Kortunov
359e748c28
Initialize some missing fields in constructors
2018-06-25 09:35:42 +04:00
AnyOldName3
f8e4f3fca5
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-06-22 00:11:29 +01:00
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
2018-06-20 17:19:48 +02:00
Bret Curtis
3ebebdf3c1
Merge pull request #1751 from wareya/terrainbleeding
...
Fix #4452
2018-06-20 10:20:11 +02:00
AnyOldName3
553094669b
Merge upstream/master (& fix merge conflicts)
2018-06-20 00:11:23 +01:00
AnyOldName3
ed68db5ef9
Fix issue where the camera frustum cropping wouldn't consider where casters might cast shadows, just where they actually were.
2018-06-19 23:48:59 +01:00
Bret Curtis
c1eb9042b3
Merge branch 'master' into terrainbleeding
2018-06-19 13:40:14 +02:00
Andrei Kortunov
5fd3ec1035
Implement unlockable locks with 'lock 0' console command
2018-06-19 14:17:33 +04:00
Nikolay Kasyanov
75d79e98b9
Force software decompression if OPENMW_DECOMPRESS_TEXTURES is set
2018-06-16 12:38:16 +02:00
Nikolay Kasyanov
359f87ab9f
Change imageToSurface to return a unique_ptr to avoid manual surface cleanup
2018-06-16 12:12:32 +02:00
Miloslav Číž
2a23b53515
Merge branch 'drummyfish/openmw-toggleborders'
2018-06-14 15:33:08 +02:00
Miloslav Číž
477e1437d2
Resolve conflicts
2018-06-14 15:30:28 +02:00
Miloslav Číž
34f8eca7bd
Fix indent
2018-06-14 13:43:32 +02:00
Miloslav Číž
ab8de9fa14
Set node mask to cell borders
2018-06-14 13:18:37 +02:00
Miloslav Číž
414e6caafe
Make tb work with distant terrain
2018-06-14 13:14:38 +02:00
Miloslav Číž
f18d57429e
Move cell border management to World
2018-06-14 12:27:22 +02:00
Miloslav Číž
1b8d500c07
Make tb command work again
2018-06-14 12:01:09 +02:00
Miloslav Číž
1fd5ad3e56
Use REAL_SIZE constant
2018-06-14 01:01:22 +02:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360
2018-06-13 21:16:28 +02:00
Bret Curtis
a747318c90
Merge branch 'master' into terrainbleeding
2018-06-13 09:20:49 +02:00
Marc Zinnschlag
48711bbdde
Merged pull request #1592
2018-06-13 08:58:06 +02:00
Miloslav Číž
c3d7ee5a9e
Resolve merge conflicts
2018-06-13 08:22:37 +02:00
wareya
94f695cffc
Fix #4452 and remove dead code
2018-06-12 21:04:27 -04:00
Miloslav Číž
db8aaa74d6
Start cell border debug drawing
2018-06-13 01:48:31 +02:00
Nikolay Kasyanov
224b94c0ce
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8
2018-06-12 20:32:02 +02:00
AnyOldName3
f5b144ef77
Improve bounds calculation for shadow casters outside of the viewing frustum
2018-06-12 17:04:56 +01:00
Marc Zinnschlag
565922f9ad
naked expressions beginning with the member operator were allowed erroneously outside of the console (Fixes issue #2971 )
2018-06-12 17:52:16 +02:00
Marc Zinnschlag
8d0f717e72
Merged pull request #1739
2018-06-12 17:04:41 +02:00
Marc Zinnschlag
90febde783
Merged pull request #1742
2018-06-12 17:03:38 +02:00
Marc Zinnschlag
816a1733dc
Allow comma after Begin and End script instruction ( Fixes #4451 )
2018-06-12 15:29:28 +02:00
Andrei Kortunov
acd3cba5fa
Store previous items in the savegame
2018-06-10 16:21:19 +04:00
wareya
7344323b9e
remove indentation from blank lines
2018-06-09 10:31:51 -04:00
wareya
8f45b0d53a
remove unnecessary conditions
2018-06-09 10:11:43 -04:00
Andrei Kortunov
fba0c155df
Fix assertion fail related to NiLookAtController
2018-06-09 17:07:38 +04:00
Marc Zinnschlag
7d9de93fd3
Merged pull request #1477
2018-06-09 10:52:35 +02:00
Marc Zinnschlag
551a69f1b1
Merged pull request #1559
2018-06-09 10:51:02 +02:00
Marc Zinnschlag
efb4abbb7f
Merged pull request #1623
2018-06-09 10:49:04 +02:00
wareya
6277f5511c
fix #3876 and #3993
2018-06-08 17:52:46 -04:00
Andrei Kortunov
3d0631cfcc
Store last AI package in savegame
2018-06-08 21:53:47 +04:00
Andrei Kortunov
3a0ee78d2b
AiTravel: store mHidden flag in savegame
2018-06-08 21:53:47 +04:00
Andrei Kortunov
fed10e87aa
Store integer actor ID in AI packages (bug #4036 )
2018-06-08 19:57:41 +04:00
Andrei Kortunov
2fada94879
Improve MRK NiStringExtraData handling (bug #4419 )
2018-06-08 15:44:35 +04:00
Marc Zinnschlag
13f7b53b1c
Revert "Don't force DDS file usage ( fixes #1392 )"
...
This reverts commit 90f3ff2da4
.
2018-06-04 17:08:09 +02:00
Bret Curtis
4a2b973052
Merge pull request #1726 from elsid/fix_catch_warnings
...
Fix warnings: catching polymorphic type by value
2018-06-02 19:36:04 +02:00
Capostrophic
eecde340cf
Make weapon health short unsigned ( fixes #4435 )
2018-06-02 15:44:59 +03:00
elsid
dba79f4d4d
Fix warnings: catching polymorphic type by value
...
openmw/apps/openmw/mwworld/worldimp.cpp: In member function ‘virtual bool MWWorld::World::findExteriorPosition(const string&, ESM::Position&)’:
openmw/apps/openmw/mwworld/worldimp.cpp:2650:25: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
catch (std::invalid_argument)
^~~~~~~~~~~~~~~~
openmw/apps/openmw/mwworld/worldimp.cpp:2654:25: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
catch (std::out_of_range)
^~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp: In member function ‘void Gui::NumericEditBox::onEditTextChange(MyGUI::EditBox*)’:
openmw/components/widgets/numericeditbox.cpp:41:21: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
catch (std::invalid_argument)
^~~~~~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp:45:21: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
catch (std::out_of_range)
^~~~~~~~~~~~
2018-06-02 14:28:46 +03:00
AnyOldName3
50fdd0be99
Resolve computed near plane issues with extremely high viewing distances.
2018-05-29 00:52:43 +01:00
AnyOldName3
759e6fb804
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-05-27 15:41:42 +01:00
Thunderforge
c2fff61ccd
Changing so that data changes happen only after the addon is checked
2018-05-26 20:35:28 -05:00
Andrei Kortunov
afae398b5c
Use utf8 lowercase function for journal index to avoid code duplication
2018-05-24 12:53:06 +04:00
Andrei Kortunov
b5374029e5
Implement case-insensitive search in spell window
2018-05-24 12:39:00 +04:00
Marc Zinnschlag
810e4416f6
Merged pull request #1691
2018-05-23 16:56:36 +02:00
Marc Zinnschlag
d92d754834
Merged pull request #1697
2018-05-23 16:01:11 +02:00
Thunderforge
d58cce9c72
Adding WIP code to dynamically change the autocomplete fields
2018-05-22 20:50:31 -05:00
Andrei Kortunov
888c2d9a33
Render default land texture for Wilderness cells with distant terrain
2018-05-22 12:40:01 +04:00
AnyOldName3
2c30bc1b4f
Accidentally fix the one remaing case where shadows look awful while refactoring some stuff.
2018-05-18 22:39:57 +01:00
AnyOldName3
9f0a49c303
Disable CSM when disabled in the settings.
2018-05-17 20:27:10 +01:00
AnyOldName3
84284a60a7
Make CSM shader changes controllable by the setting.
2018-05-17 17:35:55 +01:00
AnyOldName3
5d05aadb37
Begin to let settings toggle between CSM and PSSM
2018-05-17 16:57:01 +01:00
AnyOldName3
7255c266ba
Merge branch 'osgshadow-test-vdsm' into osgshadow-test-dicking-around-with-cascading-shadow-maps
2018-05-16 21:21:05 +01:00
AnyOldName3
fc1aee10f4
Remove function declaration that somehow snuck in.
2018-05-16 21:20:17 +01:00
AnyOldName3
1b30d47d7f
Add a hacky temporary version of cascading shadow maps
2018-05-13 12:56:40 +01:00
AnyOldName3
44b2cf2b7f
Merge upstream.
2018-05-11 19:15:04 +01:00
AnyOldName3
166e7df778
Improve debug HUD frustum
2018-05-11 19:08:42 +01:00
Marc Zinnschlag
b7cce1a665
Merged pull request #1702
2018-05-11 10:11:17 +02:00
Alf Henrik Sauge
d4f278a113
Replacing tab with spaces
2018-05-09 18:02:02 +02:00
Alf Henrik Sauge
feeee50a88
Dropping a separate NPDTstruct12 object and instead use NPDTstruct52
...
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
2018-05-09 00:25:07 +02:00
Marc Zinnschlag
3197ebd8e7
Merged pull request #1694
2018-05-08 12:19:14 +02:00
Andrei Kortunov
1dd36329a3
Load default markers definitions (bug #4410 )
2018-05-05 17:14:33 +04:00
tri4ng1e
f5b7a230fc
ESMReader::close now clears mHeader
2018-05-05 14:40:58 +03:00
AnyOldName3
4547151863
Add the view frustum to the debug HUD (in the most annoying way possible)
2018-05-05 00:08:00 +01:00
Marc Zinnschlag
69c659852d
Merge pull request #1689 )
2018-05-03 13:03:42 +02:00
Andrei Kortunov
6cc7405194
Remove unnecessary command from QuadTreeWorld destructor (bug #4408 )
2018-04-30 18:29:26 +04:00
scrawl
f4cd7ff5b2
Merge pull request #1690
2018-04-29 14:24:56 +00:00
Capostrophic
d967983f5c
Assume Morrowind.esm dependency for dependency-less content addons ( fixes #2829 )
2018-04-29 14:56:38 +03:00
Andrei Kortunov
5afcc56860
Handle NiLookAtController (feature #4407 )
2018-04-29 09:24:13 +04:00
scrawl
55a6344fb0
Revert log spam
2018-04-22 15:41:25 +00:00
Evgeny Kurnevsky
48fb6bb9e8
Fix crash when rollDice is called with 0.
2018-04-21 16:46:36 +03:00
scrawl
1f1f47431f
Merge pull request #1672
2018-04-19 13:36:40 +00:00
Capostrophic
48467814d4
Improve random number generation
2018-04-19 15:55:26 +03:00
scrawl
ce1b2a612c
Merge pull request #1674
2018-04-18 15:56:22 +00:00
Capostrophic
90f3ff2da4
Don't force DDS file usage ( fixes #1392 )
...
Fallback to a DDS file if the requested texture path doesn't point to an existing file, not vice versa
2018-04-18 17:55:12 +03:00
tri4ng1e
d310d36ea3
[Fix] Some PVS-Studio and cppcheck fixes
2018-04-18 12:36:10 +00:00
tri4ng1e
d4d1703bcf
Some PVS-Studio and cppcheck fixes
...
cppcheck:
[apps/esmtool/record.cpp:697]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1126]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1138]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/niftest/niftest.cpp:36]: (performance) Function parameter 'filename' should be passed by reference.
[apps/niftest/niftest.cpp:41]: (performance) Function parameter 'filename' should be passed by reference.
[apps/opencs/model/prefs/boolsetting.cpp:25]: (warning) Possible leak in public function. The pointer 'mWidget' is not deallocated before it is allocated.
[apps/opencs/model/prefs/shortcuteventhandler.cpp:52]: (warning) Return value of std::remove() ignored. Elements remain in container.
[apps/openmw/mwstate/quicksavemanager.cpp:5]: (performance) Variable 'mSaveName' is assigned in constructor body. Consider performing initialization in initialization list.
PVS-Studio:
apps/opencs/model/filter/parser.cpp 582 warn V560 A part of conditional expression is always true: allowPredefined.
apps/opencs/view/world/referencecreator.cpp 67 warn V547 Expression '!errors.empty()' is always false.
apps/opencs/view/world/referencecreator.cpp 74 warn V547 Expression '!errors.empty()' is always false.
apps/opencs/view/doc/loader.cpp 170 warn V560 A part of conditional expression is always true: !completed.
apps/opencs/view/doc/loader.cpp 170 warn V560 A part of conditional expression is always true: !error.empty().
apps/opencs/model/tools/pathgridcheck.cpp 32 err V517 The use of 'if (A) {...} else if (A) {...}' pattern was detected. There is a probability of logical error presence. Check lines: 32, 34.
apps/opencs/model/world/refidadapterimp.cpp 1376 err V547 Expression 'subColIndex < 3' is always true.
apps/openmw/mwgui/widgets.hpp 318 warn V703 It is odd that the 'mEnableRepeat' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:318, MyGUI_ScrollBar.h:179.
apps/openmw/mwgui/widgets.hpp 319 warn V703 It is odd that the 'mRepeatTriggerTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:319, MyGUI_ScrollBar.h:180.
apps/openmw/mwgui/widgets.hpp 320 warn V703 It is odd that the 'mRepeatStepTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:320, MyGUI_ScrollBar.h:181
apps/openmw/mwmechanics/actors.cpp 1425 warn V547 Expression '!detected' is always true.
apps/openmw/mwmechanics/character.cpp 2155 err V547 Expression 'mode == 0' is always true.
apps/openmw/mwmechanics/character.cpp 1192 warn V592 The expression was enclosed by parentheses twice: ((expression)). One pair of parentheses is unnecessary or misprint is present.
apps/openmw/mwmechanics/character.cpp 521 warn V560 A part of conditional expression is always true: (idle == mIdleState).
apps/openmw/mwmechanics/pathfinding.cpp 317 err V547 Expression 'mPath.size() >= 2' is always true.
apps/openmw/mwscript/interpretercontext.cpp 409 warn V560 A part of conditional expression is always false: rank > 9.
apps/openmw/mwgui/windowbase.cpp 28 warn V560 A part of conditional expression is always true: !visible.
apps/openmw/mwgui/journalwindow.cpp 561 warn V547 Expression '!mAllQuests' is always false.
apps/openmw/mwgui/referenceinterface.cpp 18 warn V571 Recurring check. The '!mPtr.isEmpty()' condition was already verified in line 16.
apps/openmw/mwworld/scene.cpp 463 warn V547 Expression 'adjustPlayerPos' is always true.
apps/openmw/mwworld/worldimp.cpp 409 err V766 An item with the same key '"sCompanionShare"' has already been added.
apps/openmw/mwworld/cellstore.cpp 691 warn V519 The 'state.mWaterLevel' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 689, 691.
apps/openmw/mwworld/weather.cpp 1125 warn V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1123, 1125.
apps/openmw/mwworld/weather.cpp 1137 warn V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1135, 1137.
apps/wizard/unshield/unshieldworker.cpp 475 warn V728 An excessive check can be simplified. The '(A && B) || (!A && !B)' expression is equivalent to the 'bool(A) == bool(B)' expression.
apps/wizard/installationpage.cpp 163 warn V735 Possibly an incorrect HTML. The "</p" closing tag was encountered, while the "</span" tag was expected.
components/fontloader/fontloader.cpp 427 err V547 Expression 'i == 1' is always true.
components/nifosg/nifloader.cpp 282 warn V519 The 'created' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 278, 282.
components/esm/loadregn.cpp 119 err V586 The 'clear' function is called twice for deallocation of the same resource. Check lines: 112, 119.
components/esm/cellref.cpp 178 warn V581 The conditional expressions of the 'if' statements situated alongside each other are identical. Check lines: 175, 178.
components/esmterrain/storage.cpp 235 warn V560 A part of conditional expression is always true: colStart == 0.
components/esmterrain/storage.cpp 237 warn V560 A part of conditional expression is always true: rowStart == 0.
2018-04-18 12:36:10 +00:00
scrawl
6c79c0fb35
Add an empty compileGLObjects implementation to Rig/MorphGeometry to avoid unnecessary creation of display list done by osg
2018-04-18 12:36:08 +00:00
Andreas Sturmlechner
2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
2018-04-17 23:03:56 +02:00
scrawl
ef050d7869
Merge pull request #1660
2018-04-09 20:23:27 +00:00
scrawl
e73af18824
Merge pull request #1653
2018-04-02 17:29:04 +00:00
elsid
14daadded7
Add virtual destructors
...
To fix warnings:
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:588:8: warning: delete called on non-final 'NifOsg::ControllerFunction' that has virtual functions but non-virtual destructor
[-Wdelete-non-virtual-dtor]
delete __p;
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:595:4: note: in instantiation of function template specialization
'std::__shared_count<__gnu_cxx::_S_atomic>::__shared_count<NifOsg::ControllerFunction *>' requested here
: __shared_count(__p)
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:1079:17: note: in instantiation of function template specialization
'std::__shared_count<__gnu_cxx::_S_atomic>::__shared_count<NifOsg::ControllerFunction *>' requested here
: _M_ptr(__p), _M_refcount(__p, typename is_array<_Tp>::type())
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr.h:129:25: note: in instantiation of function template specialization 'std::__shared_ptr<NifOsg::ControllerFunction,
__gnu_cxx::_S_atomic>::__shared_ptr<NifOsg::ControllerFunction, void>' requested here
shared_ptr(_Yp* __p) : __shared_ptr<_Tp>(__p) { }
^
/home/elsid/dev/openmw/components/nifosg/nifloader.cpp:242:39: note: in instantiation of function template specialization 'std::shared_ptr<NifOsg::ControllerFunction>::shared_ptr<NifOsg::ControllerFunction, void>' requested here
callback->setFunction(std::shared_ptr<NifOsg::ControllerFunction>(new NifOsg::ControllerFunction(key)));
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/unique_ptr.h:78:2: warning: delete called on non-final 'MWGui::ResponseCallback' that has virtual functions but non-virtual destructor
[-Wdelete-non-virtual-dtor]
delete __ptr;
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/unique_ptr.h:268:4: note: in instantiation of member function 'std::default_delete<MWGui::ResponseCallback>::operator()' requested here
get_deleter()(__ptr);
^
/home/elsid/dev/openmw/apps/openmw/mwgui/dialogue.cpp:58:23: note: in instantiation of member function 'std::unique_ptr<MWGui::ResponseCallback, std::default_delete<MWGui::ResponseCallback> >::~unique_ptr' requested here
PersuasionDialog::PersuasionDialog(ResponseCallback* callback)
^
2018-04-01 21:51:59 +03:00
Capostrophic
1aa3ed0c18
Font loader fallback character reorganization ( fixes #1987 )
2018-03-31 20:16:44 +03:00
Capostrophic
be542507f8
Make hasMaster() behavior consistent with isGameFile() ( fixes #3618 )
2018-03-28 15:43:51 +03:00
bret curtis
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
2018-03-27 20:20:40 +02:00
scrawl
eb723f5ae6
Merge pull request #1629
2018-03-16 23:26:50 +00:00
Capostrophic
002ad9ae1b
Print a warning in case a fallback value wasn't found
2018-03-14 00:25:56 +03:00
Capostrophic
e4531a6910
Use middle gray instead of pure black as default fallback color ( Fixes #2841 )
2018-03-12 23:38:59 +03:00
scrawl
e81faf5f2f
Add an option to disable GUI keyboard navigation (Bug #4333 )
2018-03-08 23:39:35 +00:00
Harald H
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
2018-03-08 21:23:24 +01:00
AnyOldName3
e885612bd7
Make a dynamic cast static
2018-03-03 02:05:46 +00:00
AnyOldName3
b553b58de5
Fix another compiler warning
2018-03-03 02:03:16 +00:00
AnyOldName3
3bed2a7b01
Fix some copiler warnings (hopefully)
2018-03-03 02:01:03 +00:00
AnyOldName3
fc41902798
Replace a dynamic cast with string comarison
2018-03-01 14:37:11 +00:00
AnyOldName3
bc4b4c66e4
(Hopefully) add include which G++ requires even though VC++ doesn't.
2018-02-27 16:54:48 +00:00
AnyOldName3
d1a2955fa1
Merge upstream
2018-02-27 14:29:14 +00:00
AnyOldName3
66a114d6ec
Fix a couple of warnings
2018-02-27 14:15:06 +00:00
AnyOldName3
f9cf1ac94b
Separate indoor and outdoor shadow casting masks.
2018-02-27 00:13:51 +00:00
AnyOldName3
35eb71052e
Tidy up the shadow manager
2018-02-26 23:52:46 +00:00
AnyOldName3
882b63cba9
Make split point control parameters configurable with the new shadow technique.
2018-02-26 23:00:46 +00:00
AnyOldName3
e233dae1cd
Hook up the new shadow technique
2018-02-26 22:27:09 +00:00
AnyOldName3
97b607fc66
Make whitespace match upstream OSG
2018-02-26 21:10:06 +00:00
AnyOldName3
99db93510c
Undo minor cockup where the same file appeared twice
2018-02-26 21:09:29 +00:00
AnyOldName3
639a4f5e8c
Remove TODO left in by accident. Also, become 100 commits ahead of upstream.
2018-02-26 20:52:19 +00:00
AnyOldName3
478367bef3
Ensure the debug HUD won't crash if settings are changed at runtime.
2018-02-26 20:50:54 +00:00
AnyOldName3
7b52091a82
Make the debug hud enableable
2018-02-26 20:36:43 +00:00
AnyOldName3
5d719e9d5f
Add the debug HUD to the new shadow technique
2018-02-26 20:20:01 +00:00
AnyOldName3
76f23c28b1
Make shadows disableable.
2018-02-26 16:25:44 +00:00
AnyOldName3
0f1e770c53
Transfer changes to cull to new shadow technique
2018-02-26 15:51:22 +00:00
AnyOldName3
4c31b38f77
Move CLSB changes to new shadow technique
2018-02-26 14:58:12 +00:00
AnyOldName3
06b2ce6646
Fix alignment issues caused by renaming classes
2018-02-26 14:34:14 +00:00
AnyOldName3
02d0ee3485
Rename old shadow class to shadow manager
2018-02-26 14:29:31 +00:00
AnyOldName3
ce02c83089
Copy debug shader source into new shadow technique
2018-02-26 14:27:47 +00:00
Miloslav Číž
db6107f12f
Merge branch 'master' into screenshot360
2018-02-25 11:25:19 +01:00
AnyOldName3
7bd4c5e4b3
Change class name
2018-02-24 00:57:58 +00:00
AnyOldName3
c815366044
Move to the correct namespace part 2
2018-02-24 00:55:24 +00:00
AnyOldName3
11e59d3c11
Move to the correct namespace.
2018-02-24 00:52:46 +00:00
AnyOldName3
324b398d29
Add a notice clarifying the source of the shadow technique files.
2018-02-24 00:15:54 +00:00
AnyOldName3
7467248555
Undo a modification from the upstream shadow technique which breaks compatibiltiy with OSG 3.4
2018-02-24 00:14:29 +00:00
AnyOldName3
273914aba8
Add osgShadow ViewDependentShadowMaps as they can be found in OSG's GitHub Repository
2018-02-24 00:13:05 +00:00
AnyOldName3
9ec59783ba
Add basic support for distant terrain CLSB
...
(cherry picked from commit 0f9dc3e65b72e6fff762f7a0933bae6f861e5fd4)
2018-02-23 23:37:04 +00:00
AnyOldName3
cb6767b4fc
Move the declaration of ComputeLightSpaceBounds to the header so that it can be accessed from other compilation units.
...
(cherry picked from commit 8ac4fb208897a18da4934dd6f2fe84560b44ba9d)
2018-02-23 23:35:01 +00:00
AnyOldName3
6251e0519e
Use CLSB results to reduce maximum shadow map distance when sensible.
2018-02-23 23:31:53 +00:00
scrawl
9b8c56761b
Fix timing error
2018-02-13 18:25:28 +00:00
Alexander "Ananace" Olofsson
145b47a550
Fix Windows builds
...
`std::min`/`std::max` are part of algorithm, which is not implicitly included in Windows builds
2018-02-13 17:47:38 +01:00
scrawl
ac1609c433
Merge pull request #1604
2018-02-13 00:56:06 +00:00
scrawl
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting
2018-02-13 00:40:41 +00:00
uramer
5502790ed9
removed the unnecessary comment
2018-02-09 16:34:55 +01:00
uramer
86c25f5dba
Removed NIF flag handling to replicate vanilla engine behaviour
2018-02-09 01:53:52 +01:00
scrawl
25a6a67508
Fix the optimizer messing up LOD node's children ( Fixes #4301 )
2018-01-29 19:44:12 +00:00
scrawl
89c6b59c30
Merge pull request #1602
2018-01-28 22:35:47 +00:00
Ilya Zhuravlev
9e9f6f3132
loadtes3: don't pack() non-POD structs
2018-01-26 21:35:51 -05:00
AnyOldName3
9f20aaccfb
Add some more advanced settings to control shadows.
2018-01-25 16:08:34 +00:00
AnyOldName3
6ec893b618
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-01-22 15:54:13 +00:00
AnyOldName3
112ade2a3f
Ensure TerrainDrawables affect the computed near/far planes.
2018-01-22 15:52:37 +00:00
Ilya Zhuravlev
359910762d
GraphicsWindowSDL2: support setting up GLESv2 context for android
2018-01-18 17:11:22 -05:00
Ilya Zhuravlev
a038327521
SDLCursorManager: fix possibly invalid read when no cursor present
...
On android we have no cursor so I moved the check closer to usage
2018-01-17 23:03:11 -05:00
Bret Curtis
588c1df0f0
Merge pull request #1599 from xyzz/android
...
Update android port.
2018-01-16 11:12:21 +01:00
Ilya Zhuravlev
d2121ccd62
Update android port.
2018-01-16 00:11:27 -05:00
scrawl
047c44f265
Ignore duplicate data directories to work around the fallout of ( Fixes #3557 )
2018-01-14 00:25:20 +00:00
scrawl
259919d125
Print a warning when an ambiguous file on a case-sensitive file system is found
2018-01-14 00:23:29 +00:00
Marc Zinnschlag
2dff3aab22
allow . and - in the name part of a begin script statement, but not at the beginning of a name. Fixes #4061
2018-01-12 16:37:06 +01:00
scrawl
bba9a8dd91
Don't update off-screen animations
...
Make flying creatures animate in-place when out of processing range
2018-01-11 01:49:35 +00:00
AnyOldName3
bf9a1ded63
Mark a function as override
2018-01-02 16:39:05 +00:00
Bret Curtis
93f14c219c
camelCase
2018-01-01 16:32:20 +01:00
Bret Curtis
7a7b040216
fix building on mips machines
2018-01-01 14:10:23 +01:00
scrawl
c920f95d1e
Don't incorrectly discard root node transformation ( Fixes #4272 )
2017-12-31 23:49:43 +00:00
AnyOldName3
c3e0398d1c
Add settings
2017-12-27 02:32:17 +00:00
AnyOldName3
c192c851db
Make disabling shadows disable their performance impact, too.
2017-12-26 23:51:50 +00:00
AnyOldName3
b08938485f
Make suspending viewer threads the responsibility of the caller, not the shader manager.
2017-12-17 23:55:19 +00:00
AnyOldName3
229cc9696f
Make updating global shader defines update shaders.
2017-12-17 01:57:53 +00:00
AnyOldName3
8957c92a36
Switch to a more industry-standard shadow map splitting scheme
2017-12-17 00:52:10 +00:00
AnyOldName3
7cce2d6f87
Implement a more sensible shadow map cascading system
2017-12-12 22:37:40 +00:00
AnyOldName3
0e481a457e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2017-12-08 23:26:08 +00:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
2017-11-29 22:37:50 +00:00
AnyOldName3
974e4d5299
Add check for null shaders when releasing OpenGL objects
2017-11-24 22:43:40 +00:00
Andrei Kortunov
94c0e3ed10
Move toUpper() from StringUtils to the JournalViewModel
2017-11-23 19:37:45 +04:00
AnyOldName3
98cd9fc144
Add preliminary support for global shader defines.
2017-11-22 20:07:07 +00:00
AnyOldName3
7a9df977c7
Add some prerequisits for making shadows disableable
2017-11-21 17:20:57 +00:00
AnyOldName3
166ba22072
Prevent line count changes within conditional blocks (because of conditional includes or @foreach expansion) ruining line numbering.
2017-11-21 16:53:12 +00:00
Andrei Kortunov
67acb83b62
Add missing include
2017-11-21 13:27:33 +04:00
Andrei Kortunov
5f41f7c48d
Clean code up a bit
2017-11-21 13:03:38 +04:00
Andrei Kortunov
ba91cd658b
Convert topic name to Unicode
2017-11-21 12:31:23 +04:00
Andrei Kortunov
f0ca3eabd3
Merge from upstream master
2017-11-21 09:39:54 +04:00
scrawl
9fda3b6db4
Fix NumericEditBox behavior broken by switch to std::stoi
...
For some reason stoi doesn't throw an error for '1foo' while 'foo1' does.
Now the edit box flat out rejects any non-digit key events.
2017-11-20 23:20:03 +00:00
Andrei Kortunov
a391990f2a
Provide multibyte toLower() and single chars comparator
2017-11-20 21:30:46 +04:00
AnyOldName3
0f6f097cf2
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-11-17 18:24:08 +00:00
AnyOldName3
3d18ddc8e4
Take into account previous #line directives when expanding @foreach shader macros
2017-11-17 17:18:33 +00:00
Miloslav Číž
3ae5310567
use loading screen to freeze the screen
2017-11-16 22:08:33 +01:00
Alexander Stillich
93e9df15c9
Fixed parameter naming
2017-11-11 22:58:02 +00:00
Alexander Stillich
52b3507a2b
Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all
2017-11-11 22:58:02 +00:00
Alexander Stillich
09aac22782
Added StringUtil::replaceAll()
2017-11-11 22:58:01 +00:00
Alexander Stillich
92aaff3b78
Fixed escaping @ in boost program options filter
2017-11-11 22:57:59 +00:00
Miloslav Číž
e804c4a011
remove no longer used method
2017-11-11 13:54:14 +01:00
scrawl
a5ba1caed1
Merge pull request #1541 from astillich/4189
...
Fixed escaping @ in boost program options filter
2017-11-10 23:08:54 +00:00
scrawl
a5adc5b018
Add NPC base skeleton files to the optimizer blacklist ( Fixes #4159 )
2017-11-10 22:51:32 +00:00
AnyOldName3
590531595b
Create @foreach shader preprocessor macro in preparation for moving shadow setup out of shadermanager.cpp
2017-11-10 02:02:27 +00:00
Miloslav Číž
d763e9fe46
add settings for spherical screenshots
2017-11-09 20:25:29 +01:00
AnyOldName3
6e0b61d084
Add missing libraries to components target
2017-11-08 04:09:14 +00:00
AnyOldName3
e201e359a9
Move Shadow to Components
2017-11-08 01:44:49 +00:00
AnyOldName3
1a30a917af
Merge upstream/master
2017-11-08 01:31:38 +00:00
AnyOldName3
aa31cbba4f
Attempt (and fail) to make the local map show without unwanted shadow
2017-11-08 01:20:52 +00:00
scrawl
244cc5b861
Reduce error spam
2017-11-08 00:24:03 +00:00
scrawl
7b4add2ae4
Fall back to non-shader material if creating the shader fails
...
Also fixes an uncaught exception that will break the whole game.
2017-11-08 00:24:03 +00:00
Alexander Stillich
43b5c2e36b
Fixed parameter naming
2017-11-07 23:20:10 +01:00
Alexander Stillich
70d578d050
Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all
2017-11-07 23:10:58 +01:00
Alexander Stillich
af3e1f92ec
Added StringUtil::replaceAll()
2017-11-07 23:06:23 +01:00
AnyOldName3
715f29165b
Dynamically adjust shaders to have the required number of shadow maps.
2017-11-07 20:22:45 +00:00
Alexander Stillich
7d39c5450c
Fixed escaping @ in boost program options filter
2017-11-05 22:14:16 +01:00
scrawl
ceaf0ee409
Enable shadow casting for terrain
...
Add a check to TerrainDrawable to make sure shadows are only drawn once, not once per blending pass
2017-10-31 21:21:05 +01:00
David Walley
41dc82abad
Update Links to Documentation in settings.cfg files ( #1523 )
...
* Update settings-default.cfg
* Update settings.cpp
2017-10-28 16:05:30 +00:00
AnyOldName3
c1a871ff1f
Make indentation consistent.
2017-10-24 23:31:40 +01:00
AnyOldName3
daf7d8451c
Switch to a more reliable method of passing the git-version targt the data it needs
2017-10-24 23:29:18 +01:00
AnyOldName3
e3142b9643
Add missing variables to those forwarded to the git-version target
2017-10-24 23:10:50 +01:00
scrawl
0c6ef17fb5
Add explicit variant of 'OnActivate'
2017-10-23 23:33:06 +00:00
Marcin Baszczewski
46b015d3d9
Fix assert with empty setting value
...
Local value could be empty, so it's important to check it size before read first char.
2017-10-22 10:10:04 +02:00
Marc Zinnschlag
bdabace7e2
Merge remote-tracking branch 'aesylwinn/LLmerge'
2017-10-19 14:24:58 +02:00
scrawl
7f8d996eff
Merge pull request #1502 from AnyOldName3/launcher-and-wizard-ampersand-escape-support
...
Launcher and wizard ampersand escape support
2017-10-16 21:09:04 +00:00
scrawl
136ef1f738
Fix incomplete settings in recreateShaders()
2017-10-15 17:24:23 +02:00
scrawl
03554b2f4b
Fix some style issues flagged by cppcheck
2017-10-15 17:06:58 +02:00
scrawl
50d7eb8e54
Fix crash when adding a NULL object to the cache
2017-10-15 17:06:58 +02:00
scrawl
97ec38affb
Merge pull request #1492 from drummyfish/master
...
fix rain/snow moving with player (issue #2698 )
2017-10-15 09:04:48 +00:00
AnyOldName3
49dbb4a9ca
Add a third copy of a comment where I felt clarification was missing
2017-10-15 02:05:22 +01:00
AnyOldName3
7329e6a9ef
Load 'data=...' lines correctly when starting the wizard or launcher, and save them correctly when exiting the launcher.
2017-10-15 01:59:21 +01:00
AnyOldName3
28ff677337
Save 'data=...' lines correctly when exiting the wizard
2017-10-15 00:07:46 +01:00
Miloslav Číž
65977b910e
wrap weather around in all directions
2017-10-14 21:42:27 +02:00
Miloslav Číž
380a5799dd
use bbox as wrap range & apply to all particle systems
2017-10-14 21:42:19 +02:00
Miloslav Číž
33a1459b11
search for particle system by class name
2017-10-14 21:41:47 +02:00
Kyle Cooley
11eae16645
Get rid of duplicate function, fix flag checking
2017-10-14 15:09:12 -04:00
scrawl
5fbdb64bb9
Add OPENMW_DECOMPRESS_TEXTURES environment variable to decompress textures in software if not supported by graphics hardware
...
Disabled by default due to requiring new functionality that was just added to OSG 3.6 or OpenMW/OSG.
2017-10-14 18:28:46 +00:00
scrawl
f3ca9832b0
Merge pull request #1500 from akortunov/extraspell
...
Implement ExtraSpell magic effect
2017-10-14 14:01:49 +00:00
Andrei Kortunov
30b05b557b
ExtraSpell magic effect: a basic implementation
2017-10-14 16:55:00 +04:00
AnyOldName3
c9e86a8ebc
Remove superfluous argument
2017-10-12 18:16:44 +01:00
AnyOldName3
f9a3562ccd
Remove duplicate macro definition and fix warning
2017-10-12 02:45:50 +01:00
AnyOldName3
2652a89df4
Fix mismatched indentation that apparently the .editorconfig file doesn't handle automatically
2017-10-11 22:10:52 +01:00
AnyOldName3
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
2017-10-11 21:58:55 +01:00
Marc Zinnschlag
dd17f70068
Merge remote-tracking branch 'aesylwinn/landrecords'
2017-10-03 13:32:02 +02:00
scrawl
64e27c032b
Merge pull request #1481 from scrawl/keyfocus
...
WindowManager overhaul & improved keyboard support
2017-09-28 22:34:05 +00:00
scrawl
44720bf41a
Allow MWList items to retain key focus
2017-09-27 12:56:00 +00:00
scrawl
b9341925f2
Set AutoSizedEditBox as Static by default
...
Would look very odd anyway to use it for editable text, with the widget resizing as you type.
2017-09-27 12:55:53 +00:00
scrawl
c88c535e0e
Fix HBox/VBox not using Client widget with MyGUI <= 3.2.2
2017-09-27 12:55:50 +00:00
scrawl
be7bdec2ed
Merge pull request #1471 from crussell187/nif_stream_optimization
...
first pass on optimization of nif parsing functions from the file stream
2017-09-25 22:43:34 +00:00
scrawl
19e07fad30
Remove redundant Services enum
2017-09-25 19:52:20 +02:00
scrawl
82a211ba03
Fix duplicate code
2017-09-25 17:47:30 +02:00
scrawl
76ddf8d794
Support Up/DownArrow keys to change NumericEditBox value
2017-09-25 00:47:07 +02:00
scrawl
1ad14b232f
Adjust ImageButton to accept key focus and use the 'highlighted' texture
2017-09-24 19:08:11 +02:00
scrawl
e7ad012977
Pass repeat key events to the GUI
...
For example, one can scroll to the last element in a list by holding down the 'Down Arrow' key.
2017-09-24 19:08:11 +02:00
scrawl
2494c22d66
Merge pull request #1470 from MiroslavR/convertmprj
...
ESS-Importer: Convert magic projectiles
2017-09-23 22:55:56 +00:00
825de71b29
removed an iostream include used for debug prints from nifstream.hpp
2017-09-23 11:10:05 -05:00
30a213a9b3
updates for nifstream optimization including fixing the non-x86 path for little endian reads
2017-09-22 21:08:25 -05:00
8834066dea
make streaming to a type array in nif a direct copy from the file into the vector
2017-09-21 23:47:09 -05:00
090a8408b8
made nif basic type read optimizations more portable
2017-09-21 22:37:19 -05:00
c72aa19d6d
first pass on optimization of nif parsing functions from the file stream
2017-09-20 23:53:12 -05:00
scrawl
58f9688433
Use client coordinates in HBox/VBox
2017-09-20 22:24:19 +00:00
scrawl
fb975d02db
Use client coordinates in HBox/VBox
2017-09-20 22:41:50 +02:00
MiroslavR
f15de6d3ca
ESS-Importer: Convert magic projectiles ( Closes #2320 )
2017-09-20 18:58:56 +02:00
Chris Robinson
021627bdf8
Mark some functions with override
...
Fixes some Clang warnings about overriding a virtual function without the
override keyword.
2017-09-18 01:51:11 -07:00
Kyle Cooley
50d9d9f78f
Get rid of some templates, exceptions instead of assert, and other small changes.
2017-09-17 20:29:51 -04:00
Andrei Kortunov
4bb349a525
Use default 0 precision in the float formatting (bug #4096 )
2017-09-17 15:07:04 +04:00
Kyle Cooley
2abf7f1752
Remove unnecessary cache dump
2017-09-15 12:19:12 -04:00
Kyle Cooley
09e645a0e0
Fix careless mistake.
2017-09-09 23:18:09 -04:00
Kyle Cooley
25d4a0370f
Changes to land data access in tables, also update Land once per frame in scene view.
2017-09-09 15:37:52 -04:00
Kyle Cooley
d030b595f8
Fix potential segfault, cleanup, get rid of warnings.
2017-09-09 11:48:13 -04:00
Kyle Cooley
72cb405de2
Some bug fixes, changes to land load code.
2017-09-08 21:03:52 -04:00
Kyle Cooley
2eacc2f093
Changes to land creation, add ability to specifically clear terrain cache
2017-09-08 14:37:03 -04:00
Kyle Cooley
ab607f3028
Tweaks to land loading, land cloning, terrain signals, placeholder land update handling
2017-09-08 00:51:46 -04:00
Andrei Kortunov
538498230b
Declare mClient variable
2017-09-06 15:59:54 +04:00
scrawl
dca31b7ffa
Remove redundant _boundingBoxComputed which no longer exists in osg master ( Fixes #4075 )
2017-09-04 19:35:42 +00:00
Kyle Cooley
d3014cf394
Temporary fix for adding new lands, cloned lands will still reference old data though
2017-09-04 15:13:45 -04:00
Kyle Cooley
7cc95a11a4
Add more land table columns
2017-09-03 20:00:19 -04:00
scrawl
2e58024f1c
Fix intersections with Rig/MorphGeometry, was caused by an issue in the LineSegmentIntersector not respecting the cullingActive flag of a drawable.
2017-09-03 14:14:15 +00:00
scrawl
5e790b567e
Fix node path issue
...
Needs to be set so that the 'cullingActive' flag of the node path's end can be checked
2017-09-01 22:12:40 +00:00
scrawl
4bef8260ab
Add const qualifiers
2017-09-01 21:42:36 +00:00
scrawl
5d524a6a10
Add custom version of MorphGeometry replacing osgAnimation
...
Double buffering, custom bounding box and the update in the cull visitor (instead of update) are now all handled internally rather than needing hacks and/or callbacks.
2017-09-01 21:42:36 +00:00
scrawl
f1ebb129c1
Fix ShaderVisitor to deal with the fact RigGeometry no longer derives from Geometry
2017-09-01 21:42:35 +00:00
scrawl
209e139aa8
Move double buffering implementation inside RigGeometry
...
The double buffering is an implementation detail so it should be handled as such, rather than mandating the scene graph to be structured in a certain way.
Override accept(NodeVisitor&) instead of using callbacks.
2017-09-01 21:42:34 +00:00
Kyle Cooley
9e41f1340a
Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture
2017-08-31 22:09:49 -04:00
scrawl
45f7563a55
Revert "Revert "Check for a Geometry node when attaching bodyparts""
...
Issue with shaders has been fixed with b9931fb71c
This reverts commit a1e3fb7604
.
2017-08-31 21:40:35 +00:00
scrawl
b9931fb71c
Set the shader on the node containing the StateSet
2017-08-31 21:39:21 +00:00
scrawl
a1e3fb7604
Revert "Check for a Geometry node when attaching bodyparts"
...
This reverts commit 3fc8634206
.
2017-08-29 22:40:19 +00:00
scrawl
3fc8634206
Check for a Geometry node when attaching bodyparts ( Fixes #3957 )
2017-08-29 12:55:42 +00:00
scrawl
bc82c6a35d
Use white color if told to use nonexisting vertexcolors ( Fixes #3833 )
2017-08-27 21:22:44 +00:00
scrawl
5d2fe5e887
Implement lightmode/vertmode of NiVertexColorProperty
2017-08-27 21:22:17 +00:00
scrawl
4fba157d3b
Implement releaseGLObjects for cached resources
2017-08-26 19:29:12 +00:00
Kyle Cooley
d3d04171f9
Fix seg fault, undo changes BsaArchive
2017-08-22 15:06:56 -04:00
Kyle Cooley
8c4b12a603
VFS changes, one VFS and resource system per document.
...
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
2017-08-21 22:31:19 -04:00
Kyle Cooley
979b0d7211
Code cleanup and more cache clearing
2017-08-21 18:58:38 -04:00
Kyle Cooley
679a284735
Use scoped lock instead of directly locking/unlocking mutex
2017-08-21 13:33:11 -04:00
Kyle Cooley
3b9326d238
Clear terrain cache and reload terrain
2017-08-20 22:34:41 -04:00
Kyle Cooley
b62cb0e2a4
Clear out GPU texture/stateset cache
2017-08-20 19:55:16 -04:00
Kyle Cooley
7914fd5c9c
Re-index BSAs
2017-08-20 19:36:21 -04:00
Kyle Cooley
d7744e8b16
A bit of cleanup
2017-08-20 19:07:23 -04:00
Kyle Cooley
5950b26912
Update scene assets
2017-08-19 19:36:45 -04:00
Kyle Cooley
742bd00ec6
Clear cached resources
2017-08-19 15:26:46 -04:00
Kyle Cooley
d31ed83b54
Preliminary asset reloading
2017-08-19 03:43:31 -04:00
Thunderforge
54fe645703
Removing erroneous comment since Qt is not relevant here
2017-08-09 23:12:43 -05:00
Thunderforge
464c64a306
Swap the OIS Ctrl and Meta keys on macOS to match Qt
2017-08-09 20:03:27 -05:00
scrawl
cef415509f
Revert "Merge redundant input events"
2017-08-06 20:54:20 +00:00
Julian
3cfd9af945
merge redundant input events
2017-08-02 18:54:16 +02:00
scrawl
c9d9461d3e
Add Spacer class derived from AutoSizedWidget
...
Using a normal widget as a spacer with HStretch/VStretch may not work properly because for widgets not derived from AutoSizedWidget, the HBox/VBox treat the widget's current size as the requested minimum size. This leads the layout to break when resized more than once.
The new class sets HStretch and VStretch to true by default to save some typing.
2017-07-31 16:20:29 +02:00
PlutonicOverkill
5049fe4320
Pause game when minimised on Windows
2017-07-20 21:31:05 +12:00
scrawl
3e03a0d7bd
Terrain: remove ref argument that is now always true
2017-07-19 16:24:35 +02:00
scrawl
ac78d01b2b
Terrain: use the main camera's viewpoint for intersection tests
...
Fixes lag spikes caused by intersection tests loading/unloading terrain pages.
2017-07-19 13:11:44 +02:00
scrawl
ffb6dff6aa
Merge pull request #1338 from akortunov/valuefix
...
Change mValue type for clothes to unsigned short (bug #3960 )
2017-07-18 10:13:51 +00:00
Andrei Kortunov
2bd105f5e2
Change mValue type for clothes to unsigned short ( fixes #3960 )
2017-07-18 11:51:19 +04:00
scrawl
40dc1dd6f5
Fix checking a variable before it's assigned (Bug #3950 )
2017-07-10 23:50:24 +02:00
scrawl
be940656db
Add '0' as an alias for 'OFF' for OPENMW_OPTIMIZE
2017-07-10 23:49:42 +02:00
scrawl
54bb1b13cb
Change NCO/NCC flags to NC* ( Fixes #3915 )
2017-06-20 00:36:17 +02:00
Allofich
42402976e3
Fixes for building in MSVC
2017-06-13 19:38:12 +09:00
Bret Curtis
c6805314c2
be explicit about what we are trying to catch instead of catching everything and fixed up formatting
...
use Allman style brackets not K&R style, additional formatting for fallback.cpp which needed some love
revert allman formatting changes
2017-06-12 00:32:29 +02:00
Bret Curtis
7c758a6293
std::stof can not handle comma in us localization and can not handle period in french localization, using std::replace is not a solution, going back to boost::lexical_cast
2017-06-12 00:32:28 +02:00
Bret Curtis
f0b21cca22
use own inline hash_combine function
2017-06-12 00:32:28 +02:00
David Carlier
8a5c62de97
needs this head for getuid
2017-06-10 14:50:43 +01:00
Bret Curtis
c781d1f8ed
purge unnecessary imports
...
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
2017-06-09 19:08:53 +02:00
Bret Curtis
154d7cffa2
replace and purge boost::function
2017-06-09 19:08:53 +02:00
Bret Curtis
d48b829b45
replace and purge boost::lexical_cast
2017-06-09 19:08:53 +02:00
Bret Curtis
98752a9702
replace boost::bind
2017-06-09 19:08:53 +02:00
Bret Curtis
b7c27e5e96
remove boost/tuple
2017-06-09 19:08:53 +02:00
Bret Curtis
39185e6f8c
purge the rest of boost::shared and any other boost related things that no longer are required
...
put boost system back in, clean others up
revert Qt
add back boost fstream
2017-06-09 19:08:53 +02:00
Bret Curtis
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
2017-06-09 19:08:53 +02:00
Bret Curtis
07f75e1104
replace boost::shared_ptr in extern and components
2017-06-09 19:08:53 +02:00
Ewan Higgs
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
2017-06-09 16:49:25 +02:00
Julian Ospald
5d85fa9220
Fix build with osg >= 3.5.6
2017-05-28 17:30:01 +02:00
scrawl
813af876f6
Use a partial binary search in isReservedName ( Fixes #3835 )
2017-05-07 23:28:56 +02:00
scrawl
8d84869432
Fix commit 8f71b65d38
(don't overwrite the previous user data)
...
This resulted in a crash/corruption because the KeyframeController, for performance reasons, does not check that the expected user data is there and of correct type.
(Fixes #3829 )
2017-05-05 05:27:00 +02:00
scrawl
45d9e38616
Fix check for default material
2017-04-22 14:27:45 +02:00
Allofich
e095817ac2
Treat =< and => as == in scripts
...
(Fixes #3744 )
2017-04-21 22:26:13 +09:00
Allofich
ff3e307059
Pass parameters by const reference
2017-04-20 23:47:03 +09:00
scrawl
8f71b65d38
sceneutil/attach: inherit the UserDataContainer to avoid the resource cache from being cleared incorrectly
2017-04-14 15:04:53 +02:00
MiroslavR
c962b6dd6d
Fix correctActorModelPath to work properly when both backward and forward slashes are used in the path ( Fixes #3822 )
2017-04-09 18:34:36 +02:00
MiroslavR
395e97cf40
Remove evil "implicit GetJournalIndex" hack from expression parser
2017-04-03 01:44:26 +02:00
Allofich
3780d94214
Cast LAND_SIZE to integer to avoid linking error
2017-03-28 01:57:31 +09:00
Allofich
2a505b427d
Remove second LAND_SIZE definition
2017-03-27 03:45:53 +09:00
scrawl
f676b62711
Remove unused variable
2017-03-23 19:35:07 +01:00
scrawl
c992cb6e82
Fix texture not being applied on rendering the composite map ( Fixes #3791 )
2017-03-19 19:15:22 +01:00
MiroslavR
06dc94552f
Log a warning if size in SCHD (script header) does not match SCDT (bytecode) size instead of failing
2017-03-18 15:42:24 +01:00
scrawl
a070551af3
Attempt to fix naming conflict on windows
2017-03-15 17:51:00 +01:00
scrawl
3d58ba7301
Fix boolean test
2017-03-15 17:50:13 +01:00
scrawl
fd215caa02
Add local LandCache to cut down on store searches
2017-03-14 19:27:57 +01:00
scrawl
088d5604bf
Use a shader if required to display the composite map
...
Fixes composited terrain not respecting the 'clamp lighting' setting.
2017-03-14 19:27:56 +01:00
scrawl
7f5beb3172
Remove unused includes
2017-03-14 19:27:56 +01:00
scrawl
5044816770
Remove unused code
2017-03-14 19:27:56 +01:00
scrawl
b66c2abfe3
Build the bounding sphere in the loading thread (only relevant for TerrainGrid)
2017-03-14 19:27:56 +01:00
scrawl
9e9c028f1d
Skip light collection for far away terrain
2017-03-14 19:27:56 +01:00
scrawl
0782839a42
Avoid redundant culling tests on the transform/drawable
2017-03-14 19:27:56 +01:00
scrawl
fb8ac06524
Reduce the minSize of quad tree nodes for better performance
2017-03-14 19:27:56 +01:00
scrawl
a041546b54
Use the quad tree's minSize in the LodCallback
2017-03-14 19:27:56 +01:00
scrawl
e4e8821902
Refactor update of lodFlags
2017-03-14 19:27:56 +01:00
scrawl
2aa09639a9
Re-enable terrain intersections
2017-03-14 19:27:56 +01:00
scrawl
db00d47ca2
Hold a ref to the intersection visitor's view if possible
2017-03-14 19:27:56 +01:00
scrawl
11bee6ee35
Avoid compiling composite maps that are no longer referenced
2017-03-14 19:27:56 +01:00
scrawl
9eed7fa6f5
Fix composite map when force shaders is enabled
2017-03-14 19:27:56 +01:00
scrawl
d055dc25bf
Add custom traversal for local map camera to avoid loading terrain nodes that are exactly outside the border to another cell
2017-03-14 19:27:56 +01:00
scrawl
7d50b6c2e2
Add QuadTreeWorld::cacheCell to preload cells at max LOD for local maps
2017-03-14 19:27:56 +01:00
scrawl
6ccb6009ee
Use the View-based preloading for TerrainGrid as well
2017-03-14 19:27:56 +01:00
scrawl
3c29e2dbeb
Refactor ownership of terrain views
2017-03-14 19:27:56 +01:00
scrawl
28fd492711
Don't use terrain LOD for the map camera
2017-03-14 19:27:56 +01:00
scrawl
e7a0878c10
Add CompositeMapRenderer info to the stats panel
2017-03-14 19:27:56 +01:00
scrawl
c921620ef3
Compile the drawables of a composite map one by one to avoid frame drops for larger maps
2017-03-14 19:27:56 +01:00
scrawl
47ca8aeee5
Use the time elapsed instead of # compiled as limit
2017-03-14 19:27:56 +01:00
scrawl
8a6d909b22
Fix composite map being compiled twice
2017-03-14 19:27:56 +01:00
scrawl
683e625c6c
Rewrite CompositeMapRenderer to be based on Drawable and share the FBO
2017-03-14 19:27:56 +01:00
scrawl
4baa795152
Add preloading implementation to QuadTreeWorld
2017-03-14 19:27:56 +01:00
scrawl
9db71e3f62
Recompute the LOD stitching when the view changes
2017-03-14 19:27:56 +01:00
scrawl
ef704db877
Fix reset of changed flag
2017-03-14 19:27:56 +01:00
scrawl
1c15686353
Remove non required use of WorkQueue
2017-03-14 19:27:56 +01:00
scrawl
433900fca5
Fix waiting on initial quad tree build
2017-03-14 19:27:56 +01:00
scrawl
4dbd224249
Hide the terrain in non-exterior cells
2017-03-14 19:27:56 +01:00
scrawl
2580de11a4
Refactor ownership of ViewDataMap
2017-03-14 19:27:56 +01:00
scrawl
5a3c645c89
Enable lazy compiling of composite maps
2017-03-14 19:27:56 +01:00
scrawl
99e18f0d68
Clear the ViewData on exit
2017-03-14 19:27:56 +01:00
scrawl
bb991850da
Add LOD stitches
2017-03-14 19:27:56 +01:00
scrawl
6bd286d924
Fix unnecessary resizing in ViewData
2017-03-14 19:27:56 +01:00
scrawl
8c151364df
Add special handling for CullVisitor to QuadTreeWorld.
...
- Cull only against bounding box, not bounding sphere, as this appears to perform better.
- Also traverse into non visible nodes to compute their LOD, this is to avoid nodes having to be loaded in when the player turns the view around, and will avoid unnecessary refs/unrefs of rendering data in the View. This should probably be turned off at some point for static cameras, such as the local maps.
2017-03-14 19:27:56 +01:00
scrawl
f19a88be9d
Reject QuadTreeNodes with invalid bounds
2017-03-14 19:27:56 +01:00
scrawl
7d004bf757
Preliminary rendering of QuadTreeWorld
2017-03-14 19:27:55 +01:00
scrawl
e36bdb490e
Add view data structure for efficient collection of LOD nodes to use for a given camera/intersection
2017-03-14 19:27:55 +01:00
scrawl
0efc54c749
Subdivide the composite maps
2017-03-14 19:27:55 +01:00
scrawl
0756fc4ae6
Optimize getBlendmaps for the general case that most points are within the given cell
2017-03-14 19:27:55 +01:00
scrawl
81c9853fe9
Fix handling in getBlendmaps when the chunk is >1 ESM::Cell
2017-03-14 19:27:55 +01:00
scrawl
b384087e28
Fix handling in fillVertexBuffers when the chunk is >1 ESM::Cell
2017-03-14 19:27:55 +01:00
scrawl
819860081f
Remove custom bounding box
2017-03-14 19:27:55 +01:00
scrawl
ce8c4ad4f5
Add quad tree implementation (no rendering yet)
2017-03-14 19:27:55 +01:00
scrawl
14225a42c6
Remove unused pointer to IncrementalCompileOperation
2017-03-14 19:27:55 +01:00
scrawl
c487df0abb
Move updateTextureFiltering and material into the base class
2017-03-14 19:27:55 +01:00