mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-05 05:45:37 +00:00
Code Issues Releases Wiki Activity
28564 commits 108 branches 67 tags 134 MiB
Commit graph

6065 commits

Author SHA1 Message Date
Alexei Dobrohotov
42226533d8 Handle BSLODTriShape 
Its levels of detail are currently not handled
 2020-12-15 00:06:43 +03:00
Alexei Dobrohotov
8fd45d85ec Unify NiGeometry/NiGeometryData handling 2020-12-15 00:06:43 +03:00
Alexei Dobrohotov
8ca324af0a Handle emissive TexEnv creation in one place 2020-12-15 00:06:43 +03:00
Alexei Dobrohotov
5310dd6807 Clean up particle vertex handling 2020-12-15 00:06:43 +03:00
Alexei Dobrohotov
1c83e4936d Read BSShaderTextureSet and NiColorInterpolator 
Accept boolean-based and 4D vector-based NiInterpolators in ValueInterpolator constructor
 2020-12-15 00:06:43 +03:00
CedricMocquillon
cc5c6fe3ad Use data() method 2020-12-13 20:50:48 +01:00
CedricMocquillon
112437cf28 Change crash file to dmp on window to avoid renaming it 2020-12-13 14:13:07 +01:00
CedricMocquillon
adeb4fe02f Handle case where the log path has more that MAX_PATH characters 2020-12-13 14:10:44 +01:00
CedricMocquillon
f400116bcd Use 32767 characters for log path 2020-12-13 14:09:44 +01:00
CedricMocquillon
3eb2b32123 Fix typpo issue on arguments 2020-12-13 14:09:14 +01:00
CedricMocquillon
e2041de969 Use the incremental approach to handle long path 2020-12-12 21:47:50 +01:00
Nelsson Huotari
256aa5e71d Use const auto& 2020-12-12 22:23:20 +02:00
CedricMocquillon
73afc55462 Fork the current process to monitor exe, generate minidump on crash 2020-12-12 20:17:26 +01:00
Alexei Dobrohotov
15291f15d3 Make actor collision box components a struct 2020-12-11 20:07:59 +03:00
psi29a
11eff02a1d Merge branch 'Show-more-information-about-level-on-menu' into 'master' 
Show more information about level on menu

See merge request OpenMW/openmw!437
 2020-12-11 12:04:15 +00:00
Petr Mikheev
49c6e50c31 Print '--version' and '--help' messages without timestamps 2020-12-08 23:14:49 +01:00
CedricMocquillon
2d3d22025a Avoid height for empty message in AutoSizedTextBox 2020-12-07 14:57:25 +01:00
Petr Mikheev
5734551ff3 Add time to logs. Redirect OSG log to OpenMW log. 2020-12-05 13:46:02 +01:00
AnyOldName3
48f397f168 Remove existing shader when no longer required 2020-12-03 21:06:02 +00:00
AnyOldName3
5ad297e6ff Guarantee glow updater regenerates shaders on completion 
Previously, it would edit the odd numbered stateset, then regenerate
shaders for the even-numbered one, then edit the even numbered one, and
regenerate shaders for the odd numbered one (or vice versa if it
finished during an even numbered frame). This would leave one of the
shader programs still trying to use the state that had been removed.
 2020-12-03 18:41:32 +00:00
