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

25763 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Cernat
94b211dd4f [Client] Synchronize changes to gold pools from other services 2020-05-20 08:09:25 +03:00
David Cernat
3c51f1c23a [General] Include last gold restock time in ObjectMiscellaneous packets 2020-05-16 19:10:11 +03:00
David Cernat
7833ae9a3f [Server] Add script functions for getting, setting & sending gold pools 2020-05-16 05:23:41 +03:00
David Cernat
23ff7b9610 [General] Synchronize gold pools for traders via ObjectMiscellaneous 2020-05-16 02:51:11 +03:00
David Cernat
297a254210 [General] Rename unused ScriptMemberFloat packet to ObjectMiscellaneous 2020-05-15 13:29:30 +03:00
David Cernat
95e5e6d33d [Client] Prevent constant loss of key focus for chat window 2020-05-11 01:57:19 +03:00
David Cernat
dc0ce09ab6 [Client] Replace unused method in GUIController with getChatEditState() 2020-05-11 01:54:07 +03:00
David Cernat
053a5a6258 Add OpenMW commits up to 9 May 2020 
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/aiextensions.cpp
 2020-05-09 15:17:04 +03:00
Andrei Kortunov
4a1e27ac21
Merge pull request #2824 from Capostrophic/cleanup 
Cleanup
 2020-05-09 14:46:17 +04:00
Andrei Kortunov
8e1f7b00d1
Merge pull request #2826 from Capostrophic/verifier 
Verifier: Don't check race of non-skin body parts (bug #5400)
 2020-05-09 14:19:03 +04:00
Andrei Kortunov
300b5b2620
Merge pull request #2827 from Capostrophic/dialogue 
Only reset dialogue history of dialogue GUI mode is gone
 2020-05-09 14:17:09 +04:00
Capostrophic
45e6a03937 Only reset dialogue history of dialogue GUI mode is gone 2020-05-09 02:01:55 +03: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
Capostrophic
039c9a37eb Verifier: Don't check race of non-skin body parts (bug #5400) 
Remove unnecessary flag field check
Remove magic numbers
 2020-05-09 00:31:10 +03: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
Alexei Dobrohotov
ab69b65640
Merge pull request #2825 from Sisah2/android_fix 
Fix parallax and specular for android
 2020-05-08 17:31:35 +03:00
Sisah
b19f53aab6 Fix parallax and specular for android 2020-05-08 15:55:22 +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
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