1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:23:52 +00:00
Commit graph

23187 commits

Author SHA1 Message Date
Capostrophic
4c1c30db33 Address akortunov's concerns regarding spell refactoring
Separate linked effect handling into linked effects header
Separate spell absorption handling into spell absorption header
Make armor disintegration loop a range-based for loop
2020-04-27 12:05:17 +03:00
Capostrophic
b1d857818d Clean up CastSpell 2020-04-26 22:17:38 +03:00
Capostrophic
8d22e075e6 Separate functions that don't belong to CastSpell class 2020-04-26 22:17:38 +03:00
Capostrophic
db13984db0 Separate spell resistance 2020-04-26 21:13:59 +03:00
Capostrophic
5973285446 Move isSummoningEffect to summoning 2020-04-26 21:13:59 +03:00
Capostrophic
5535a7fb44 Move getSummonedCreature() to summoning 2020-04-26 18:58:33 +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
Capostrophic
4838cf7362 Clean up spellcasting 2020-04-26 00:42:40 +03: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
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
Bret Curtis
e791e65684
Merge pull request #2793 from Capostrophic/distancebias
Pick the correct aggressive actor in fight distance bias calculation
2020-04-23 00:09:36 +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
David Cernat
65a669344b Merge branch 'magic_numbers' into 'master'
compromise on magic numbers making things easier to follow

See merge request OpenMW/openmw!181
2020-04-22 19:29:19 +00:00
David Cernat
728b92c4d8 Merge branch 'bzzt_6_fix_shadows_in_screenshot_with_octreeoclusion' into 'master'
fix shadows in save game screenshot

See merge request OpenMW/openmw!183
2020-04-22 19:24:43 +00:00
Bret Curtis
c359406473 taking anyoldname3 review comments to heart; typo fixes plus rebase 2020-04-22 20:29:50 +02:00
bzzt
1cd4b9ee68 fixes shadows on savegame screenshot 2020-04-22 20:18:29 +02:00
Bret Curtis
6316227594 hpp not cpp; review 2020-04-22 15:57:24 +02:00
Capostrophic
40766d746c Pick the correct aggressive actor in fight distance bias calculation 2020-04-22 16:06:42 +03: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
Bret Curtis
9fa4136575 Merge branch 'gl_shared_windows_runners' into 'master'
[PoC] give shared windows runners a try

See merge request OpenMW/openmw!180
2020-04-22 10:29:15 +00:00
Bret Curtis
6f1767c374 just get the thing working and leave it up to someone with more win10 knowledge than myself :) 2020-04-22 10:36:11 +02:00
Andrei Kortunov
9dfa43866d
Merge pull request #2792 from Capostrophic/fatalerror
Fix outdated bug tracker links
2020-04-22 08:29:43 +04:00
Capostrophic
9106e3646c Fix outdated bug tracker links 2020-04-22 01:45:11 +03:00
Bret Curtis
b38459e505 powershell hell 2 2020-04-22 00:30:08 +02:00
Bret Curtis
0021dabd8e powershell hell 2020-04-22 00:22:48 +02:00
Bret Curtis
ade265ec6b give shared windows runners a try 2020-04-21 23:44:55 +02:00
Bret Curtis
a205c924b6
Merge pull request #2791 from Capostrophic/animspeed
Consider the first person movement sneaking if it's actually sneaking
2020-04-21 12:24:45 +02:00
Capostrophic
6731843691 Consider the first person movement sneaking if it's actually sneaking 2020-04-21 09:32:34 +03:00
Alexei Dobrohotov
8fc56e4614
Merge pull request #2788 from Capostrophic/pickup
Make sure non-carriable light sources can't be picked up
2020-04-20 23:54:20 +03:00
Alexei Dobrohotov
96dce1a1c9
Merge pull request #2789 from Capostrophic/changelog
Fix changelog particle lighting entry
2020-04-20 23:53:21 +03:00
Capostrophic
af335d7127 Fix changelog particle lighting entry 2020-04-20 23:51:00 +03: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
Capostrophic
dab09180ae Make sure non-carriable light sources can't be picked up 2020-04-20 22:13:37 +03:00