mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 23:49:55 +00:00
Code Issues Releases Wiki Activity
23214 commits 38 branches 54 tags 122 MiB
Commit graph

23214 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
e4358d1489
Merge pull request #2782 from OpenMW/psi29a-patch-1 
build bsa and esm tools
 2020-04-30 13:51:34 +02: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
Bret Curtis
d8c8bc33b7
Merge pull request #2814 from Capostrophic/autoequip 
Revert an invalid attempt to autoequip shields instead of torches
 2020-04-30 09:35:58 +02:00
Capostrophic
844838c46a Revert an invalid attempt to autoequip shields instead of torches 2020-04-30 00:12:52 +03:00
Alexei Dobrohotov
1bcf38c3d8
Merge pull request #2812 from elsid/fix_gcc_5_build 
Workaround for GCC 5 bug
 2020-04-29 19:32:27 +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
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
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
Bret Curtis
3ba77b933a "compute tight scene bounds" reset back to true until it is decided how best to handle this in settings 2020-04-27 08:45:52 +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
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
Alexei Dobrohotov
afa502cfba
Merge pull request #2800 from elsid/rm_unused 
Remove unused code
 2020-04-26 22:14:24 +03:00
Roman Siromakha
4f75211e25
Merge pull request #2808 from Capostrophic/spellcleanup 
Clean up spellcasting
 2020-04-26 17:46:23 +02:00
Capostrophic
a3cd3281fb Use an array instead of a map in spellSchoolToSkill() 2020-04-26 16:21:05 +03:00
fredzio
916a9641fc Delete support for 2-arguments opcodes - it was never used 2020-04-26 00:56:11 +02:00
Capostrophic
4838cf7362 Clean up spellcasting 2020-04-26 00:42:40 +03: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
Andrei Kortunov
528fc5870a
Merge pull request #2804 from elsid/fix_warnings 
Fix warnings
 2020-04-25 08:25:13 +04:00
elsid
ffacc30597
Use std::array for a list of extensions 
This list doesn't change and the size is known at compile time.
 2020-04-25 01:51:15 +02:00
elsid
975e4f9908
Fix warning -Wrange-loop-construct 
apps/openmw/mwgui/loadingscreen.cpp:81:36: warning: loop variable 'extension' of type 'const std::__cxx11::basic_string<char>' creates a copy from type 'const std::__cxx11::basic_string<char>' [-Wrange-loop-construct]
                    for(auto const extension: supported_extensions)
                                   ^
apps/openmw/mwgui/loadingscreen.cpp:81:25: note: use reference type 'const std::__cxx11::basic_string<char> &' to prevent copying
                    for(auto const extension: supported_extensions)
                        ^~~~~~~~~~~~~~~~~~~~~
                                   &
 2020-04-25 01:38:15 +02:00
Alexei Dobrohotov
cf812d4a0d
Merge pull request #2801 from elsid/update_recastnavigation 
Update recastnavigation to 57610fa6ef31b39020231906f8c5d40eaa8294ae
 2020-04-24 22:50:04 +03:00
elsid
847cd41b01
Update recastnavigation to 57610fa6ef31b39020231906f8c5d40eaa8294ae 2020-04-24 20:40:22 +02:00
elsid
c59c8ae1f4
Remove unused macro 2020-04-24 20:38:55 +02:00
elsid
ee60d4bcea
Remove unused ItemStack::stacks 2020-04-24 20:38:55 +02: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
55afa444a9
Merge pull request #2797 from Capostrophic/changelog 
Remove issue that hasn't been solved properly from the changelog
 2020-04-24 08:47:07 +02: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
Alexei Dobrohotov
10d323e32c
Merge pull request #2798 from elsid/log_shader_name 
Log shader template name on parse error
 2020-04-23 22:48:48 +03: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
Capostrophic
89ff1974ee Remove issue that hasn't been solved properly 2020-04-23 13:14:48 +03: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