Alexei Dobrohotov
db9c174ca8 Make NIF particle node handling more generic 2020-11-30 12:33:18 +03:00
Andrei Kortunov
8084a336b5 Replace zeroes and nulls by nullptrs 2020-11-29 11:14:07 +04:00
AnyOldName3
86fad60c7d Merge branch 'roots' into 'master' 
Handle multiple root nodes (bug #5604)

Closes #5604

See merge request OpenMW/openmw!428
 2020-11-29 01:25:22 +00:00
psi29a
dc1bd8ec29 Merge branch 'osgAnimation_basics' into 'master' 
Collada animation support

See merge request OpenMW/openmw!421
 2020-11-28 16:55:26 +00:00
Nelsson Huotari
55dcc6582a Don't duplicate getFileExtension, use OpenMW's namespaces 2020-11-28 15:03:10 +02:00
Alexei Dobrohotov
5b6377b061 Handle multiple root nodes (bug #5604) 2020-11-28 13:25:39 +03:00
Andrei Kortunov
4acd910b37 Rework file error messages handling 2020-11-26 18:53:56 +04:00
Nelsson Huotari
08dcbe30b3 Earlier nullptr check 2020-11-20 19:46:08 +02:00
Nelsson Huotari
3232faa703 Use const ref instead of value 2020-11-20 19:41:01 +02:00
Nelsson Huotari
32d4344803 Don't copy osga-data in base class keyframecontroller, fix warnings. 2020-11-20 19:38:29 +02:00
psi29a
f95d2cf54c Merge branch 'update_recastnavigation' into 'master' 
Update recastnavigation

See merge request OpenMW/openmw!420
 2020-11-19 06:44:46 +00:00
Nelsson Huotari
6e77ad1f6a OSG-Collada animation support 2020-11-19 01:11:56 +02:00
Nelsson Huotari
f78a5d795c Separate keyframes logic to provide basis for osgAnimation integration. 2020-11-18 22:48:47 +02:00
AnyOldName3
37661bffea Merge branch 'shadowdisable-fix' into 'master' 
Make disableShadowsForStateSet a no-op when shadows are disabled

See merge request OpenMW/openmw!205
 2020-11-18 18:56:36 +00:00
elsid
9b11b8a27b
Fix boundary check 2020-11-18 18:52:00 +01:00
AnyOldName3
7768556ce6 Set dummy state when disabling shadows indoors 
As we don't reconfigure all shaders without shadows when we disable them
indoors (as it'd probably add a hitch to transitioning in and out) we
need to set up dummy state so the shaders don't do anything illegal.

This hadn't had symptoms for most objects as when indoors, nearly
everything would be drawn first in one of the water RTTs, which had
dummy state to disable shadows already. This wasn't true of the water
plane itself, though, yet somehow it took until just now for anyone to
report that.

This resolves vtastek's issue where the water would be invisible indoors
 2020-11-16 21:01:20 +00:00
psi29a
6064d3e741 Merge branch 'boundingvolume' into 'master' 
Read NIF bounding volume data correctly

See merge request OpenMW/openmw!407
 2020-11-14 13:19:29 +00:00
Alexei Dobrohotov
df9667e923 Read NIF bounding volume data correctly 2020-11-14 14:16:29 +03:00
psi29a
37e81f0df8 Merge branch 'redirection-fix' into 'master' 
Only reroute stdout etc. to new console if not already redirected

Closes #5650

See merge request OpenMW/openmw!408
 2020-11-14 09:30:57 +00:00
AnyOldName3
89d73c5fc7 Only reroute stdout etc. to new console if not already redirected 
This should fix the issue where Windows Release builds (compiled as
/SUBSYSTEM:WINDOWS instead of /SUBSYSTEM:CONSOLE) can't have their
output redirected.

Basically, a console application creates a console if not given one, so
you get a console window behind OpenMW while it's running. It was
decided that this was ugly, so we set Release builds to be windows
applications, which don't get an automatic console and don't
automatically connect to a console if given one anyway.

Of course, we still wanted to actually be able to print to a console if
given one, so we manually attach to the parent process' console if it
exists, then reopen the standard streams connected to CON, the Windows
pseudo-file representing the current console.

This is a little like connecting a second wire into a dumb terminal in
that you're pumping characters into the display rather than onto a
pipeline, so output can't be redirected.

It turns out, though, that if a /SUBSYSTEM:WINDOWS application has its
standard streams redirected by the calling process, it still gets its
handles as normal, so everything starts off connected just how we want
it and we were clobbering this good setup with the straight-to-console
fix.

All we need to do to fix that is check if we've got valid standard
handles and that they go somewhere useful, and if so, avoid reopening
them once the console is attached. Simples.
 2020-11-14 02:04:46 +00:00
Alexei Dobrohotov
117697ea22 Fix NiStringPalette loading 2020-11-14 01:12:32 +03:00
Alexei Dobrohotov
8a6d3d1b4f Minor fixes 
Fix extra semicolon
Disable collision avoidance if AI is disabled
 2020-11-13 22:53:12 +03:00
AnyOldName3
981fffe590 Merge branch 'itsakindoftemplatemagic' into 'master' 
Fix MSVC2017 builds

See merge request OpenMW/openmw!404
 2020-11-13 17:22:22 +00:00
AnyOldName3
1e0df23d14 Merge branch 'shadows-bin' into 'master' 
Use a custom renderbin to avoid pointless OpenGL state switches

See merge request OpenMW/openmw!402
 2020-11-13 16:29:41 +00:00
Evil Eye
94c89e6d5e check ValueTs 2020-11-13 16:41:45 +01:00
AnyOldName3
fcfd340c69 Actually copy alpha blended drawables to the new stategraph 2020-11-12 23:23:40 +00:00
Evil Eye
d8897c4509 remove inline and use enable_if_t 2020-11-12 20:46:45 +01:00
Evil Eye
d8d4351962 fix MSVC2017 builds 2020-11-12 19:45:32 +01:00
AnyOldName3
55f65752fd Don't bind unnecessary colour buffer when drawing shadow maps 2020-11-12 17:55:10 +00:00
AnyOldName3
cdbf19a508 Tidy up run-on lines 2020-11-12 17:04:23 +00:00
AnyOldName3
296dce470a Spelling fix 2020-11-12 16:58:29 +00:00
AnyOldName3
72f7e6a702 Handle all shadow alpha uniforms in shadowsbin 2020-11-12 00:26:30 +00:00
AnyOldName3
5d046bc95d Mark override 2020-11-11 14:58:06 +00:00
Alexei Dobrohotov
a46699fb1e Handle NiGeomMorpherController interpolator list 2020-11-10 23:23:11 +03:00
Alexei Dobrohotov
f3f5dcb016 Read a few more NIF types 
NiFloatInterpolator, NiPoint3Interpolator, NiTransformInterpolator, NiBoolInterpolator
Update a few existing controller records
Update NiSkinInstance
 2020-11-10 22:37:39 +03:00
psi29a
ed8342ebc9 Merge branch 'niffile' into 'master' 
Remove NIFFile settings manager dependency

See merge request OpenMW/openmw!398
 2020-11-10 09:03:10 +00:00
Alexei Dobrohotov
c857588ee9 Remove NIFFile settings manager dependency 2020-11-09 14:24:48 +03:00
Alexei Dobrohotov
b523574090 Remove shader visitor settings manager dependency 2020-11-09 13:59:59 +03:00
Alexei Dobrohotov
1d07361f08 Read a few more NIF types 
BSXFlags, NiTransformData, BSBound, BSFadeNode, bhkBlendController
 2020-11-09 00:19:35 +03:00
Alexei Dobrohotov
a38c629425 Read NiSkinPartition 2020-11-08 13:23:18 +03:00
Alexei Dobrohotov
afea11b70a Read NiStringPalette and NiBoolData 2020-11-08 13:23:18 +03:00
Alexei Dobrohotov
c79f509652 Misc NIF loader improvements 
Bullet NIF loader cleanup
Collect all extra records of a node
Remove code duplication in geometry type detection in OSG-side NIF loader
 2020-11-08 13:23:18 +03:00
Alexei Dobrohotov
7e63afdecf Allow loading arbitrary NIF files 2020-11-08 13:23:18 +03:00
Alexei Dobrohotov
53f91a3aa5
Merge pull request #3018 from akortunov/emplace 
Use emplace_back instead of push_back
 2020-11-01 01:58:56 +03:00
AnyOldName3
449506fef1 Attempt to explain what shadowsbin is doing 2020-10-31 19:06:20 +00:00
Andrei Kortunov
64ba81ecf2 Fix some issues, found by CoverityScan 2020-10-28 18:02:31 +04:00
Andrei Kortunov
00503d86e1 Try to disable CoverityScan warning in code with explanation 2020-10-28 18:01:42 +04:00
AnyOldName3
5869ac71e3 Merge all composing variables, not just those in destination already 
This resolves a regression where the local openmw.cfg doesn't exist, so
we fall back to the global openmw.cfg, but because we've not loaded
anything from the local openmw.cfg, there are no variables with which to
merge.
 2020-10-28 00:36:49 +00:00
psi29a
3ccb424faf Merge branch 'nifstuff' into 'master' 
Try to fix macOS build

See merge request OpenMW/openmw!378
 2020-10-26 13:32:19 +00:00
Alexei Dobrohotov
7e521788e9 Try to fix build 2020-10-26 15:09:31 +03:00
psi29a
fa9278e25b Merge branch 'boost_min_ver' into 'master' 
set minimal boost version; remove #ifdef boost version checks

See merge request OpenMW/openmw!376
 2020-10-26 08:13:24 +00:00
psi29a
ff6f0413f0 Merge branch 'nifstuff' into 'master' 
Minor NIF fixes and cleanup

See merge request OpenMW/openmw!377
 2020-10-26 08:12:49 +00:00
Bret Curtis
175e29af00
Merge pull request #3022 from akortunov/shaders 
Allow to assign custom shaders to nodes
 2020-10-26 09:07:13 +01:00
Alexei Dobrohotov
4fc5e22e9e NIF fixes and cleanup 
Get rid of NodeIndexHolder
Use unsigned 32-bit type for NIF record index
Fix calculation of the number of UV sets
 2020-10-26 02:51:25 +03:00
Bret Curtis
4032b754e4 set minimal boost version; remove #ifdef boost version checks 2020-10-25 22:43:10 +01:00
Alexei Dobrohotov
a78aa6b22c Merge branch 'nipixeldata' into 'master' 
Clean up palettized NiPixelData loading

See merge request OpenMW/openmw!374
 2020-10-25 21:22:15 +00:00
Andrei Kortunov
660df19ff7 Allow to assign custom shaders to nodes 2020-10-25 18:22:16 +04:00
unknown
71e78c66cd Re-add missing includes removed in 5a824d0333 2020-10-25 14:33:23 +01:00
Alexei Dobrohotov
71056c6014 Clean up palettized NiPixelData loading 2020-10-25 14:37:29 +03:00
Bret Curtis
0e0c091e15 add more optionals and casserts for windows 2020-10-25 01:34:04 +02:00
Bret Curtis
4a54d375cc add cassert for windows 2020-10-25 01:31:05 +02:00
Bret Curtis
f6bead88a9 purge boost/optional.hpp headers 2020-10-25 00:58:44 +02:00
Bret Curtis
62b0781f7d use std::optional instead of boost::optional 2020-10-25 00:33:41 +02:00
psi29a
957a1425d1 Merge branch 'cleanup_1' into 'master' 
Cleanup 1

See merge request OpenMW/openmw!365
 2020-10-24 18:43:03 +00:00
psi29a
fb63f8058f Merge branch 'hash' into 'master' 
Rewrite compressed BSA hash calculation again

See merge request OpenMW/openmw!368
 2020-10-23 19:55:53 +00:00
Alexei Dobrohotov
45c155b054 Rewrite compressed BSA hash calculation again 2020-10-23 21:19:58 +03:00
AnyOldName3
f7dddb8857 Merge branch '3' of https://gitlab.com/bzzt/openmw into shadows-bin 
This won't actually work.
 2020-10-23 17:55:15 +01:00
AnyOldName3
538314b03a Make path settings have path type 2020-10-23 15:34:41 +01:00
AnyOldName3
f57851587d Fix edge case where FallbackMap has no comma 2020-10-23 13:16:51 +01:00
AnyOldName3
ce0966b9b7 Improve validate implementation 2020-10-23 13:13:47 +01:00
AnyOldName3
350f6e61f7 Move FallbackMap validator implementation to source file 2020-10-23 13:03:36 +01:00
AnyOldName3
8b28b6e55e Compose BSA, context and script blacklist lists 
These would only take their value from the highest priority source, so
specifying `openmw --content anExtraEsp.esp` would override all the
content files in the user cfg file, and the user cfg file would override
any in the global/local one.
 2020-10-23 01:58:43 +01:00
AnyOldName3
fca8634b74 Remove debugging lines 2020-10-23 01:46:49 +01:00
AnyOldName3
cf81f1bbb7 Make composing variables compose in the expected order 2020-10-23 01:41:28 +01:00
Bret Curtis
5aa053c53e components/compiler/streamerrorhandler.cpp needs sstream for MacOS 2020-10-23 00:13:51 +02:00
Bret Curtis
e51ca542d4 components/config cleanup 2020-10-23 00:03:14 +02:00
Bret Curtis
5a824d0333 components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues 2020-10-22 23:57:53 +02:00
Bret Curtis
5475e696c8 components/bullethelpers cleanup; removed warnings by using override 2020-10-22 22:46:18 +02:00
Bret Curtis
d826fbdadf components/bsa cleanup 2020-10-22 22:39:59 +02:00
AnyOldName3
6c311f4a3d Partially revert 3a912485 
While it solved the bug it was supposed to, it caused a regression where
the user config could no longer override the global config.
 2020-10-22 21:38:22 +01:00
fredzio
1357bba0a0 Use some C++17 where it makes the code more readable 
Also replace boost::optional
 2020-10-22 07:15:16 +02:00
Bret Curtis
82431b752d removed unnessary bits that cmake should be doing for us; replace Misc::gcd with std::gcd 2020-10-20 23:38:05 +02:00
WW
d39aef3f5a Changed LZ4F_dctx* to LZ4F_decompressionContext_t for better compatibility. 2020-10-20 15:15:29 +00:00
Alexei Dobrohotov
1492ba4a53 Link against LZ4::LZ4 2020-10-19 22:36:02 +03:00
Alexei Dobrohotov
66d2b9c195 Add Skyrim SE BSA version support 
Fix embedded file name loading
 2020-10-19 22:31:42 +03:00
Andrei Kortunov
065ed5138e Use emplace_back instead of push_back 2020-10-18 10:27:35 +04:00
Andrei Kortunov
d7fadc933f Fix override warning with MyGUI 3.4 2020-10-18 10:02:25 +04:00
Bret Curtis
8050882baf
Merge pull request #3015 from akortunov/overrides 
Mark overrided methods as overrides
 2020-10-17 13:32:08 +02:00
AnyOldName3
df178ed97c Merge branch 'container-regressions' into 'master' 
Fix container regressions

See merge request OpenMW/openmw!346

(cherry picked from commit b0aee6f83d4cddb0116284b197913f9687dd9cee)

95e7a22d fix container regressions
 2020-10-16 22:55:10 +00:00
Andrei Kortunov
8ca3c3b123 Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
psi29a
c16fa27407 Merge branch 'async-physics' into 'master' 
Async physics

See merge request OpenMW/openmw!248
 2020-10-15 08:34:26 +00:00
fredzio
3c2504b442 Process movement queue in one or several background threads 
Before movement calculation, the main thread prepare a
vector of ActorFrameData, which contains all data necessary to perform
the simulation, and feed it to the solver. At the same time it fetches
the result from the previous background simulation, which in turn is
used by the game mechanics.
Other functions of the physics system (weapon hit for instance)
interrupt the background simulation, with some exceptions described
below.

The number of threads is controlled by the numeric setting

[Physics]
async num threads

In case 'async num threads' > 1 and Bullet doesn't support multiple threads,
1 async thread will be used. 0 means synchronous solver.
Additional settings (will be silently switched off if async num threads = 0)

[Physics]
defer aabb update

Update AABBs of actors and objects in the background thread(s). It is not an especially
costly operation, but it needs exclusive access to the collision world, which blocks
other operations. Since AABB needs to be updated for collision detection, one can queue
them to defer update before start of the movement solver. Extensive tests on as much
as one installation (mine) show no drawback having that switched on.

[Physics]
lineofsight keep inactive cache

Control for how long (how many frames) the line of sight (LOS) request will be kept updated.
When a request for LOS is made for the first time, the background threads are stopped to
service it. From now on, the LOS will be refreshed preemptively as part of the background
routine until it is not required for lineofsight keep inactive cache frames. This mean
that subsequent request will not interrupt the background computation.
 2020-10-15 06:41:35 +02:00
fredzio
4ea07639b8 Unbreak build with cmake < 3.12 
This reverts commit 3cadc16f88.
 2020-10-14 06:15:23 +02:00
Assumeru
72549651e0
Rework container resolution (#3006) 
* Rework container resolution

* add optional argument to getCount

* remove now-redundant changes

* undo worldimp changes

* move save-fixing code to InventoryState

* replace Rng instances with Seeds
 2020-10-13 17:46:32 +02:00
Bret Curtis
c99be77a32
Merge pull request #3008 from akortunov/strings 
Rework fixed strings handling
 2020-10-13 17:37:48 +02:00
psi29a
82736f013d Merge branch 'objectlib' into 'master' 
Convert components to an object library.

See merge request OpenMW/openmw!342
 2020-10-13 13:32:43 +00:00
psi29a
9a912486f9 Merge branch 'deprecated-exception' into 'master' 
Use C++11 exception specification

See merge request OpenMW/openmw!343
 2020-10-13 13:31:48 +00:00
fredzio
3cadc16f88 Convert components to an OBJECT library. It saves space in the object 
directory (about 1G on an optimized build on Windows and BSD).
Build should run somewhat fast as well.
 2020-10-13 14:10:52 +02:00
Bret Curtis
11c938b176
Merge pull request #3011 from elsid/navmesh_fixes 
Navmesh fixes
 2020-10-12 11:22:26 +02:00
fredzio
460e69e92a Get rid of warning: dynamic exception specifications are deprecated 2020-10-10 12:12:55 +02:00
Alexei Dobrohotov
05cd005b30 Fix NiTriStripsData loading 2020-10-09 19:37:54 +03:00
Alexei Dobrohotov
9f08dc9968 Revert "Merge branch 'skinning' into 'master'" 
This reverts merge request !327
 2020-10-08 23:24:28 +00:00
elsid
7591d45008
Use memcpy to create navmesh key 
Implementation with memcpy is ~13 times faster.
 2020-10-08 19:55:56 +02:00
elsid
f637dc38bd
Add cached flag to update navmesh status 2020-10-08 19:55:55 +02:00
elsid
eb140ed15f
Write unknown status numeric value 2020-10-08 19:55:55 +02:00
elsid
7d73e73cad
Consider tile as not removed when it is not found 2020-10-08 19:55:55 +02:00
Alexei Dobrohotov
6be808e301 RigGeometry: convert some pairs to structs 2020-10-08 03:05:59 +03:00
psi29a
ee22081ae1 Merge branch 'nifgobrrrr' into 'master' 
More NIF stuff

See merge request OpenMW/openmw!324
 2020-10-07 10:22:56 +00:00
psi29a
bca698d951 Merge branch 'shader_line_numbering' into 'master' 
Correctly resetting line numbering during shader processing.

See merge request OpenMW/openmw!317
 2020-10-07 07:16:45 +00:00
Alexei Dobrohotov
df1014303d Add more generic extra data NIF types 2020-10-06 21:21:55 +03:00
Alexei Dobrohotov
302d8eed27 Clean up Roll- and FlipController implementation 2020-10-06 20:47:06 +03:00
Alexei Dobrohotov
0d02a3392a Clean up 2020-10-06 20:36:10 +03:00
Alexei Dobrohotov
e7c37f21b7 Add NiFloatInterpController abstraction 2020-10-06 20:24:05 +03:00
Andrei Kortunov
822764d0fa Rework fixed strings handling 2020-10-05 21:52:22 +04:00
Alexei Dobrohotov
29ccb09da5 Introduce some extended NIF definitions 2020-10-04 13:18:56 +03:00
Mads Buvik Sandvei
d5450a7d88 Correctly resetting line numbering during shader processing. 2020-10-03 14:22:34 +02:00
Alexei Dobrohotov
4e22c2687f niffile.cpp cleanup 2020-10-02 21:50:54 +03:00
psi29a
4faaa86449 Merge branch 'cyclic_includes' into 'master' 
More accurate detection of cyclic includes

See merge request OpenMW/openmw!281
 2020-09-30 05:39:28 +00:00
AnyOldName3
a338e8c561 Actually set the uvSet value 
This got lost when uvSet was made into a local variable.
 2020-09-24 17:13:09 +01:00
AnyOldName3
390fb4f12e Disable OpenGL Debug stuff when SDL doesn't provide the necessary definitions 2020-09-21 00:49:09 +01:00
psi29a
22c3588d0d Merge branch '4771-and-4631' into 'master' 
Try lower MSAA level if the requested value isn't available

Closes #4471 and #4631

See merge request OpenMW/openmw!297

(cherry picked from commit b3db387512340a5e9a77427c2d7d9d88c2340056)

da0aef7a Retrieve SDL OpenGL attributes after context creation
a51e63b3 Try lower MSAA levels if OpenGL context doesn't have what we requested
c4e92a0a Update CHANGELOG.md
 2020-09-20 12:35:26 +00:00
psi29a
87028e1640 Merge branch 'flipping-heck' into 'master' 
Make NiFlipControllers only affect base texture

Closes #2069

See merge request OpenMW/openmw!301
 2020-09-20 12:20:18 +00:00
AnyOldName3
3f61ff3a44 Make OpenGL debugging optional 2020-09-19 23:30:34 +01:00
AnyOldName3
441c09578a Merge remote-tracking branch 'origin/khr_debug' into khr_debug 2020-09-19 23:09:11 +01:00
AnyOldName3
b2cb98d30e Fix NiFlipController 
NiFlipControllers *always* affect the base texture, even if no base
texture is bound. When no base texture is bound, they default to UV set
zero and to having wrapped UV coordinates, instead of using the settings
for the disabled base texture.
 2020-09-16 23:03:42 +01:00
AnyOldName3
85b5fdee35 Discard the alpha channel of 16-bit TGAs, just like Morrowind 2020-09-12 00:20:44 +01:00
Andrei Kortunov
9f1fbd56a3 Fix SummonKey comparison function 2020-09-04 13:45:38 +04:00
Andrei Kortunov
67eace1028 Use struct instead of tuple 2020-08-29 11:24:08 +04:00
Andrei Kortunov
924f634bda Support for multiple summons with same ID in the single spell 2020-08-28 21:14:54 +04:00
psi29a
f90a049702 Merge branch 'movement_refactoring' into 'master' 
Refactoring related to "smooth movement"

See merge request OpenMW/openmw!285

(cherry picked from commit 6eaf0a389d5aed3b74ab1a7cf89574612f964bdf)

e847b4c8 Split getSpeed() to getMaxSpeed() and getCurrentSpeed()
a96c46bc Refactor calculation of movement.mSpeedFactor
03ee9090 Use getMaxSpeed instead of getCurrentSpeed where it makes sense.
a178af5c Create helper functions `normalizeAngle` and `rotateVec2f`
 2020-08-27 11:54:30 +00:00
AnyOldName3
fd14dad789 const osg::ref_ptf reference should be faster than value as constructor and destructor are non-trivial 
I played around in GodBolt and got into an argument to determine this. The difference will be immeasurably small, but my curiosity has been satisfied.
 2020-08-20 03:01:43 +01:00
AnyOldName3
707204133d Double-buffer shadow uniforms that change each frame 2020-08-20 00:38:13 +01:00
AnyOldName3
ce98d7053b Double buffer view-dependent data stateset 2020-08-19 22:55:41 +01:00
AnyOldName3
98b2d5d921 Make shadow debug HUD thread-safe 
* Double buffer the frustum uniforms.
* Don't mess with the debug geometry's StateSet.
* Change two-element vectors to arrays so the size is explicit.
 2020-08-19 19:29:19 +01:00
Andrei Kortunov
215ddb9106 Do not print warnings for VisController 2020-08-12 11:16:37 +04:00
Bret Curtis
05a19f4f93
Merge pull request #2984 from Capostrophic/optimizer 
Avoid optimizing animated shapes once again (regression #5565)
 2020-08-07 22:09:02 +02:00
Bret Curtis
30b8e6eda9
Merge pull request #2987 from Capostrophic/bezier 
Add quadratic interpolation for scalars and vectors (part of #2379)
 2020-08-07 21:53:23 +02:00
Capostrophic
aa131262ea Implement quadratic interpolation for scalars and vectors 2020-08-07 11:13:53 +03:00
Capostrophic
35de34c019 Don't clamp GeomMorpherController recovered weight value 
Seems that Morrowind doesn't do it.
 2020-08-07 11:13:53 +03:00
Capostrophic
a211527b4b Fix AppVeyor warnings 2020-08-07 09:59:16 +03:00
Mads Buvik Sandvei
0d6be9bd18 More accurate detection of cyclic includes 2020-08-06 01:16:19 +02:00
Capostrophic
8c213cbfb1 Avoid optimizing animated shapes once again (regression #5565) 2020-08-05 22:39:48 +03:00
Mads Buvik Sandvei
045b4566dd Merge branch 'master' into 'resize_breaks_window' 2020-08-05 17:10:16 +00:00
Mads Buvik Sandvei
2ed12a398d addLineDirectivesAfterConditionalBlocks move check for npos to catch all npos 2020-08-04 01:46:54 +00:00
Capostrophic
3d31d21bc2 Don't encapsulate NIF transformation changes 
Currently that causes issues
 2020-07-29 20:46:36 +03:00
Evil Eye
6ad20ec9c7 Mutate base records when adding/removing spells 2020-07-28 08:33:28 +02:00
Capostrophic
46825e8a4d Move NIF record index back to a separate user object 
This makes sure it's never erroneously optimized out. NodeIndexHolders don't need to be cloned as their record index is never supposed to be changed.
 2020-07-26 09:57:43 +03:00
Capostrophic
f93655e803 Encapsulate NIF transform changes in NifOsg::MatrixTransform 2020-07-26 09:57:43 +03:00
Capostrophic
ad87289d59 Fix NifOsg::MatrixTransform constructor inheritance 2020-07-26 09:57:43 +03:00
Capostrophic
cc791af0f5 Serialization fixes 
Make sure NifOsg::MatrixTransform serialization behaves as intended
Add a dummy serializer for NifOsg::UVController
 2020-07-26 09:57:43 +03:00
Capostrophic
3b55d657e5 CopyRigVisitor: Log the number of parents in multiple parents error 2020-07-26 09:57:43 +03:00
Capostrophic
a61267f57d Replace NodeUserData with a custom transform node 2020-07-26 09:57:43 +03:00
Capostrophic
4c9cefefdd Get rid of NifOsg::CollisionSwitch 2020-07-26 09:57:43 +03:00
psi29a
fc7266d4ee Merge branch 'Improve-cell-name-autocompleter-implementation' into 'master' 
#5520 Improve cell name autocompleter implementation

See merge request OpenMW/openmw!267
 2020-07-25 13:58:42 +00:00
Cédric Mocquillon
2e27de027e Add members in AdvancedPage class to avoid memory leak when the list of cells names is updated as we recreated a completer at each notification event 2020-07-25 13:58:42 +00:00
Petr Mikheev
8cdc7031f5 Support vectors in settings.cfg 2020-07-24 21:47:49 +02:00
Mads Buvik Sandvei
90c3089370 Update sdlvideowrapper.cpp 2020-07-22 12:17:03 +00:00
Mads Buvik Sandvei
8323f7f68d Alternative fix 2020-07-14 19:54:50 +02:00
Mads Buvik Sandvei
8aa57a745a Fix 2020-07-14 13:19:51 +02:00
Bret Curtis
f47d2bb8af make sure we use case-sensative BULLET_ prefix 2020-07-10 15:01:44 +02:00
Bret Curtis
67c2f0b26c
Merge pull request #2951 from elsid/sound_object_pool 
Store SoundManager sounds and streams in object pool
 2020-07-06 07:18:46 +02:00
Bret Curtis
0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads 
Replace OpenThreads by std types
 2020-07-04 13:11:23 +02:00
Bret Curtis
28d85e4030
Merge pull request #2926 from akortunov/warnfix 
Use QMultiMap instead of QMap
 2020-07-04 11:39:11 +02:00
elsid
02f9b44f01
Use RAII for object ptr from pool 2020-07-04 01:15:27 +02:00
elsid
6ca29c6107
Use common type for pool of sounds and streams 2020-07-04 01:09:04 +02:00
elsid
56bc462007
Make all stats fit into the window 2020-07-03 20:49:23 +02:00
Frederic Chardon
f268bc13f1 Do not set particle lifetime to 0 (#5472) 2020-07-01 11:04:18 +00:00
Andrei Kortunov
ef6fe8d52a Fix crash in the stateset updater (regression #5478) 2020-06-30 09:01:17 +04:00
Andrei Kortunov
d0fe15b095 Use meaningful names instead of mSkill1 and mSkill2 2020-06-26 11:47:59 +04:00
elsid
40ad87bc4d
Replace OpenThreads by std types 2020-06-25 22:16:09 +02:00
elsid
3251687a3d
Use std types for WorkQueue 2020-06-24 21:23:31 +02:00
Andrei Kortunov
487bfed672 Use QMultiMap instead of QMap 2020-06-24 15:13:56 +04:00
Bret Curtis
61a5c6125d #5480: Drop Qt4 support and require Qt 5.12 or later. 2020-06-22 12:17:06 +02:00
Cédric Mocquillon
6e397e4008 Add a search function to the "Datafiles" tab of the OpenMW launcher 2020-06-21 14:45:30 +00:00
psi29a
f94ca28dbe #5463: Optimizer fix, problem was indeed related to tangents not being transformd properly. 2020-06-18 17:23:16 +00:00
Andrei Kortunov
6357bc3dad Catch MyGUI exceptions in the FontLoader destructor 2020-06-18 15:13:02 +04:00
Andrei Kortunov
808c905e1f Initialize fields to avoid undefined behaviour 2020-06-18 14:50:06 +04:00
Andrei Kortunov
0e810c8d32 Fix cell borders color 2020-06-18 09:12:56 +04:00
Bret Curtis
c944acf26b
Merge pull request #2913 from akortunov/warnfix 
Get rid of ECLD and dependencies
 2020-06-17 15:00:57 +02:00
psi29a
1724099d34 Merge branch 'mingw' into 'master' 
Fix mingw Windows build

See merge request OpenMW/openmw!213
 2020-06-17 09:19:02 +00:00
Andrei Kortunov
d1a3cc98ff Get rid of ECLD and dependencies 2020-06-17 13:09:16 +04:00
psi29a
66b5cf9f1d Merge branch 'master' into 'near_far_mode_in_launcher' 
# Conflicts:
#   files/settings-default.cfg
 2020-06-16 23:05:07 +00:00
Bret Curtis
b5a2e809cd
Merge pull request #2911 from unelsson/fixdaematerialseq 
Use sequenced texture units with .dae/collada
 2020-06-16 16:43:04 +02:00
Andrei Kortunov
805d826d5b Fix Clang warnings about invalid overrides 2020-06-16 16:59:37 +04:00
Nelsson Huotari
5bc44cf2ee Use sequenced texture units with .dae/collada 2020-06-16 14:37:06 +03:00
psi29a
0dc7715c35 Merge branch 'object_paging_retry' into 'master' 
Object Paging

See merge request OpenMW/openmw!209
 2020-06-16 08:21:54 +00:00
elsid
00197e1cd9
Optimize recast mesh size by vertex deduplication 2020-06-16 00:51:36 +02:00
Bret Curtis
0d1b7fd3f0
Merge pull request #2908 from Capostrophic/uvsets 
Remove 63 UV set limit
 2020-06-15 07:54:51 +02:00
Capostrophic
6f94848dec Remove 63 UV set limit (now 65535) 2020-06-14 23:02:03 +03:00
elsid
b095ca6c86
Use actor speed to define area cost for pathfinding 2020-06-13 02:24:52 +02:00
elsid
439588d10e
Remove unused mOffMeshConnectionIds 2020-06-13 02:24:51 +02:00
bzzt lost a hitlab login
26ab176389 profiling 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
daa2761c2d alphablending & billboardfix 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
f12879a04c allow statesetupdater as cullcallback = faster + works in paging 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
4238fbccdf view fix 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
9f0398c021 intersection by refnum tag + enable paging for acti,door,cont 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
65cd2c77aa static intersections 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
c7fda6d280 activegrid paging = 2xfps 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
b4af2ac672 avoid blocking on pagerebuild 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
17637c6575 pagerebuild on disable 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
c1ebd9474b stop navmesh updates when ai off 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
ffbed7ee38 loadingscreen 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
da92ad329b move renderbin 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
b7b31926a8 fix map glitch + cleanup 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
77b92aee9c fix shadowsglitch by bounds overflow 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
69514dfd46 ico redundency fix + stats counter 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
bzzt lost a hitlab login
1f891ca46d billboarding support for tree mods 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
bzzt lost a hitlab login
cf439581e1 comply by elsid review 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
bzzt lost a hitlab login
ce505a9bb3 crashfix + optimiziation 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
bzzt
d684f1a78f terrainbased objectpaging 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
elsid
c4cd3b2c4f
Add pathgrid to navmesh as off mesh connection 2020-06-12 21:04:02 +02:00
Andrei Kortunov
d997842f8d Use FourCC to declare all ESM record names 2020-06-09 10:07:37 +04:00
Bret Curtis
cd97d0c61c
Merge branch 'master' into automove 2020-06-08 11:42:05 +02:00
Roman Siromakha
27a113167c
Merge pull request #2890 from akortunov/position 
Do not store object position, if it is the same as in CellRef
 2020-06-08 01:12:47 +02:00
Alexei Dobrohotov
3f0cf65335
Merge pull request #2895 from elsid/esm_objectstate_final 
Add final for derived and overriden from ESM::ObjectsState
 2020-06-08 02:02:57 +03:00
Andrei Kortunov
75e7a3e8b1 Do not store object position, if it is the same as in CellRef 2020-06-07 09:25:46 +04:00
elsid
5209f5ff6d
Mark all derived classes from ESM::ObjectsState and overriden functions as final 2020-06-06 23:00:53 +02:00
Capostrophic
e02b66cdf4 Ignore bogus string arguments for Disable/Enable again 2020-06-06 20:04:09 +03:00
Capostrophic
1873da4c91 Don't save to or read automove state from saved games (#5452) 2020-06-06 15:58:21 +03:00
Andrei Kortunov
6de97e6bc2 Remove redundant variables from RenderingManager 2020-06-06 14:10:24 +04:00
Bret Curtis
204d2acf25
Merge pull request #2092 from akortunov/float_stats 
Store attributes and skills values as floats
 2020-06-05 22:38:12 +02:00
Bret Curtis
5d019c27ae
Merge pull request #2887 from akortunov/worldmanager 
Introduce a separate class to control world date and time
 2020-06-05 13:15:44 +02:00
Andrei Kortunov
81805b7263 Introduce a separate class to control world date and time 2020-06-05 12:07:32 +04:00
elsid
d35ccc39c6
Fix build tests with double precision bullet 2020-06-03 21:34:05 +02:00
Andrei Kortunov
5468fcb29f Store attributes and skills values as floats (bug #4021) 2020-06-03 17:34:15 +04:00
Andrei Kortunov
3dce225f28 Implement vanilla-style corprus handling (bug #3714, bug #4623) 2020-06-03 12:58:17 +04:00
Capostrophic
7aca18f92b Handle NiLines (feature #5445) 2020-05-30 19:09:34 +03:00
Bret Curtis
505a5e9ca6
Merge pull request #2873 from Capostrophic/nifcleanup 
NIFLoader adjustments
 2020-05-29 23:44:55 +02:00
Bret Curtis
9d0855baa5
Merge pull request #2866 from elsid/extend_osg_stats 
Extend OSG stats
 2020-05-29 23:23:38 +02:00
Andrei Kortunov
396afe79f1 Move font loading to the FontLoader 2020-05-28 23:18:31 +04:00
Roman Siromakha
b3b8480d49
Merge pull request #2868 from Capostrophic/opcodes 
Give new opcodes to old functions made custom
 2020-05-26 14:08:27 +02:00
Capostrophic
74a74209ac Allow junk (data-less) NiParticleColorModifiers 2020-05-26 15:08:10 +03:00
Capostrophic
7a9403aeed Remove unnecessary casts 2020-05-26 15:01:26 +03:00
Capostrophic
fc9a10ba48 Streamline node controller handling 
Reduce code duplication
Allow non-animated nodes controlled by NiVisController to be optimized out
 2020-05-26 15:00:47 +03:00
Capostrophic
89a2c69a61 Support particle node transformations 2020-05-25 23:51:15 +03:00
Fanael Linithien
e8ec62b298 Use all-lowercase names for windows API headers 
This allows the code to successfully cross-compile from hosts with case
sensitive file names, like linux.
 2020-05-24 16:49:20 +02:00
laikh
d6e4fbe085 Fix mingw Windows build 2020-05-24 08:53:43 +08:00
Capostrophic
e0ecbc08df Give new opcodes to old functions made custom 2020-05-23 11:57:15 +03:00
elsid
69df6098e5
Report frame number, number of actors and objects to stats 2020-05-22 17:39:18 +02:00
Alexei Dobrohotov
a68a4338a0
Merge pull request #2841 from Assumeru/consistent-refs 
Script reference consistency
 2020-05-22 12:48:50 +03:00
elsid
a59e25e093
Optimize MWRender::Animation::hasAnimation 
Use a set to check for group start existence.
Reduce time taken from 2.6% to 0.08% and
MWMechanics::MechanicsManager::update from 7% to 5%
in relative CPU time usage for a scene with ~100 actors.
 2020-05-21 16:21:11 +02:00
Bret Curtis
88a7ecc18d
Merge pull request #2528 from akortunov/effectstime 
Use real time to update spell effects
 2020-05-18 11:07:48 +02:00
Evil Eye
3875b837bc make MenuMode, Random, GetSecondsPassed regular functions 2020-05-17 22:34:54 +02:00
Icecream95
f14db21745
Make disableShadowsForStateSet a no-op when shadows are disabled 
Otherwise the GPU has to do useless shadow comparisons when shadows
are disabled.
 2020-05-17 19:52:23 +12:00
Bret Curtis
59bda361f0
Merge pull request #2848 from akortunov/bullet 
Fix Bullet flags usage
 2020-05-16 23:22:34 +02:00
Andrei Kortunov
b5833f3c59 Use real time to update spell effects instead of game timestamps (bug #5165) 2020-05-16 11:00:28 +04:00
Bret Curtis
a04a41a429
Merge pull request #2843 from Capostrophic/nigeometry 
Introduce NiGeometry abstraction
 2020-05-15 17:35:39 +02:00
Bret Curtis
7da5558808
Merge pull request #2845 from akortunov/save_cleanup 
Optimize characters data in savegame
 2020-05-15 17:34:34 +02:00
Bret Curtis
f9fca8675b
Merge pull request #2846 from Capostrophic/envmap 
CopyRigVisitor fixes (bug #5415)
 2020-05-15 17:32:11 +02:00
Andrei Kortunov
add42830d9 Add a flag to use double-precision functions from Bullet 2020-05-15 12:48:47 +04:00
Capostrophic
78b1bbe130 Remove unnecessary null check 2020-05-15 10:34:49 +03:00
Bret Curtis
c69c7d0b3b
Merge pull request #2049 from elsid/bullet_double_precision 
Support bullet double precision
 2020-05-15 07:41:02 +02:00
Capostrophic
72e5043eda CopyRigVisitor fixes 
Make sure it copies all relevant drawable parent nodes (e.g. including the node with the environment map effect)
Make sure it doesn't copy nodes multiple times
 2020-05-15 01:12:06 +03:00
Andrei Kortunov
e6ca95174a Optimize characters data in savegame 2020-05-14 21:07:31 +04:00
Capostrophic
b665fed8f2 Introduce NiGeometry abstraction 2020-05-14 10:52:27 +03:00
Capostrophic
30558c2434 Try to resolve CI concerns 2020-05-14 10:00:33 +03:00
Capostrophic
915ffe2241 Handle non-node roots more gracefully (bug #5416) 2020-05-14 00:57:00 +03:00
Evil Eye
f0e2ee45fa reuse ImplicitRef and ExplicitRef for enable, disable, getdisabled, startscript; move scriptrunning and stopscript 2020-05-13 21:17:08 +02:00
Bret Curtis
bb30b44766
Merge pull request #2839 from Capostrophic/nipathcontroller 
Add basic NiPathController support (movement only)
 2020-05-13 21:06:54 +02:00
elsid
14d0ca4cd3
Cast float to btScalar 2020-05-13 18:44:11 +02:00
Capostrophic
30fc2e3e5e Add basic NiPathController support (movement only) 2020-05-13 18:01:22 +03:00
Capostrophic
5377e0491b Adjust NiPixelData loading 2020-05-13 17:00:41 +03:00
Capostrophic
a08a9518c3 NIF version adjustments 
Cut down on obscure version numbers
Call generateVersion without using a stream object
 2020-05-13 01:06:38 +03:00
Andrei Kortunov
d5806fd0ed Fix merge conflicts 2020-05-12 14:33:00 +04:00
Bret Curtis
42cba092b7
Merge pull request #2716 from akortunov/png 
Store fog of war as a PNG image instead of TGA
 2020-05-12 11:52:23 +02:00
Bret Curtis
2c743b6153
Merge pull request #2828 from Capostrophic/colormode 
Improve color mode handling in shaders
 2020-05-12 11:45:45 +02:00
Bret Curtis
4b30bf5699
Merge pull request #2829 from Capostrophic/logging 
Log some more things
 2020-05-12 11:44:05 +02:00
Bret Curtis
62290182eb
Merge pull request #2648 from Assumeru/start-scripts 
Allow targeting non-unique actors with StartScript. Fixes #2311
 2020-05-12 10:39:11 +02:00
Bret Curtis
507adac8cd
Merge pull request #2783 from akortunov/input 
Refactor InputManager
 2020-05-12 09:34:22 +02:00
unknown
3b4782959e Allow targeting non-unique actors with StartScript (bug #2311) 2020-05-10 14:57:06 +02:00
Capostrophic
b91d0d889f Fix warning 
/home/travis/build/OpenMW/openmw/components/nifosg/nifloader.cpp:615:42: warning: using the result of an assignment as a condition without parentheses [-Wparentheses]
                    if (hasVisController |= (ctrl->recType == Nif::RC_NiVisController))
                        ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/travis/build/OpenMW/openmw/components/nifosg/nifloader.cpp:615:42: note: place parentheses around the assignment to silence this warning
                    if (hasVisController |= (ctrl->recType == Nif::RC_NiVisController))
                                         ^
                        (                                                             )
 2020-05-10 14:38:07 +03:00
Capostrophic
aa5161f99e Log some more things 2020-05-09 20:27:12 +03:00
Capostrophic
c0b322b264 Improve color mode handling in shaders 2020-05-09 16:15:10 +03:00
Andrei Kortunov
4a1e27ac21
Merge pull request #2824 from Capostrophic/cleanup 
Cleanup
 2020-05-09 14:46:17 +04:00
Andrei Kortunov
b33c4c920c Move all OICS handling to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
f990150c49 Move video wrapper to the WindowsManager 2020-05-09 11:27:02 +04:00
psi29a
b72720f357 Merge branch 'shadow-transparency-rework' into 'master' 
Only alpha-test shadows when necessary

See merge request OpenMW/openmw!170
 2020-05-08 21:32:16 +00:00
Bret Curtis
aaa8990006
Merge pull request #2799 from Capostrophic/simplewaterfog 
Fix simple water with radial fog enabled
 2020-05-08 20:48:04 +02:00
Capostrophic
1bf2ddac4d Cleanup 
Move static variable declaration out of the loop
Remove redundant boolean argument from applyDrawableProperties()
Improve HeightCullCallback class formatting
 2020-05-07 18:54:09 +03:00
Bret Curtis
b8c467e2e0
Merge pull request #2787 from p4r4digm/screenshot-path 
Added setting to change the directory screenshots are stored in
 2020-05-04 17:11:49 +02:00
Bret Curtis
34181b9ae6
Merge pull request #2803 from elsid/disable_crash_catcher_env 
Add env variable to disable crash catcher
 2020-05-04 17:09:24 +02:00
elsid
1f3dfaedcc
Add tests for ShaderManager 2020-05-02 17:59:49 +02:00
elsid
edf002aa97
Rename argument shaderTemplate to templateName 2020-05-02 17:56:24 +02:00
Bret Curtis
f51476a3c5
Merge pull request #2816 from Capostrophic/switchlod 
CollisionSwitch and Switch/LOD node fixes
 2020-05-01 23:49:08 +02:00
elsid
b150d681a9
Update same navmesh tile with limited frequency 2020-05-01 18:05:58 +02:00
Bret Curtis
5f0f2f0f16 rename to better reflect what is going on per AnyOldName3 comment; added none option 2020-05-01 00:34:31 +02:00
elsid
10daadefbe
Add missing include 2020-04-30 21:58:00 +02:00
Bret Curtis
bf6daa7269
Merge pull request #2811 from Capostrophic/emitter 
Allow particle emitters to be attached to an arbitrary node
 2020-04-30 14:56:49 +02:00
Bret Curtis
1dc21919f6
Merge pull request #2815 from Capostrophic/tga 
Use the new option to treat TGA files as TGA 1.0
 2020-04-30 14:50:51 +02:00
Bret Curtis
b7f7aabd8b
Merge pull request #2806 from elsid/detournavigator_tests 
Add detournavigator test for multiple worker threads
 2020-04-30 14:48:02 +02:00
Capostrophic
957d2a890f Ignore empty children of osg::LOD and osg::Switch like in OSG 2020-04-30 15:04:58 +03:00
Capostrophic
63fe02b1ba CollisionSwitch and Switch/LOD node fixes 
Properly apply transformations to both switch and LOD nodes
Allow both NiSwitchNode and NiLODNode to be the root node
Properly add CollisionSwitch into the scene graph
 2020-04-30 15:04:57 +03:00
Bret Curtis
7345c89b54
Merge pull request #2813 from Capostrophic/collisionswitch 
Fix collision switch node mask (again)
 2020-04-30 13:50:09 +02:00
Capostrophic
16f6c7b27f Use the new option to treat TGA files as TGA 1.0 2020-04-30 09:57:58 +03:00
psi29a
bb5fe13e13 Make sure it is either one or the other with the default to bounding volumes. 2020-04-29 23:06:44 +00:00
Bret Curtis
d38c3e971c remove extra line 2020-04-29 17:05:08 +02:00
Bret Curtis
ae729a1ac7 add ability to set the type of near far method to be used in shadow calculation; default to bounding volumes; cleaned up code while there and re-ordered items 2020-04-29 16:36:48 +02:00
Capostrophic
89282d14aa Fix collision switch node mask (again) 2020-04-29 17:18:39 +03:00
elsid
899a6b5aa3
Workaround for GCC 5 bug 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61636
 2020-04-29 13:54:52 +02:00
Capostrophic
6b874e397b Make particle system cloning map names more sensible 2020-04-29 12:25:52 +03:00
Capostrophic
f516178ec9 Fix particle processor cloning 
Extend emitter handling comment in NIF loader
 2020-04-29 11:14:22 +03:00
Capostrophic
c08f9e13af Allow emitters to be attached to nodes after particle systems 2020-04-29 11:13:45 +03:00
psi29a
476a74c2d3 Merge branch 'bzzt_5_tight_scene_bound' into 'master' 
Allow use of OSG's Bounding Volumes

See merge request OpenMW/openmw!189
 2020-04-29 07:44:03 +00:00
Alexei Dobrohotov
0329003af7 Merge branch 'opcode2' into 'master' 
Remove 2-arguments opcodes

See merge request OpenMW/openmw!187
 2020-04-29 07:36:14 +00:00
Bret Curtis
9bad3666ab
Merge pull request #2810 from Capostrophic/hasviscontroller 
Fix hidden node with NiVisController optimization
 2020-04-29 07:10:44 +02:00
Bret Curtis
d77047e1cf
tab2space 2020-04-28 13:16:37 +02:00
Capostrophic
3b7fb9ec09 Use pipe-equal operator 2020-04-28 10:00:46 +03:00
AnyOldName3
a3b032bf2b Fix chameleon shadows 2020-04-27 23:49:48 +01:00
psi29a
9ab6657d8f Merge branch 'no_more_ttf_spam_in_stats' into 'master' 
puts an end of error spam when OSG is compiled without Freetype support

See merge request OpenMW/openmw!188
 2020-04-27 19:29:29 +00:00
Bret Curtis
31a75a962a Add 3 additional classes to be ignored who dumping "showscenegraph" debug output; less spammy 2020-04-27 11:56:10 +02:00
Bret Curtis
ca0adc25bb add two additional classes we do not need to serialize; less pam during showscenegraph debug dump. 2020-04-27 11:51:18 +02:00
Bret Curtis
886b9813ad Something changed in OSG 3.6 that makes the command "showscenegraph" less useful; it writes out raw data of images to the debug output file openmw.ogst. This commit adds the hint and restores default behaviour found in OSG 3.4 2020-04-27 11:40:49 +02:00
bzzt
dc33eeadf1 tightscenebound is uncessary after water bbfix 2020-04-27 08:42:46 +02:00
Bret Curtis
1870b4b345 catch and set with no _found; leave empty as empty string 2020-04-27 08:02:42 +02:00
Capostrophic
bbd15cccd5 Fix hidden node with NiVisController optimization 2020-04-27 00:21:34 +03:00
Bret Curtis
6d3f9ce307 puts an end of error spam when OSG is copmiled without Freetype support 2020-04-26 22:20:57 +02:00
elsid
bd1ef4dd6d
Add detournavigator test for multiple worker threads 2020-04-26 22:00:55 +02:00
Alexei Dobrohotov
d42cb4f16d
Merge pull request #2805 from elsid/detournavigator_update_callback 
Use callback to handle changed tiles
 2020-04-26 22:52:40 +03:00
Alexei Dobrohotov
f5b42107d3
Merge pull request #2807 from elsid/detournavigator_thread_jobs_stats 
Add number of thread jobs to update jobs stats
 2020-04-26 22:44:59 +03:00
fredzio
916a9641fc Delete support for 2-arguments opcodes - it was never used 2020-04-26 00:56:11 +02:00
elsid
df6e85b619
Use callback to handle changed tiles 
Instead of collecting changed tiles into a temporary vector.
 2020-04-25 17:56:41 +02:00
elsid
7502db1570
Add number of thread jobs to update jobs stats 2020-04-25 17:51:50 +02:00
elsid
066f0a744f
Add env variable to enable/disable crash catcher 2020-04-25 15:42:06 +02:00
elsid
c59c8ae1f4
Remove unused macro 2020-04-24 20:38:55 +02:00
Capostrophic
688e804548 Fix simple water with radial fog enabled 2020-04-24 13:52:53 +03:00
psi29a
3b9a51b8ac Merge branch 'bzzt_1_waterculling' into 'master' 
waterculling

See merge request OpenMW/openmw!184
 2020-04-24 10:38:16 +00:00
Bret Curtis
e7795f2bf7
Merge pull request #2775 from Capostrophic/dooractivation 
Only disarm traps with keys when the door/container is locked (bug #5370)
 2020-04-24 08:46:24 +02:00
Bret Curtis
ed970f4d17 Apply suggestion to components/terrain/terraingrid.hpp 2020-04-24 06:26:08 +00:00
elsid
7aaec5e989
Log shader template name on parse error 2020-04-23 19:52:17 +02:00
Bret Curtis
756ec7117b make mGrid (and friends) private again, create accessor method to return bool of mGrid.empty() 2020-04-23 17:40:10 +02:00
Bret Curtis
48713915cb re-use bzzts waterplane overlay for debug; makes it easier to test. To use this, set the env OPENMW_WATER_CULLING_DEBUG=1; You will see blue rectangles corresponding to water outlines. Once there are no more outlines, water is culled. You can further see this by pressing F3 3 times to check the the amount of quads. Before culling it should be around 1600, after culling it should drop to 0. 2020-04-23 11:12:10 +02:00
Bret Curtis
407fbe320e cleanup and use C++ version of FLT_MAX 2020-04-23 10:10:50 +02:00
bzzt
ed20d869b4 waterculling for both terrain 2020-04-23 08:53:21 +02:00
Bret Curtis
a4d1068d1a Merge branch '13' into 'master' 
terrainshadowclusterculling

See merge request OpenMW/openmw!141
 2020-04-22 21:42:50 +00:00
Bret Curtis
68549828b4 create static functions to set/get hidden node mask; compromise on magic numbers to make things easier to understand 2020-04-22 13:34:19 +02:00
Bret Curtis
e1a5435531 Merge commit '8a8107e8' 2020-04-22 13:22:54 +02:00
Capostrophic
9106e3646c Fix outdated bug tracker links 2020-04-22 01:45:11 +03:00
AnyOldName3
53b9b41159 Rely on existing alpha test for non-blended shadow casting 2020-04-21 18:18:55 +01:00
Chris Djali
71c46204ec
Merge pull request #2781 from mp3butcher/partsysfix 
Particle System shading and lighting (fixing bug#3676 and #4949)
 2020-04-20 21:29:50 +01:00
Julien Valentin
886fd5efc9 enable particle shading and force particle normal to (0.3,0.3,0.3) 
and update changelog
 2020-04-20 22:15:34 +02:00
Bret Curtis
8a8107e837 as it says; revert vismask and uncomplicate openmw 2020-04-20 20:57:38 +02:00
p4r4digm
0741fe5b80 removed path configuration and made screenshots just save in a folder 2020-04-20 09:22:50 -07:00
Bret Curtis
63bdc84f91 Merge branch 'remove_evil_const_cast' into 'master' 
clean up code; purge const_cast

See merge request OpenMW/openmw!175
 2020-04-20 09:22:34 +00:00
p4r4digm
2b54e6216b Added setting to change the directory screenshots are stored in 2020-04-19 16:38:57 -07:00
Bret Curtis
7ade0cb2c3
Merge pull request #2784 from Capostrophic/specular 
Disable specular lighting for 4.0.0.2 and earlier files
 2020-04-19 22:21:20 +02:00
fredzio
0630cc482c Compile helpviewer in components only when USE_QT is defined 
It fixes build of OpenMW alone (wihtout launcher or OpenCS)
 2020-04-19 19:37:40 +02:00
Bret Curtis
8c2f3ff007 clean up code; purge const_cast 2020-04-19 16:31:54 +02:00
Bret Curtis
4ae0bd1fae Merge branch 'helplink' into 'master' 
Link to readthedocs documentation from OpenCS

See merge request OpenMW/openmw!171
 2020-04-18 20:54:21 +00:00
Frederic Chardon
513ac8986d Add link to opencs documentation on readthedocs, available through 
context menu.
The documentation opens in default browser.

There are 3 contexts:
- global: opens the OpenMW CS User Manual main page
- when a record is selected: opens the "Tables" page
- when the filter field is selected: opens the "Record Filters" page

There is also a link to the OpenCS tutorial in the help menu.
 2020-04-18 20:54:21 +00:00
AnyOldName3
1cf2036386 Don't add empty PrimitiveSets (prevent undefined behaviour) 2020-04-18 02:38:20 +01:00
Capostrophic
c3cc8ee1e1 Disable specular lighting for 4.0.0.2 and earlier files 2020-04-17 14:08:29 +03:00
Julien Valentin
6e2a651252 fix particle alpha 2020-04-16 02:48:42 +02:00
Capostrophic
bbed9a70c5 Ignore traps of initially unlocked refs with assigned keys 2020-04-14 17:49:03 +03:00
elsid
208a50340d
Specialize DetourNavigator::ObjectId ctor for pointers 
To fix msvc error:
components\detournavigator\objectid.hpp(14,13): error C2440: 'reinterpret_cast': cannot convert from 'const T' to 'size_t'
          with
          [
              T=unsigned long
          ]
 2020-04-13 20:48:34 +02:00
Andrei Kortunov
8d4dde7b56
Merge branch 'master' into autocalc 2020-04-13 13:53:29 +04:00
Andrei Kortunov
3f61022f80 Merge branch 'unused_var' into 'master' 
Remove unused field from QuadTreeBuilder

See merge request OpenMW/openmw!173
 2020-04-12 03:29:09 +00:00
Capostrophic
ad333e88fe Handle enchantment autocalc flag as a flag (bug #5363) 2020-04-11 00:03:14 +03:00
fredzio
39a55318b0 Remove unused variable 2020-04-10 22:50:28 +02:00
Capostrophic
e1d635cd71 Make extra sure groups with special behavior aren't optimized out 2020-04-10 18:11:21 +03:00
AnyOldName3
12044a607b Only alpha-test shadows when necessary 
Previously we always discarded shadow map fragments if the alpha channel of the output would have been low, but there were some (modded) assets that have non-one alpha but have testing or blending disabled so end up opaque anyway. This lets the shadows of those objects match.
 2020-04-10 15:45:37 +01:00
Bret Curtis
328c3617b7
Merge pull request #2752 from Assumeru/parsing-errors 
Reset errorhandler context
 2020-04-05 10:03:34 +02:00
Andrei Kortunov
028760e108
Merge pull request #2758 from akortunov/warnfix 
Fix some issues, found by CoverityScan
 2020-04-04 21:34:26 +04:00
Capostrophic
5732b8e026 Use std::fill instead of loops to reset some arrays to defaults 2020-04-04 17:53:36 +03:00
Capostrophic
27d4fe9ee1 Fix ESM::Land oversights 2020-04-04 16:48:38 +03:00
Andrei Kortunov
a68d9aed4c Fix issues, found by CoverityScan 2020-04-04 17:45:26 +04:00
Evil Eye
8c433d587c less complicated context override 2020-04-04 14:09:00 +02:00
Andrei Kortunov
02d7b13075
Merge pull request #2529 from akortunov/nodecopy 
Copy transformations data when we clone node
 2020-04-04 15:04:49 +04:00
elsid
ef4a7089e4
Use template specialization for writeHNT to write raw arrays 
To avoid passing explicit size argument where it's possible.
 2020-04-04 01:12:49 +02:00
Roman Siromakha
3bd2c114a7
Merge pull request #2741 from akortunov/warnfix 
Fix C5204 warnings by adding default virtual destructors
 2020-04-04 00:12:07 +02:00
Evil Eye
a16727d5e3 implement move constructor 2020-04-02 20:27:52 +02:00
Evil Eye
8958e29187 reset errorhandler context 2020-04-02 20:14:52 +02:00
Bret Curtis
baf3c36a76
Merge pull request #2722 from akortunov/gyro 
Rotate camera via gyroscope on mobile devices
 2020-04-02 09:55:08 +02:00
Andrei Kortunov
e63325ebff Support for camera rotation via gyroscope on Android (feature #5311) 2020-04-01 19:57:04 +04:00
Capostrophic
80239235d3 Always create NiGeometry nodes as MatrixTransform 2020-03-31 13:04:03 +03:00
Alexei Dobrohotov
4bb41a52bf
Merge pull request #2740 from Assumeru/empty-string 
Ignore unterminated empty strings
 2020-03-30 20:22:56 +03:00
Bret Curtis
5df95b95f2
Merge branch 'master' into empty-string 2020-03-30 09:11:18 +02:00
Evil Eye
15a95add08 remove false positive 2020-03-29 22:40:22 +02:00
Evil Eye
e07fa37fa3 ignore final whitespace/comments 2020-03-29 22:29:22 +02:00
Capostrophic
69219c18a7 Make sure blank lines at the end of settings.cfg don't disappear 2020-03-28 19:15:43 +03:00
Capostrophic
bec5746fdd Improve blank line handling in settings writer (bug #5326) 2020-03-26 23:41:33 +03:00
Andrei Kortunov
2e7712a390 Fix C5204 warnings by adding default virtual destructors 2020-03-26 14:49:12 +04:00
Evil Eye
fea7e68fe9 silence operator precedence warning 2020-03-25 20:34:08 +01:00
Evil Eye
8dc081a60d ignore unterminated empty strings 2020-03-25 19:52:22 +01:00
Capostrophic
7319eda54e Correct drawable property apply order (bug #5313) 2020-03-23 20:47:47 +03:00
James Moore
a37bdfd492 Implement a refresh button on data files page 2020-03-21 19:35:20 +00:00
Andrei Kortunov
e20d156904 Do not write empty trade time 2020-03-18 13:31:26 +04:00
Bret Curtis
79517f3f42
Merge pull request #2724 from akortunov/factions 
Cleanup ownership for items in containers
 2020-03-18 10:00:36 +01:00
Andrei Kortunov
ea30e27370 Cleanup ownership for items in containers 2020-03-17 17:22:39 +04:00
Andrei Kortunov
dea2018d9f Do not use dynamic casts when using ObjectState 2020-03-17 15:18:40 +04:00
elsid
5168f2059f
Compare revisions by equality to support overflow 2020-03-14 09:38:24 +01:00
elsid
7ae7cb181d
Support recast mesh rendering 2020-03-14 09:38:24 +01:00
Capostrophic
c1f1e367fa Accept an extra numerical argument in GetItemCount 2020-03-11 20:56:46 +03:00
Bret Curtis
7096ecdcf2
Merge pull request #2719 from Capostrophic/capofixes 
Fixes of my mistakes
 2020-03-11 09:05:12 +01:00
Capostrophic
d3244dc777 Don't save space in compressed BSA hash generation 2020-03-10 23:47:39 +03:00
Capostrophic
aef6cd7006 Fix handling of empty strings in NIF string tables 2020-03-10 23:04:20 +03:00
Andrei Kortunov
94df2114c1 Store fog of war as a PNG image instead of TGA (bug #5108) 2020-03-07 11:05:32 +04:00
Capostrophic
5770227e37 Avoid using auto-detected normal maps that are bump map namesakes 2020-03-05 13:19:34 +03:00
Capostrophic
624a9ac353 Force shaders for objects affected by new envmap option 2020-03-04 14:06:22 +03:00
Capostrophic
2b3ecff004 Remove broken fixed function pipeline support 
Added by mistake
 2020-03-03 21:50:50 +03:00
Capostrophic
6999f1fd28 Add an option to apply lighting to environment maps 2020-03-03 20:08:59 +03:00
Capostrophic
19a7245251 Add bump mapping support 2020-03-03 13:32:30 +03:00
Andrei Kortunov
8c177f0306 Take in account transformations of NiCollisionSwitch 2020-02-25 11:09:36 +04:00
Bret Curtis
c907cd98c8
Merge pull request #2704 from akortunov/collisionswitch 
Handle NiCollisionSwitch node
 2020-02-19 21:24:25 +01:00
Alexei Dobrohotov
e1f0504557
Merge pull request #2703 from akortunov/masks 
Fix a regression in the NiVisController
 2020-02-19 11:50:51 +03:00
Andrei Kortunov
77d6fe46ca Handle NiCollisionSwitch node 2020-02-19 12:14:21 +04:00
Andrei Kortunov
7b5ec76db4 Fix regression in the NiVisController 2020-02-19 11:50:59 +04:00
elsid
650f429ff5
Add final modifier to fix warnings 2020-02-18 10:36:08 -08:00
Andrei Kortunov
84979fa8b7 Move VisMask to components 2020-02-16 16:03:35 +04:00
Andrei Kortunov
f4291ea948 Fix intersector usage (bug #5283) 2020-02-10 22:31:20 +04:00
Andrei Kortunov
b8548b8f56
Merge pull request #2691 from elsid/navigator_status 
Use status codes to handle navigator errors instead of exceptions
 2020-02-05 13:24:29 +04:00
elsid
349040ffb2
Use status codes to handle navigator errors instead of exceptions 
For find path use case.
 2020-02-04 22:33:56 +01:00
Capostrophic
216a5d27c6 Avoid working with AMBI subrecord in tools unnecessarily (bug #5269) 2020-02-04 20:57:04 +03:00
Capostrophic
0479311c25 Correct declarations of utility methods 2020-02-02 19:01:47 +03:00
Capostrophic
e363d5df21 Some more minor NIF support fixes 2020-02-02 17:28:46 +03:00
Alexei Dobrohotov
234fdfefb7
Revert "Don't apply 1.6 magic value to NiGravity decay factor (#5266)" 2020-01-31 15:11:29 +03:00
Capostrophic
dcafe719a5 Don't apply 1.6 magic value to NiGravity decay factor (#5266) 2020-01-31 01:15:58 +03:00
elsid
f7caeefddb
Fallback to straight path when navmesh and pathgrind are not available 2020-01-29 11:14:07 +01:00
Bret Curtis
44a85795cf
Merge pull request #2669 from Capostrophic/wnam 
Generate WNAM subrecord upon saving terrain instead of upon editing it
 2020-01-28 11:43:47 +01:00
elsid
1e106013a0
Use navmesh to find wander destination outside pathgrid for ground based actors 
Use dtNavMeshQuery::findRandomPointAroundCircle from recastnavigation
 2020-01-21 00:01:06 +01:00
capostrophic
89055f1c6c Generate WNAM upon saving terrain 2020-01-11 02:42:04 +03:00
Bret Curtis
95f9e4f4c9
Merge pull request #2649 from Capostrophic/nifstreamline 
Yet more NIF adjustments
 2020-01-10 22:07:25 +01:00
Alexei Dobrohotov
7a4caaf5bf
Merge pull request #2660 from akortunov/boost 
Additional de-boosting
 2020-01-09 22:14:32 +03:00
Alexei Dobrohotov
ff2739b8a3
Merge pull request #2651 from akortunov/encoding 
Unify streams usage to support non-ASCII paths
 2020-01-09 22:12:55 +03:00
Andrei Kortunov
a250a405b4 An attempt to fix the MSVC2017 build 2020-01-09 20:42:06 +04:00
Andrei Kortunov
1cdd33b434 Implement additional stringops to avoid Boost functions 2020-01-09 19:40:22 +04:00
Andrei Kortunov
cb1a8ec518 Do not link the Boost threads library 2020-01-09 19:40:22 +04:00
capostrophic
0467e8ee15 Avoid heap corruption while reading SCVR (bug #4680) 2020-01-04 01:34:41 +03:00
Andrei Kortunov
3704acf857 Unify streams usage to support non-ASCII paths (bug #5239) 2020-01-03 07:10:17 +04:00
capostrophic
f234d53269 Don't use double negation 2020-01-02 13:13:57 +03:00
capostrophic
32caab663f Enumerate interpolation types properly 2020-01-02 13:07:27 +03:00
capostrophic
e654a52b70 More NIF adjustments 
Constant interpolation support
 2020-01-02 13:07:27 +03:00
Andrei Kortunov
75fed1d236 Print error code when failed to open file on Windows 2020-01-02 09:28:38 +04:00
Alexei Dobrohotov
133b99bf18
Merge pull request #2622 from akortunov/testcells 
Implement TestCells and TestInteriorCells console commands
 2019-12-29 14:27:48 +03:00
Alexei Dobrohotov
2693598d82
Merge pull request #2642 from akortunov/warnfix2 
Add safety checks for door state
 2019-12-23 21:22:56 +03:00
Alexei Dobrohotov
dfcc6d8b5a
Merge pull request #2640 from akortunov/save 
Do not store gold-specific value for everything
 2019-12-23 21:22:26 +03:00
Andrei Kortunov
24044b08e0 Do not store gold-specific value for everything 2019-12-23 19:34:57 +04:00
Andrei Kortunov
88a695f251 Add safety checks for door state 2019-12-23 19:29:12 +04:00
Andrei Kortunov
24ce242941 Implement TestCells (feature #5219) 2019-12-22 11:13:42 +04:00
Andrei Kortunov
cd81f81fb6 Initialize variables to avoid GCC warnings 2019-12-22 10:44:14 +04:00
Assumeru
737aa1e4e8 Remove FactionID editing from OpenCS (#2636) 
* Remove FactionID editing

* remove useless comments

* rename FactionID to Unknown
 2019-12-18 20:42:54 +03:00
Assumeru
dfbe0021a5 Change rescaling to be more inline with vanilla (fixes #5214) (#2635) 
* move rescaling to loadData

* clamp on save
 2019-12-18 19:37:45 +03:00
Alexei Dobrohotov
f3e8fbfded Merge branch 'range-safety' into 'master' 
Make script literal lookup functions safer

See merge request OpenMW/openmw!113
 2019-12-18 15:27:49 +00:00
Andrei Kortunov
c41562fa27 Make TextureProperty warnings more informative 2019-12-15 13:56:20 +04:00
Capostrophic
909c8ef0ea Avoid working with empty controller data (bug #5229) 2019-12-14 20:35:23 +03:00
Andrei Kortunov
5b5c52d92e Handle NiKeyframeController for NiTriShape (feature #5224) 2019-12-10 16:20:27 +04:00
Capostrophic
4b38bab0d9 Make sure empty cell name subrecords are saved (bug #5222) 2019-12-03 18:47:02 +03:00
Andrei Kortunov
eec82f676a
Merge pull request #2602 from elsid/clang_tidy 
Fix clang-tidy issues
 2019-12-03 08:27:43 +04:00
Andrei Kortunov
ab4b3677e3 Merge branch '16' into 'master' 
perf regression fix

See merge request OpenMW/openmw!157
 2019-12-02 05:35:19 +00:00
Andrei Kortunov
974670a7c5
Merge pull request #2540 from elsid/fix_startup_fail_crash 
Fix crash on destructed stream usage
 2019-11-30 22:15:00 +04:00
Andrei Kortunov
ae80d8e490
Merge pull request #2618 from elsid/fix_rope_bridge 
Fix objects culling for recast mesh tiles (bug #5216)
 2019-11-30 21:54:14 +04:00
Alexei Dobrohotov
c01324fdb2
Merge pull request #2613 from akortunov/warnfix3 
Fix GCC9 warnings about implicit declarations
 2019-11-30 16:09:01 +03:00
elsid
7ec5a20c64
Filter recast mesh triangles by global bounding box 
Except heightfields to reduce slow down.
 2019-11-30 13:19:27 +01:00
elsid
7729e396b2
Fix exceptions logging 2019-11-30 10:33:14 +01:00
Andrei Kortunov
1b98fe4395 Fix GCC9 warnings about implicit declarations 2019-11-29 12:41:23 +04:00
Andrei Kortunov
5daf602256 Fix iterator usage when destroying cell borders (bug #5218) 2019-11-29 12:26:17 +04:00
bzzt
d340224c95 shadowsbin for gl state reduction 2019-11-20 13:37:00 +00:00
bzzt
480302d634 terrainclusterculling 2019-11-20 13:37:00 +00:00
bzzt
f09125fc93 perf regression fix 2019-11-20 13:37:00 +00:00
elsid
8d358eeb7d
Avoid virtual call in ParticleSystem ctor 2019-11-17 18:50:45 +01:00
elsid
b07a6afa91
Avoid virtual call in GraphicsWindowSDL2 ctor 
/home/elsid/dev/openmw/components/sdlutil/sdlgraphicswindow.cpp:23:8: warning: Call to virtual function during construction [clang-analyzer-optin.cplusplus.VirtualCall]
    if(valid())
       ^
/home/elsid/dev/openmw/components/sdlutil/sdlgraphicswindow.cpp:23:8: note: This constructor of an object of type 'GraphicsWindowSDL2' has not returned when the virtual method was called
/home/elsid/dev/openmw/components/sdlutil/sdlgraphicswindow.cpp:23:8: note: Call to virtual function during construction
 2019-11-17 18:50:11 +01:00
elsid
4cd2ff9a3d
Avoid virtual call in TerrainGrid dtor 
/home/elsid/dev/openmw/components/terrain/terraingrid.cpp:31:9: warning: Call to virtual function during destruction [clang-analyzer-optin.cplusplus.VirtualCall]
        unloadCell(mGrid.begin()->first.first, mGrid.begin()->first.second);
        ^
/home/elsid/dev/openmw/components/terrain/terraingrid.cpp:29:12: note: Assuming the condition is true
    while (!mGrid.empty())
           ^
/home/elsid/dev/openmw/components/terrain/terraingrid.cpp:29:5: note: Loop condition is true.  Entering loop body
    while (!mGrid.empty())
    ^
/home/elsid/dev/openmw/components/terrain/terraingrid.cpp:31:9: note: This destructor of an object of type '~TerrainGrid' has not returned when the virtual method was called
        unloadCell(mGrid.begin()->first.first, mGrid.begin()->first.second);
        ^
/home/elsid/dev/openmw/components/terrain/terraingrid.cpp:31:9: note: Call to virtual function during destruction
 2019-11-17 18:50:11 +01:00
elsid
2e1d8a5e55
Remove unused virtual modifiers in DebugHUD 
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3127:9: warning: Call to virtual function during construction [clang-analyzer-optin.cplusplus.VirtualCall]
        addAnotherShadowMap();
        ^
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3094:5: note: Loop condition is true.  Entering loop body
    for (int i = 0; i < 2; ++i)
    ^
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3094:5: note: Loop condition is true.  Entering loop body
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3094:5: note: Loop condition is false. Execution continues on line 3102
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3126:21: note: Assuming 'i' is < 'numberOfShadowMapsPerLight'
    for (int i = 0; i < numberOfShadowMapsPerLight; ++i)
                    ^
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3126:5: note: Loop condition is true.  Entering loop body
    for (int i = 0; i < numberOfShadowMapsPerLight; ++i)
    ^
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3127:9: note: This constructor of an object of type 'DebugHUD' has not returned when the virtual method was called
        addAnotherShadowMap();
        ^
/home/elsid/dev/openmw/components/sceneutil/mwshadowtechnique.cpp:3127:9: note: Call to virtual function during construction
 2019-11-17 18:50:11 +01:00
elsid
bd149b909f
Remove unused virtual modifiers in ShadowManager 
/home/elsid/dev/openmw/components/sceneutil/shadow.cpp💯9: warning: Call to virtual function during construction [clang-analyzer-optin.cplusplus.VirtualCall]
        setupShadowSettings();
        ^
/home/elsid/dev/openmw/components/sceneutil/shadow.cpp💯9: note: This constructor of an object of type 'ShadowManager' has not returned when the virtual method was called
/home/elsid/dev/openmw/components/sceneutil/shadow.cpp💯9: note: Call to virtual function during construction
/home/elsid/dev/openmw/components/sceneutil/shadow.cpp:104:9: warning: Call to virtual function during construction [clang-analyzer-optin.cplusplus.VirtualCall]
        enableOutdoorMode();
        ^
/home/elsid/dev/openmw/components/sceneutil/shadow.cpp:104:9: note: This constructor of an object of type 'ShadowManager' has not returned when the virtual method was called
/home/elsid/dev/openmw/components/sceneutil/shadow.cpp:104:9: note: Call to virtual function during construction
 2019-11-17 18:26:56 +01:00
Andrei Kortunov
f09d20434c Clamp number of shadow maps 2019-11-17 17:25:02 +04:00
Alexei Dobrohotov
ef138e9afc
Merge pull request #2592 from akortunov/switchnode 
Use transformations of NiSwitchNode
 2019-11-15 19:46:45 +03:00
Andrei Kortunov
34873b6065 Fix dead code 2019-11-13 15:29:18 +04:00
Andrei Kortunov
7074baa1c2 Clamp number of shadow maps, as described in docs 2019-11-13 15:10:22 +04:00
Andrei Kortunov
af41e9acc1 Initialize variables to avoid undefined values 2019-11-13 14:47:29 +04:00
Andrei Kortunov
51cfd070c6 Use transformations of NiSwitchNode 2019-11-09 21:43:08 +04:00
Andrei Kortunov
bafc0d9e90 Added support for texture fragment usage to the ImageButton 2019-11-09 12:52:42 +04:00
Andrei Kortunov
6eb8e0cf4d Display magic effects according to research page 2019-11-07 11:05:18 +04:00
Alexei Dobrohotov
a8843fa5a8
Make sure MultiChar::data() constructs a valid string 
mData may ultimately not be a valid C-string (e.g. if it contains 4 significant characters) so it may not necessarily be converted into a valid std::string
 2019-11-05 22:33:14 +03:00
elsid
d42b5fd28e
Fix warning -Woverloaded-virtual 
In file included from openmw/components/terrain/quadtreeworld.cpp:10:
openmw/components/terrain/quadtreenode.hpp:95:14: warning: 'Terrain::QuadTreeNode::traverse' hides overloaded virtual function [-Woverloaded-virtual]
        void traverse(ViewData* vd, const osg::Vec3f& viewPoint, LodCallback* lodCallback, float maxDist);
             ^
OpenSceneGraph/build/clang/release/include/osg/Group:43:22: note: hidden overloaded virtual function 'osg::Group::traverse' declared here: different number of parameters (1 vs 4)
        virtual void traverse(NodeVisitor& nv);
                     ^
1 warning generated.
 2019-11-05 09:31:38 +01:00
bzzt
b6ed2f1718 Add optional shadow map max distance and fading 2019-11-02 18:06:39 +03:00
Bret Curtis
ec9a593fc3
Merge pull request #2578 from akortunov/mouse 
Implement mouse wheel bindings (bug #2679)
 2019-10-31 13:14:29 +01:00
Michael Stopa
e4bec88a68 Implement mouse wheel bindings (bug #2679) 2019-10-30 20:45:51 +04:00
Alexei Dobrohotov
9ab8d88753
Accept a bogus cell string argument for Position 2019-10-30 17:54:34 +03:00
Andrei Kortunov
45ab6e1430 Implement UTF-8 support for script parser (bug #4598) 2019-10-30 14:59:47 +04:00
Alexei Dobrohotov
dc8e5f1d12
Accept redundant volume and pitch StopSound arguments 
Exploited in Arktwend.
 2019-10-29 18:51:58 +03:00
Alexei Dobrohotov
8bc2c1ac34
Make ForceGreeting ignore any extra argument 2019-10-29 14:39:21 +03:00
Andrei Kortunov
b2e12f0a73 Attempt to fix a regression - crash on ARM 2019-10-28 18:58:16 +04:00
Capostrophic
f7d2cdb782 Revert to 0.45.0 comments-in-the-middle settings behavior 2019-10-26 10:55:10 +03:00
Bret Curtis
9f039fac87
Merge pull request #2520 from unelsson/transientlandshapeedit 
[Review phase] Editor: Transient land shape editing
 2019-10-25 00:26:43 +02:00
Roman Siromakha
4e5aec5c30
Merge pull request #2539 from Capostrophic/scripting 
Try to parse strings as number literals (bug #5097)
 2019-10-24 22:12:50 +02:00
Bret Curtis
2040ca5637
Merge pull request #2555 from akortunov/encoding 
Encode ID's in all places to UTF-8
 2019-10-24 00:48:12 +02:00
Nelsson Huotari
0ce971c1bb Revert back to less aggressive component-level changes. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
c2428bc5fa Remove unneeded forward declaration 2019-10-22 21:25:10 +03:00
Nelsson Huotari
16138fc896 Transient land shape editing 2019-10-22 21:25:10 +03:00
elsid
275f552fcf
Do not modify settings on save 2019-10-21 22:47:24 +02:00
elsid
a7930073e8
Move settings parser declaration to separate header 2019-10-21 22:47:24 +02:00
Bret Curtis
f666d796e9
Merge pull request #2547 from Capostrophic/nif2 
More minor NIF improvements
 2019-10-21 21:49:07 +02:00
elsid
045ceeac11
Replace foreach macro by for-loop 2019-10-20 20:08:16 +02:00
Capostrophic
7c4743fdd1 Convert recordptr typedefs to using directives 2019-10-16 01:36:43 +03:00
Capostrophic
8056107c6e More minor NIF improvements 2019-10-16 01:36:43 +03:00
Andrei Kortunov
2fc819cdae Encode ID's in all places to UTF-8 (bug #3977) 2019-10-10 20:52:32 +04:00
unelsson
3deebf0247
Merge branch 'master' into wnamfix 2019-10-07 01:40:23 +03:00
Nelsson Huotari
2fdaacf23c remove for array, just std::swap 2019-10-06 23:50:16 +03:00
Nelsson Huotari
e35ed960ee for -> std::copy 2019-10-06 21:57:10 +03:00
Nelsson Huotari
7f030fc3ee copy mWnam record in copy constructor and custom assignment operator 2019-10-06 21:50:40 +03:00
Capostrophic
bde4a38181 Cast Random result to float (bug #5175) 2019-10-03 23:20:25 +03:00
elsid
751accad0f
Remove unused field QuadTreeBuilder::mLodFactor 2019-09-28 14:26:52 +02:00
elsid
29f262e514
Fix crash on destructed stream usage 2019-09-28 11:30:38 +02:00
Capostrophic
138a7ac434 Expression parser: Try to parse strings as number literals (bug #5097) 2019-09-26 02:54:17 +03:00
Alexei Dobrohotov
822b20ef46
Fix invalid strips-based collision shape transformation 2019-09-23 20:38:42 +03:00
Alexei Dobrohotov
0a97dd8e84
[Regression] Fix horribly broken fallback loading 2019-09-21 15:05:12 +03:00
Andrei Kortunov
1f3f3dd1a5
Merge pull request #2526 from Capostrophic/config 
openmw.cfg-related fixes (incl. bug 2976)
 2019-09-20 09:09:38 +04:00
Andrei Kortunov
e6b79d100a
Merge pull request #2503 from Capostrophic/keyword 
Allow usage of more keywords as string arguments (bug #5087)
 2019-09-20 07:38:57 +04:00
Andrei Kortunov
e568ad30ea Copy transformations data when we clone node (bug #5163) 2019-09-19 11:35:15 +04:00
Capostrophic
3a912485ca openmw.cfg-related fixes 
Make sure the defaults exist in local openmw.cfg too
Make sure constant attenuation settings are defined now that they are implemented
Fix config file loading order once and for all (bug #2976)
 2019-09-17 21:26:06 +03:00
Capostrophic
83f61d1636 Support target color in NiMaterialColorController (bug #5159) 2019-09-16 22:31:18 +03:00
Capostrophic
8baddefdbd Refactor extra data and particle modifier handling 
Objects no longer inherit from extra data class
"Controlled" harmful abstraction no longer exists
Introduced NiParticleModifier/NiParticleCollider abstractions
Extra data size reading moved into the base read() method
 2019-09-13 20:26:22 +03:00
capostrophic
8f2ed884a5 Allow usage of more keywords as string arguments (bug #5087) 2019-09-06 19:12:08 +03:00
Capostrophic
c0438a0c6b Avoid using getPtr on empty geometry data 2019-08-26 23:01:58 +03:00
Alexei Dobrohotov
64fde2d7c2
Fix crash when NiGeometry lacks NiGeometryData 2019-08-24 22:34:56 +03:00
capostrophic
9c7474f88c Implement NiPalette support (feature #4882) 2019-08-16 20:21:09 +03:00
capostrophic
efa463af8f Fix non-tiling textures clamp mode (bug #5137) 2019-08-16 16:26:11 +03:00
Andrei Kortunov
d4a8023e1a
Merge pull request #2485 from Capostrophic/lighting 
Add support for QuadraticMethod/LinearMethod setup (bug #4965, continuation)
 2019-08-11 22:17:40 +04:00
capostrophic
62fd2d47a5 Rewrite flickering/pulsing to work more like vanilla (bug #4952) 2019-08-11 20:33:13 +03:00
Alexei Dobrohotov
3668473d6d
Fix comment 2019-08-10 19:22:46 +03:00
Alexei Dobrohotov
eaedf34975
Fix ventriloquism 2019-08-10 19:21:36 +03:00
capostrophic
c0d5cbdc8b Add support for QuadraticMethod/LinearMethod setup (bug #4965) 2019-08-10 13:25:49 +03:00
Alexei Dobrohotov
307e9ba666
Merge pull request #2413 from akortunov/weapon 
Refactor weapon types behaviour
 2019-08-09 20:02:10 +03:00
Andrei Kortunov
f0cef772fa Refactor weapon types behaviour 
1. Move weapon types behaviour from switches to the table (should allow
us to de-hardcode weapon types later)
2. Gereralize bones injection to actors skeletons (instead of using the
hardcoded xbase_anim_sh.nif)
 2019-08-09 19:40:27 +04:00
capostrophic
9e93c9ecd2 Fix multiple-strip NiTriStrips loading 2019-08-08 22:48:24 +03:00
capostrophic
93f73fe87b Fix comparison 2019-08-08 20:41:46 +03:00
capostrophic
7fc3153f62 Reduce code duplication further 2019-08-08 20:29:45 +03:00
capostrophic
91efdf18a9 Reduce Bullet part code duplication 2019-08-08 19:02:08 +03:00
capostrophic
ed154f0e2c Fix typo and replace failsave with an assert 2019-08-08 18:42:58 +03:00
capostrophic
7cc70ffb50 Reduce skinned shape code duplication 2019-08-08 18:37:42 +03:00
capostrophic
bd6c455fd4 Reduce code duplication for non-skinned shapes 2019-08-08 18:12:46 +03:00
capostrophic
b4f54651f8 Make sure strips have valid size 2019-08-08 17:15:33 +03:00
capostrophic
6599a28ecf Generate collision shape based on NiTriStrips 2019-08-08 17:15:33 +03:00
capostrophic
adb06913f7 Add basic NiTriStrips rendering (no physics yet) 2019-08-08 17:09:06 +03:00
capostrophic
8efbdeaa57 Load NiTriStrips/NiTriStripsData (don't do anything yet) 2019-08-08 17:09:06 +03:00
capostrophic
7b6af4a893 Make sure local path includes trailing slash 
Launcher assumes it does
 2019-08-08 17:06:27 +03:00
Andrei Kortunov
8557346fbd Use glow for enchanted arrows (feature #5122) 2019-08-07 12:58:14 +04:00
capostrophic
6928adcee1 Prevent front() and operator[] from causing undefined behavior 2019-08-04 14:47:33 +03:00
capostrophic
168e5050bb Ignore an extra number argument in ModRegion (bug #5110) 2019-08-01 20:48:58 +03:00
Chris Djali
576285573b
Merge pull request #2404 from Capostrophic/framerate 
Make framerate limit configurable in the launcher
 2019-07-19 16:16:20 +01:00
fredzio
ca7ac30f6d Use the POSIX pathconf(2) to determine the maximum path length. 
It fixes build on BSD platforms where PATH_MAX is defined in
<sys/syslimits.h> vs <linux/limits.h> on Linux.
 2019-07-07 01:02:38 +02:00
Alexei Dobrohotov
e4c596adf8
Fix CI builds (attempt №2) 
Gosh darn dem tabs
 2019-07-04 14:12:36 +03:00
Alexei Dobrohotov
e4e513c5dc
Fix CI builds 
Apparently the only tab characters are in this file.
 2019-07-04 13:36:27 +03:00
Nat Meo
bcc5142b32 Issue #4202: Open .omwaddon files without needing to open openmw-cs first. 2019-07-02 16:07:38 +00:00
AnyOldName3
bb72ed9744 Merge branch '9' into 'master' 
IMPORTANT!! racingcrashfix #4766

See merge request OpenMW/openmw!119
 2019-07-01 15:36:40 +00:00
AnyOldName3
8a6a8086da Make in-memory buffers seekable to fix fog of war 2019-07-01 00:07:44 +01:00
Capostrophic
dfb852cbb0 Improve Boost apologia 2019-06-22 18:15:19 +03:00
Capostrophic
49c691d00a Make settings manager locale-independent again 2019-06-22 18:15:19 +03:00
Capostrophic
e06178bf0f Make sure shadow shapes aren't visible (bug #5063) 2019-06-22 18:13:41 +03:00
Andrei Kortunov
b9a1e4d796
Merge pull request #2425 from Capostrophic/esm 
Signedness fixes
 2019-06-21 10:01:10 +04:00
Alexei Dobrohotov
f984f61055
Ignore any fourth AITravel argument for now 2019-06-20 14:18:12 +03:00
Capostrophic
3aa65273c5 Signedness fixes 2019-06-18 14:47:10 +03:00
Evil Eye
698c90b3ee fix builds against MyGUI master 2019-06-16 14:41:34 +02:00
Andrei Kortunov
b66c437700
Merge pull request #2419 from Capostrophic/lod 
Optimizer: Only merge pure osg::Groups
 2019-06-12 18:33:07 +04:00
Andrei Kortunov
4fcbc1c96b
Merge pull request #2391 from Capostrophic/contentselector 
Content selector: don't add file namesakes (bug #2395)
 2019-06-10 10:15:19 +04:00
Capostrophic
6622e36226 Only merge pure osg::Groups in the optimizer 2019-06-09 11:47:43 +03:00
Capostrophic
7c8360d0f3 Use NiSwitchNode initial index field 2019-06-09 01:58:02 +03:00
Alexei Dobrohotov
ce92b364e6
Merge pull request #2403 from akortunov/crashinfo 
Improve info message about missing GDB
 2019-06-06 11:09:46 +03:00
bzzt
a730365ea1 Creanup Distant Terrain code 
- Cull terrain in the stock osg::CullVisitor
- Do not compile composite maps for shadow camera
- Do not abuse userdata for composite maps
 2019-06-05 19:09:57 +04:00
bzzt
e4ba6ecf15 Do not store a LOD callback in the every QuadTreeNode 2019-06-05 18:27:37 +04:00
bzzt
a61c0aaee1 Do not load height data to the qued tree since we do not need it now 2019-06-05 18:27:37 +04:00
bzzt
ebcf8ca062 Do not store a ViewDataMap in the every QuadTreeNode 2019-06-05 18:27:37 +04:00
bzzt
cb6d27fb12 Use the custom LineSegmentIntersector for QuadTree to simplify traversal 
code
 2019-06-05 18:27:37 +04:00
bzzt
ce4e8be9ac Move traverse methods to the QuadTreeNode 2019-06-05 18:27:37 +04:00
Capostrophic
b7afb213ae "Handle" RepairedOnMe scripting function (feature #4255) 2019-06-03 02:17:32 +03:00
Alexei Dobrohotov
f0640cbb21
Merge pull request #2296 from akortunov/blend 
Optimize blendmap generation
 2019-06-03 00:10:22 +03:00
bzzt
528cda8032 Prevent layers duplication when a terrain chunk crosses plugin borders 2019-06-01 14:52:42 +04:00
Andrei Kortunov
1da012f6ee Optimize blendmap generation 2019-06-01 14:37:29 +04:00
Alexei Dobrohotov
5965aa991b
Improve grammar in a warning 2019-06-01 00:06:49 +03:00
Capostrophic
0fcb75fb21 Achieve CHIM and get rid of the loop 2019-05-31 20:01:46 +03:00
Capostrophic
5cd781b3eb Experimental folder handling rewrite 2019-05-31 20:01:46 +03:00
Capostrophic
2fbed21f83 Avoid a memory leak 2019-05-31 20:01:46 +03:00
Capostrophic
e14ada8f36 Make file name comparison case-insensitive 2019-05-31 20:01:46 +03:00
Capostrophic
ebe5448816 Content selector: drop duplicates of the added file (bug #2395) 2019-05-31 20:01:46 +03:00
Andrei Kortunov
f1db97fbbd Improve info message about missing GDB (bug #4341) 2019-05-30 14:51:31 +04:00
bzzt
ffe8bbd2dd racingcrashfix #4766 2019-05-29 13:37:00 +00:00
Andrei Kortunov
7c53b99d31 Avoid possible data race during access to the static local variable 2019-05-24 08:03:45 +04:00
Phillip Andrews
dee72e9430 Make script literal lookup functions safer 
Assert isn't really the right way to range check these, since in theory we could have a malformed compiled script.  This should make it safer with zero performance overhead.
 2019-05-21 17:58:10 -05:00
Alexei Dobrohotov
7c46102f0c
Merge pull request #2389 from akortunov/fmt 
Introduce a custom format() function
 2019-05-21 21:45:52 +03:00
Andrei Kortunov
6832a2fa9a Remove BOM from CPP files (allows to build OpenMW with LCC on Elbrus) 2019-05-21 19:22:34 +04:00
Andrei Kortunov
e679190f31 Introduce a custom format() function to get rid of boost::format() and hackish replace() 2019-05-20 09:20:01 +04:00
Alexei Dobrohotov
2c956398c1
Actually fix bug 4938 2019-05-15 21:41:49 +03:00
Alexei Dobrohotov
1444ef6f43
Merge pull request #2298 from akortunov/optimize 
Do not allocate eight dummy LightStateAttribute's for every stateset
 2019-05-11 02:32:34 +03:00
Alexei Dobrohotov
acae586765
Merge pull request #2365 from akortunov/guifixes 
Refactor Settings::Manager::apply()
 2019-05-04 21:01:15 +03:00
Andrei Kortunov
4f42fe5595 Refactor Settings::Manager::apply() 2019-05-04 21:38:36 +04:00
Alexei Dobrohotov
1bfe0e43af
Merge pull request #2360 from akortunov/guifixes 
Do not track resolution settings changes in the InputManager
 2019-05-04 20:23:03 +03:00
Alexei Dobrohotov
74112976b2
Merge pull request #2085 from akortunov/herbalism 
Native graphics herbalism support
 2019-05-03 20:58:22 +03:00
Andrei Kortunov
7ce07e9202
Merge pull request #2345 from Capostrophic/scripting 
More argument usage corrections
 2019-05-03 08:06:06 +04:00
Ilya Zhuravlev
2e1ac51203 Clean up androidpath 2019-05-02 18:18:49 -04:00
Andrei Kortunov
861d41f4a4 Native graphics herbalism support (feature #5010) 2019-05-02 23:03:47 +04:00
Capostrophic
95751ba671 Ignore extra numerical arguments for ForceGreeting, Position(Cell), PlaceItem(Cell) 2019-05-02 20:50:05 +03:00
Capostrophic
05727f2bcd Ignore string arguments for AITravel, GetDynamic, LowerRank, RaiseRank 2019-05-02 20:50:05 +03:00
Andrei Kortunov
0cd8d4b842 Do not track resolution settings changes in the InputManager (bug #4902) 2019-05-02 19:00:47 +04:00
Capostrophic
05d94d35f9 Make disabled shadow defines map static 2019-04-29 19:31:46 +03:00
Andrei Kortunov
7941fd6780 Merge branch 'patch-2' into 'master' 
Add support for OpenGLES 3.2

See merge request OpenMW/openmw!93
 2019-04-24 17:03:10 +00:00
Bret Curtis
e0edecf1f2
Merge pull request #2341 from Capostrophic/scripting 
Allow using functions in non-conditional expressions (bug #3725)
 2019-04-24 12:05:07 +02:00
Andrei Kortunov
bd2188a0f8 Use the logging system for compiler errors 2019-04-23 22:20:18 +04:00
Capostrophic
3d64a46df2 Allow using functions in non-conditional expressions (bug #3725) 2019-04-22 20:37:32 +03:00
Andrei Kortunov
9059971a69 Increase required MyGUI version to 3.2.2 2019-04-22 20:52:18 +04:00
Alexei Dobrohotov
53d704fec8
Merge pull request #2335 from akortunov/guifixes 
Allow to shrink tooltip width to its actual text width
 2019-04-22 19:44:17 +03:00
Andrei Kortunov
626a05f825
Merge pull request #2128 from Capostrophic/blood 
Support all eight possible blood types (feature #4958)
 2019-04-21 21:14:30 +04:00
Andrei Kortunov
7e0bf40dbe Allow to shrink tooltip width to its actual text width (bug #3812) 2019-04-21 08:27:14 +04:00
Capostrophic
6cbec4a688 Stray argument usage corrections 2019-04-19 21:28:06 +03:00
terrabyte25
b29476de58
Add support for OpenGLES 3.2 2019-04-15 17:09:36 -05:00
Capostrophic
7814bd1b76 Support eight possible blood types (feature #4958) 2019-04-14 18:48:31 +03:00
elsid
4500f01efd
Remove unused field 2019-04-13 13:25:49 +02:00
Alexei Dobrohotov
5b8fc5a151
Merge pull request #2314 from OpenMW/stdc++14 
bump from C++11 to C++14
 2019-04-12 17:34:18 +03:00
Bret Curtis
f4e113e7c1
Merge pull request #2277 from akortunov/terrain 
Camera-related fixes
 2019-04-12 11:17:20 +02:00
Bret Curtis
10643a10f2
Merge branch 'master' into lighting 2019-04-11 09:55:09 +02:00
Alexei Dobrohotov
d3e6921946
Merge pull request #2318 from elsid/navmesh_lock_tile 
Avoid work duplication for multiple thread async navmesh updater
 2019-04-11 00:19:52 +03:00
elsid
c683dc8565
Lock navmesh tile by thread while processing 
To avoid duplicated work on a same tile by different threads.
If tile is locked by another thread, then post job into this thread queue.
 2019-04-10 22:01:50 +02:00
Capostrophic
85e99182ce Revise light source configuration (bug #4965) 
Set up attenuation less awkwardly
Use global attenuation settings for magic light source
Use constant attenuation settings
 2019-04-10 22:31:31 +03:00
Bret Curtis
2ab7f903d7 make use of std::make_unique to test that MSVC2015 can handle that 2019-04-10 11:09:44 +02:00
Capostrophic
b08fed6d83 Fix NIF printVersion and allow 4.0.0.0 file loading 2019-04-09 21:58:29 +03:00
Andrei Kortunov
14b756a692 Use a generic logging system for RecastNavigation 2019-04-08 20:31:21 +04:00
Bret Curtis
7808cbbfe8
Merge pull request #2292 from akortunov/fallback 
Make fallback map static to simplify constructors
 2019-04-07 17:43:59 +02:00
bzzt
391f6faffb Remove unused defaultViewer / defaultViewPoint 2019-04-07 11:21:09 +04:00
bzzt
e908790584 Inherit the view point from main camera for water RTT cameras 2019-04-07 11:21:07 +04:00
Andrei Kortunov
489e5c6cce Store preloaded terrain view in the main thread 2019-04-07 11:15:21 +04:00
bzzt
63ab7345be Reuse traversal result for different traversal with same view point 
Rename eyePoint to viewPoint to match OSG conventions (eyePoint is the camera position, viewPoint is for LOD handling)
 2019-04-07 11:14:37 +04:00
Bret Curtis
a5504f8cc1
Merge pull request #2297 from Capostrophic/esm 
Make sure the record hasn't ended in getHString hack (bug #4938)
 2019-03-31 21:15:23 +02:00
bzzt
1a65adacdd Do not allocate dummy LightStateAttribute's for every stateset 2019-03-30 21:36:08 +04:00
Capostrophic
4b6fc5f720 Make sure the record hasn't ended in getHString hack (bug #4938) 2019-03-30 20:11:22 +03:00
Andrei Kortunov
368d1f9d25
Merge pull request #2191 from akortunov/viewer 
Do not store Viewer reference in the ViewData
 2019-03-30 08:24:44 +04:00
Andrei Kortunov
cae456a4aa
Merge pull request #2294 from Capostrophic/arguments 
Ignore extra arguments to PlayLoopSound3D too
 2019-03-30 08:18:39 +04:00
Capostrophic
7ef7555c19 Ignore extra arguments to PlayLoopSound3D too 2019-03-30 01:06:01 +03:00
Andrei Kortunov
a302ec9c65 Make fallback map static to simplify constructors 2019-03-29 15:30:49 +04:00
Capostrophic
17dce28705 Improve compiler messages 2019-03-29 00:59:26 +03:00
bzzt
c8d2107b80 Do not store Viewer reference in the ViewData 2019-03-28 09:51:45 +04:00
Bret Curtis
1e9eac568f
Merge pull request #2249 from akortunov/cache 
Implement generic caching system
 2019-03-25 13:32:23 +01:00
Bret Curtis
6cbf1288ff
Merge pull request #1929 from Capostrophic/elseif 
Ignore the rest of the line after else operator (bug #3006)
 2019-03-24 16:35:49 +01:00
Capostrophic
cbce1a1b7c Ignore the rest of the line after else (bug #3006) 2019-03-24 18:34:33 +03:00
Bret Curtis
8f8bba66d9
Merge pull request #2178 from Capostrophic/declaration 
Ignore extra text after a local variable declaration (bug #4867)
 2019-03-24 16:33:21 +01:00
Capostrophic
786f3e5fc3 Remove unused and unfinished blendmap packing feature 2019-03-22 22:15:28 +03:00
Capostrophic
af47ec7756 Skip extra text after variable declaration (bug #4867) 2019-03-21 17:00:40 +03:00
Bret Curtis
5e12073b47
Merge pull request #2272 from akortunov/optimize_terrain 
Do not block loading while compiling composite maps
 2019-03-21 09:17:02 +01:00
Andrei Kortunov
b466bfee40 Enable light sources directly to avoid virtual calls 2019-03-21 10:27:50 +04:00
Andrei Kortunov
0e1f5f68b6 Do not allow different threads to compile the same composite map 2019-03-21 08:52:13 +04:00
Andrei Kortunov
cad45e96ac Remove redundant mCompile set - we do not use data from it anyway 2019-03-21 08:42:48 +04:00
bzzt
c2986b3bd7 Do not block the loading thread while compiling composite maps in the 
draw thread
 2019-03-20 21:42:53 +04:00
Bret Curtis
26feedfcae
Merge pull request #2268 from akortunov/scanfix 
Fix some issues from the Coverity Scan report
 2019-03-19 17:27:48 +01:00
Bret Curtis
19dcbf2b3d
Merge pull request #2266 from Capostrophic/vsync 
Vsync tweaks
 2019-03-19 09:23:48 +01:00
Andrei Kortunov
b2fca46206 Fix a couple of minor issues in shadows 2019-03-19 09:14:07 +04:00
Andrei Kortunov
7995a92672 Initialize missing variables 2019-03-19 09:12:31 +04:00
Capostrophic
9b65f0dbca Vsync tweaks 
Try to use adaptive vsync if available
Don't use vsync if unavailable
 2019-03-18 21:45:02 +03:00
Bret Curtis
b819690e82
Merge pull request #2264 from akortunov/optimize_terrain 
Delete composite map layers in the background thread
 2019-03-18 13:52:17 +01:00
bzzt
aa5a071aef Delete composite map layers in the background thread 2019-03-18 14:00:50 +04:00
Bret Curtis
d56733149c
Merge pull request #2201 from akortunov/optimize_terrain 
Optimize terrain
 2019-03-18 08:59:10 +01:00
Bret Curtis
45221418bd
Merge pull request #2260 from elsid/fix_clean_unused_navmeshes 
Fix clean unused navmeshes
 2019-03-18 08:57:46 +01:00
bzzt
6029ed4ecc Reject empty quad tree nodes at the cell level without land data 2019-03-18 10:27:29 +04:00
bzzt
36fa51b6ad Fix bounding box calculation for terrain shapes 2019-03-18 10:27:09 +04:00
elsid
4624f31788
Report navigator stats 2019-03-17 22:15:18 +03:00
elsid
8adc83f6e2
Fix clean unused navmeshes 
weak_ptr doesn't have constructor for shared_ptr&& type, so ptr wasn't
moved, just copied.
 2019-03-17 21:28:34 +03:00
elsid
2c78d530a2
Use static vector to store stat names 2019-03-17 20:50:15 +03:00
Bret Curtis
ab69ad65ed
Merge pull request #2234 from Capostrophic/terrain 
Some more improvements from bzzt's branch
 2019-03-17 18:07:19 +01:00
Capostrophic
de572226e4 Update optimizer with upstream improvements 2019-03-17 07:59:16 +03:00
bzzt
b42ad0f610 Inline certain terrain storage functions 2019-03-17 07:27:27 +03:00
bzzt
e131e6699c Match vertex colors data type to source 2019-03-17 07:24:22 +03:00
elsid
c91deaf7af
Use std::vector::data method to avoid reference binding to null pointer 2019-03-16 00:46:00 +03:00
elsid
dd0b45ede6
Do not pass nullptr to std::memcmp 2019-03-14 22:15:57 +03:00
Bret Curtis
7917f1fc84
Merge pull request #2252 from akortunov/terrain 
Do not allocate empty callbacks in the RigGeometry
 2019-03-14 14:53:35 +01:00
bzzt
4ab93aeffe Do not allocate empty callbacks in the RigGeometry 2019-03-14 12:37:41 +04:00
Andrei Kortunov
2ed05a5195 Implement generic caching system 2019-03-14 09:10:19 +04:00
elsid
8e09468f45
Don't set display list usage for navmesh 2019-03-12 00:05:55 +03:00
Bret Curtis
7b1a62fc1d
Merge pull request #2247 from akortunov/loadtex 
Allow to override texture records in the game
 2019-03-11 21:05:30 +01:00
Andrei Kortunov
943279abbb Consider land texture with given ID and index as override for base texture with the same ID and index (bug #4736) 2019-03-11 20:19:19 +04:00
Bret Curtis
7efdddd53c
Merge pull request #2242 from elsid/make_shared 
Use std::make_shared
 2019-03-11 07:53:02 +01:00
Bret Curtis
cb1a5f3679
Merge pull request #2245 from elsid/navigator_refactor 
Refactor navigator related code
 2019-03-11 07:51:43 +01:00
Bret Curtis
7b793b8809
Merge pull request #2244 from elsid/navmesh_cache_item_refactor 
Make NavMeshCacheItem consistent
 2019-03-11 07:51:22 +01:00
elsid
68948bc847
Avoid key allocation to find tile in cache 2019-03-11 03:01:41 +03:00
elsid
4395a92c35
Use display list to render navmesh 
Slightly improves performance of massive navmesh rendering.
 2019-03-10 23:58:49 +03:00
elsid
849f2078c1
Swap outside critical section 2019-03-10 23:58:49 +03:00
elsid
8d2af94b75
Use default objects for NavigatorStub methods result 2019-03-10 23:58:49 +03:00
elsid
ece111d05a
Check for jobs using predicate 2019-03-10 23:58:49 +03:00
elsid
c05fc9e054
Add missing cleanup 2019-03-10 23:58:49 +03:00
elsid
ce9aebcba1
Clear all changed tiles after post 2019-03-10 23:58:48 +03:00
elsid
9d61c49478
Store key by reference in tiles map 2019-03-10 23:56:52 +03:00
elsid
614d5243c3
Make NavMeshCacheItem consistent 
Move all logic related to this type into its methods.
 2019-03-10 23:07:36 +03:00
elsid
b3c5d64ff3
Use std::make_shared 2019-03-10 22:07:46 +03:00
elsid
f6a1d3cecf
Store weak pointers to navmesh in jobs queue 
To avoid useless processing for removed navmeshes.
 2019-03-10 17:06:19 +03:00
elsid
ccc709a316
Store guarded navmesh cache item in shared_ptr 
Remove useless SharedGuarded type.
 2019-03-10 17:06:19 +03:00
elsid
0479ebf5ae
Remove unused actors and navmeshes on update 
When there is only one actor (player) on a scene and it moving to other
cell first it will be removed from navigator then added. Remove cause
navmesh removing for its half extents. After it is added navmesh for
same half extents is created and added. While this all happens there are
still jobs for old navmesh are processing. Old navmesh still exists
because it is stored by shared pointer. So jobs take tiles from cache
and place them into old navmesh. After that other jobs take same tiles
from cache (half extents and coordinates are equal) and place them into
other navmesh. dtNavMesh changes tile data on add and remove. Adding tile
to two dtNavMesh corrupts tile in both nameshes.
 2019-03-10 17:06:15 +03:00
Chris Djali
c328c4a010
Merge pull request #2231 from akortunov/warnfix 
Get rid of C-style limits in the shadows code
 2019-03-09 19:00:39 +00:00
Andrei Kortunov
bacaa1f789 Get rid of C-style limits in the shadows code 2019-03-09 13:52:03 +04:00
Andrei Kortunov
12f9184d00 Allow to interrupt terrain preloading 2019-03-09 13:15:23 +04:00
Andrei Kortunov
b214c54b3a Calculate bounding volumes when preloading model instance 2019-03-09 13:15:16 +04:00
Bret Curtis
c20e69ef24
Merge pull request #2227 from elsid/fix_twitchy_massive_creatures 
Fix twitchy movement for massive creatures (bug #4907)
 2019-03-09 02:11:11 +01:00
elsid
b9f21ec81a
Use custom steps size to make smooth path depending on half extents 2019-03-08 22:33:34 +03:00
bzzt
e0cf460ba3 Do not load terrain beyond the viewing distance 2019-03-08 22:15:27 +04:00
Andrei Kortunov
a6fd077537 Render nearby default cells if the Distant Terrain is disabled 2019-03-08 22:15:27 +04:00
Andrei Kortunov
46e1ed660c Revert "Render default land texture for Wilderness cells with distant terrain" 
This reverts commit 888c2d9a33.
 2019-03-08 22:15:27 +04:00
elsid
f2e47d640d
Add option to limit max number of navmesh tiles 2019-03-08 17:39:04 +03:00
elsid
ff47df4f2c
Repost navmesh update jobs when failed because of out of memory 
DT_OUT_OF_MEMORY error is returned when limit of tiles is reached.
 2019-03-08 17:39:04 +03:00
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