mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-10-31 20:26:48 +00:00
Code Issues Releases Wiki Activity
23464 commits 38 branches 54 tags 122 MiB
Commit graph

4468 commits

Author SHA1 Message Date
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
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
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