Alexei Dobrohotov
12833d66af
Merge pull request #2822 from Assumeru/magic-ai-numbers
...
Remove magic numbers and casts
2020-05-07 13:05:33 +03:00
Bret Curtis
1fbf5c5869
Merge pull request #2821 from Assumeru/template
...
Remove redundant templating
2020-05-06 17:17:24 +02:00
Evil Eye
19f12cb3fe
remove magic numbers and casts
2020-05-05 19:37:15 +02:00
Evil Eye
f9881b699c
remove redundant templating
2020-05-05 19:18:23 +02:00
Bret Curtis
b4aeb2711c
Merge pull request #2809 from Capostrophic/spellcasting
...
Refactor spellcasting header and implementation (task #5339 )
2020-05-05 17:17:13 +02: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
Bret Curtis
0776de8f61
Merge pull request #2820 from elsid/shader_parser_tests
...
Shader parser tests
2020-05-03 02:51:46 +02:00
elsid
1f3dfaedcc
Add tests for ShaderManager
2020-05-02 17:59:49 +02:00
elsid
ca649003ed
Use googletest 1.10.0
...
To get support for INSTANTIATE_TEST_SUITE_P macro
2020-05-02 17:56:32 +02:00
elsid
edf002aa97
Rename argument shaderTemplate to templateName
2020-05-02 17:56:24 +02:00
psi29a
b9cd8d23a4
Merge branch 'cs-crash-on-exit-fix' into 'master'
...
Stop the CS crashing on exit - Close graphics context while it still exists
See merge request OpenMW/openmw!182
2020-05-02 10:25:59 +00: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
Bret Curtis
a23ab48251
Merge pull request #2708 from elsid/detournavigator_limit_update_frequency
...
Limit frequency for navmesh updates
2020-05-01 23:45:39 +02:00
Alexei Dobrohotov
7ba8176862
Merge pull request #2819 from elsid/fix_ub
...
Fix UB in NpcAnimation::mNpcType initialization
2020-05-01 21:49:04 +03:00
elsid
b150d681a9
Update same navmesh tile with limited frequency
2020-05-01 18:05:58 +02:00
Roman Siromakha
8c0674490d
Merge pull request #2818 from Capostrophic/shield
...
Fix usage of uninitialized weapon type in equipmentChanged()
2020-05-01 17:52:10 +02:00
elsid
6d8debe009
Initialize variable without reading itself
2020-05-01 17:23:10 +02:00
Capostrophic
87ba0bb0e0
Fix usage of uninitialized weapon type in equipmentChanged()
2020-05-01 16:37:40 +03:00
Bret Curtis
eeb13ad8a3
Merge pull request #2817 from elsid/fix_build
...
Fix build with boost 1.73
2020-05-01 00:40:28 +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
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
16f6c7b27f
Use the new option to treat TGA files as TGA 1.0
2020-04-30 09:57:58 +03: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
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
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
Capostrophic
69cd53ef8a
Fix reflect
2020-04-27 14:06:50 +03: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
Capostrophic
e7f91ff341
Simplify some inflict() logic
2020-04-27 12:50:09 +03: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
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
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