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

16432 commits

Author SHA1 Message Date
Nikolay Kasyanov
6ef94c20b3 Fix macOS packaging on CMake 3.15 
It looks like component names have become case sensitive.
 2019-11-30 10:37:05 +01:00
Andrei Kortunov
1b98fe4395 Fix GCC9 warnings about implicit declarations 2019-11-29 12:41:23 +04:00
Andrei Kortunov
407a737fe4
Merge pull request #2611 from Capostrophic/effect 
[Regression] Make sure instant FX abilities get detected when they're supposed to
 2019-11-28 08:20:39 +04:00
Bret Curtis
62b9f1a2f7
Merge pull request #2610 from akortunov/warnfix2 
Fix some build warnings
 2019-11-27 21:24:44 +01:00
Capostrophic
77f076ff11 Make sure instant FX abilities get detected when supposed 2019-11-27 17:15:48 +03:00
Capostrophic
0adc2df65f Make SameFaction work (bug #5213) 2019-11-23 14:47:50 +03:00
Capostrophic
eed92c824e Make sure hand-to-hand shortcut is not saved 2019-11-20 19:57:21 +03:00
bzzt
f09125fc93 perf regression fix 2019-11-20 13:37:00 +00:00
Andrei Kortunov
d0643d266a Do not use fallthrough in switches 2019-11-19 16:10:18 +04:00
Andrei Kortunov
73f43ba750 Do not use screen fading during game loading if there is no current cell (bug #5211) 2019-11-18 22:24:19 +04:00
Andrei Kortunov
4118b20608 Allow ActionOpen and ActionTalk only for player (bug #5210 2019-11-18 12:41:11 +04:00
Alexei Dobrohotov
4208f10e81
Merge pull request #2600 from akortunov/master 
Take in account caster's race height when launch magic bolt
 2019-11-17 21:04:55 +03:00
elsid
f156c9522e
Avoid virtual call in SoundManager dtor 2019-11-17 18:50:11 +01:00
elsid
8083df4567
Avoid virtual call in Animation dtor 2019-11-17 18:50:11 +01:00
elsid
b4794e8ca5
Avoid virtual call in OpenAL_Output dtor 
/home/elsid/dev/openmw/apps/openmw/mwsound/openal_output.cpp:1492:5: warning: Call to virtual function during destruction [clang-analyzer-optin.cplusplus.VirtualCall]
    deinit();
    ^
/home/elsid/dev/openmw/apps/openmw/mwsound/openal_output.cpp:1492:5: note: This destructor of an object of type '~OpenAL_Output' has not returned when the virtual method was called
/home/elsid/dev/openmw/apps/openmw/mwsound/openal_output.cpp:1492:5: note: Call to virtual function during destruction
 2019-11-17 18:50:11 +01:00
elsid
b55f5ab648
Avoid virtual call in WindowManager ctor 
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: warning: Call to virtual function during construction [clang-analyzer-optin.cplusplus.VirtualCall]
        loadUserFonts();
        ^
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: note: This constructor of an object of type 'WindowManager' has not returned when the virtual method was called
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: note: Call to virtual function during construction
 2019-11-17 18:50:11 +01:00
elsid
cf01df31be
Remove unused variable initialization 
/home/elsid/dev/openmw/apps/openmw/mwrender/animation.cpp:518:28: warning: Value stored to 'material' during its initialization is never read [clang-analyzer-deadcode.DeadStores]
            osg::Material* material = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
                           ^
/home/elsid/dev/openmw/apps/openmw/mwrender/animation.cpp:518:28: note: Value stored to 'material' during its initialization is never read
 2019-11-17 18:50:11 +01:00
Andrei Kortunov
6861d9d5e5
Merge pull request #2510 from elsid/ai_open_door 
Open door when it is on the way to a next path point (bug #5073)
 2019-11-17 21:21:22 +04:00
Andrei Kortunov
d1e0fa575e Take in account caster's race height when launch magic bolt (bug #5209) 2019-11-17 16:37:38 +04:00
Andrei Kortunov
6554130f6f
Merge pull request #2594 from Capostrophic/summonsummon 
Minor summoned creature cleanup fixes
 2019-11-17 10:47:07 +04:00
Andrei Kortunov
8dbbe42f21 Add missing isNpc() check (bug #5206) 2019-11-17 09:17:03 +04:00
Bret Curtis
454b9f1964
Merge pull request #2597 from akortunov/coverity 
CoverityScan fixes, part 2
 2019-11-14 21:08:03 +01:00
Alexei Dobrohotov
f332df8839
Fix terrain shadows checkbox loading 2019-11-14 19:50:59 +03:00
Andrei Kortunov
b21dc17538 Attempt to shut up CoverityScan warnings about tainted values 2019-11-14 18:28:38 +04:00
Alexei Dobrohotov
b5992b380e
Merge pull request #2586 from unelsson/allowselectionalledges 
Allow selecting cell edges everywhere
 2019-11-14 17:25:48 +03:00
Andrei Kortunov
b210e99abc Avoid divizion by zero 2019-11-14 17:43:21 +04:00
Nelsson Huotari
120583f443 optimize isInCellSelection calls 2019-11-14 11:28:49 +02:00
Andrei Kortunov
3970baeb84 Fix possible usage of destroyed variable 2019-11-13 15:46:49 +04:00
Andrei Kortunov
34873b6065 Fix dead code 2019-11-13 15:29:18 +04:00
Andrei Kortunov
5561eb5415 Do not discard division reminder 2019-11-13 15:18:18 +04:00
Andrei Kortunov
238dcdbbd4 Fix copy-paste error 2019-11-13 15:14:30 +04:00
Andrei Kortunov
5c6ca82c45 Clamp fallback value from config 2019-11-13 15:10:19 +04:00
Andrei Kortunov
079c77ff22 Avoid zero division 2019-11-13 14:57:22 +04:00
Andrei Kortunov
ca2a524a5f Avoid null pointer dereference 2019-11-13 14:50:42 +04:00
Andrei Kortunov
af41e9acc1 Initialize variables to avoid undefined values 2019-11-13 14:47:29 +04:00
Capostrophic
120b7dcd2f Clean up summoned creatures when corpses are disposed 2019-11-12 21:44:46 +03:00
Capostrophic
1097c2cfc4 Minor summoned creature cleanup fixes 2019-11-12 17:50:06 +03:00
Capostrophic
9c78e8cc56 Make sure movement not controlled by animation has valid velocity 
Fixes erroneously always normalized movement speed in first person
 2019-11-12 17:33:44 +03:00
Alexei Dobrohotov
a1ed0144e1
Merge pull request #2590 from akortunov/guifixes 
UI textures scaling corrections
 2019-11-10 13:53:27 +03:00
Andrei Kortunov
1835a39c57 Do not show shields in the 1st-person view when shield sheathing is enabled 2019-11-09 17:48:05 +04:00
Andrei Kortunov
6a625b1dac Scale magic items frames in the quick keys menu 2019-11-09 15:00:50 +04:00
Andrei Kortunov
f335044026
Merge pull request #2587 from Capostrophic/sheathing 
Minor sheathing-related changes
 2019-11-07 20:04:03 +04:00
Capostrophic
5a5bc0bef8 Uncheck sheathing checkboxes automatically when appropriate 
Fix their order and bogus saveSettingBool calls
 2019-11-07 17:24:43 +03:00
Andrei Kortunov
6eb8e0cf4d Display magic effects according to research page 2019-11-07 11:05:18 +04:00
Capostrophic
5eab913a9c Make additional anim sources dependency more obvious 2019-11-05 21:41:56 +03:00
Capostrophic
7885b8c75e Sheathing-related changes 
Add weapon and shield sheathing and use additional anim sources checkboxes into the Advanced tab of the launcher
Remove outdated information from the documentation
 2019-11-04 20:34:06 +03:00
Nelsson Huotari
45d43045eb Remove unused std::string 2019-11-04 12:29:37 +02:00
Nelsson Huotari
aeb0ccff90 Allow selecting cell edges everywhere 2019-11-04 12:16:08 +02:00
Nelsson Huotari
8f6dc78217 Get vertex height from data, if not available in visible cells. 2019-11-04 00:09:23 +02:00
Nelsson Huotari
9677203215 Don't allow vertex selection outside visible cells 2019-11-04 00:09:23 +02:00
Nelsson Huotari
d186bcb46f Update selection during transient edit, clear to a single function. 2019-11-03 13:27:27 +02:00
Andrei Kortunov
678d2e6e7d
Merge pull request #2584 from Capostrophic/shadows 
Resolving 0.46.0 release shadow-related blockers
 2019-11-03 08:35:30 +04:00
Alexei Dobrohotov
5ae91465ee
Fix gamepad zoom value calculation 2019-11-02 19:47:05 +03:00
Capostrophic
208608cbd0 Fix a typo and a mistake 2019-11-02 18:06:39 +03:00
Capostrophic
0e2380d471 Add the most basic shadow settings into the launcher 2019-11-02 18:06:39 +03:00
Alexei Dobrohotov
b700c98e8f
Merge pull request #2581 from akortunov/deceleration 
Implement actors movement deceleration (feature #4544)
 2019-10-31 15:59:18 +03:00
Bret Curtis
ec9a593fc3
Merge pull request #2578 from akortunov/mouse 
Implement mouse wheel bindings (bug #2679)
 2019-10-31 13:14:29 +01:00
Andrei Kortunov
61ab7f3c1e Implement actors movement deceleration (feature #4544) 2019-10-31 14:41:12 +04:00
Michael Stopa
e4bec88a68 Implement mouse wheel bindings (bug #2679) 2019-10-30 20:45:51 +04:00
Alexei Dobrohotov
7328db4d6b
Fix small typo in body part record verifier 2019-10-30 17:51:36 +03:00
Bret Curtis
0ec4e51922
Revert "Store raw data about fog of war instead of RGBA images" 2019-10-30 14:48:44 +01:00
Bret Curtis
36614dba2a
Merge pull request #2453 from akortunov/fog_compression 
Store raw data about fog of war instead of RGBA images
 2019-10-30 13:45:55 +01:00
Andrei Kortunov
45ab6e1430 Implement UTF-8 support for script parser (bug #4598) 2019-10-30 14:59:47 +04:00
Alexei Dobrohotov
7488f402d5
Merge pull request #2576 from akortunov/warnfix 
Fix warnings about variable re-declaration
 2019-10-29 15:03:54 +03:00
Andrei Kortunov
d278e5d4af Fix warnings about variable re-declaration 2019-10-29 13:48:08 +04:00
Capostrophic
c6e431d862 Avoid copying strings in SearchVisitor and readReferenceCollection 2019-10-28 19:28:14 +03:00
Capostrophic
ee4fa93bd4 Rework prevent merchant equipping setting again 2019-10-28 01:58:23 +03:00
Andrei Kortunov
15cd305253 Reset idle animation only when play movement animation (bug #5196) 2019-10-27 12:33:28 +04:00
Alexei Dobrohotov
1f616c5613
Merge pull request #2569 from akortunov/holstered_shield 
Ignore shields sheathing for creatures without sheathing bone
 2019-10-26 12:00:07 +03:00
Andrei Kortunov
b27089f7be
Merge pull request #2560 from Capostrophic/geteffect 
Fix GetEffect result when running on dead actors
 2019-10-26 12:47:58 +04:00
Andrei Kortunov
7cd4fa4706 Ignore shields sheathing for creatures without sheathing bone 2019-10-26 12:41:16 +04:00
Bret Curtis
9f039fac87
Merge pull request #2520 from unelsson/transientlandshapeedit 
[Review phase] Editor: Transient land shape editing
 2019-10-25 00:26:43 +02:00
Bret Curtis
2040ca5637
Merge pull request #2555 from akortunov/encoding 
Encode ID's in all places to UTF-8
 2019-10-24 00:48:12 +02:00
Bret Curtis
afb218fe29
Merge pull request #2564 from Capostrophic/enchant 
Remove on-strike enchantment support for ranged weapon types (bug #5190)
 2019-10-23 15:11:36 +02:00
Bret Curtis
39fd12c065
Merge pull request #2568 from elsid/settings_parser_tests 
Settings parser tests
 2019-10-23 00:30:16 +02:00
Nelsson Huotari
c957f0544c Remove unneeded brackets 2019-10-23 00:34:54 +03:00
Nelsson Huotari
fdc73b87ba Remove includes that aren't needed any more 2019-10-23 00:07:41 +03:00
Nelsson Huotari
9e5db10288 const ref float -> float 2019-10-23 00:02:24 +03:00
Nelsson Huotari
ac5b356e8d Always initialize landShapeNew 2019-10-23 00:01:23 +03:00
Nelsson Huotari
6f9f59dd58 declare cellId and cellCoords in smallest possible scope 2019-10-22 21:26:55 +03:00
Nelsson Huotari
fdcc7fa1d7 0 to nullptr 2019-10-22 21:26:55 +03:00
Nelsson Huotari
a13edbdb42 Bump shape calculation to function 2019-10-22 21:26:55 +03:00
Nelsson Huotari
8d3e7f2815 fix normals at cell edges, better coding standards 2019-10-22 21:26:55 +03:00
Nelsson Huotari
0f6ddfe8e6 change include, cleanup 2019-10-22 21:26:55 +03:00
Nelsson Huotari
12349f4e48 cleanup 2019-10-22 21:26:55 +03:00
Nelsson Huotari
c556885d71 remove unused Qt signal 2019-10-22 21:26:55 +03:00
Nelsson Huotari
deb122ffdb Add optional post-processing (smooth/rough), add/fix tooltips. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
2d34b63b0b Fix logic of land loading when no cell, land or landdata. Fix also draw. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
71eff60d22 Do in-class init. if possible, mLayoutSliderSize -> layoutSliderSize 2019-10-22 21:26:55 +03:00
Nelsson Huotari
a1348d94f9 add missing final specifiers 2019-10-22 21:26:55 +03:00
Nelsson Huotari
16ba32ffd5 assignments to member initialization list 2019-10-22 21:26:55 +03:00
Nelsson Huotari
c2de645c8c override, virtual -> final, remove unused variables, public to private. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
6a3070e680 Fix shape brush setting description 2019-10-22 21:26:55 +03:00
Nelsson Huotari
8a9ca0b3ec Generate new WNAM record based on new land heights, add comments 2019-10-22 21:26:55 +03:00
Nelsson Huotari
96be82a047 Remove terrain vertex selection and brush button when exiting editMode 2019-10-22 21:26:55 +03:00
Nelsson Huotari
8acfa2600f Terrain shape editing related fixes 2019-10-22 21:26:55 +03:00
Nelsson Huotari
5b9debc554 use enum for mbrushshape initialization 2019-10-22 21:26:55 +03:00
Nelsson Huotari
4f9ec24e41 use enum for brushshape at scenetoolshapebrush 2019-10-22 21:26:55 +03:00
Nelsson Huotari
bae8636ec0 Fix brusshape enum values 2019-10-22 21:26:55 +03:00
Nelsson Huotari
c031543420 use enum for brush shapes 2019-10-22 21:26:55 +03:00
Nelsson Huotari
388edfd8cc change manual memory management to std::unique_ptr 2019-10-22 21:26:55 +03:00
Nelsson Huotari
da4abcd7c1 std::set to std::unique and erase. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
6a44cae572 white iterator loop to C++11 range-based for loop. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
bccf36fdbc Convert normals calculations mostly to osg::Vec3f 2019-10-22 21:26:55 +03:00
Nelsson Huotari
45b0f034c3 Split complex if-logic into multiple reasonably named functions 2019-10-22 21:26:55 +03:00
Nelsson Huotari
0ce971c1bb Revert back to less aggressive component-level changes. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
69083369f8 use std::fill instead of for 2019-10-22 21:26:55 +03:00
Nelsson Huotari
3599e804e1 Fix the default value of mBrushSize 2019-10-22 21:26:55 +03:00
Nelsson Huotari
dc7dc93320 Remove unused functions, improve formatting, handle terrain edit click 2019-10-22 21:26:55 +03:00
Nelsson Huotari
1046d57190 Remove unneeded forward declarations. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
55b3fd4418 Use float calculations for circle brush, keep tool options in memory. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
23e7c71a5a Tighter corner checking, clean-up, landSize to ESM::Land::LAND_SIZE. 2019-10-22 21:25:10 +03:00
Nelsson Huotari
8f3c22ccc3 Remove TerrainShapeMode::fixEdges 2019-10-22 21:25:10 +03:00
Nelsson Huotari
1a3fc435b9 Fix alterHeight bugs, don't let broken land edit pass. 2019-10-22 21:25:10 +03:00
Nelsson Huotari
ff18595a86 Reduce code duplification, add bool value to limiting 2019-10-22 21:25:10 +03:00
Nelsson Huotari
60c0a25004 Fix smooth tool and flatten tool. Default tool strength to 8. 2019-10-22 21:25:10 +03:00
Nelsson Huotari
54e13954e8 Improve land steepness limiting code 2019-10-22 21:25:10 +03:00
Nelsson Huotari
4a2d8aaf97 Handle mBrushSize 1. 2019-10-22 21:25:10 +03:00
Nelsson Huotari
16138fc896 Transient land shape editing 2019-10-22 21:25:10 +03:00
Bret Curtis
262d87846c
Merge pull request #2047 from akortunov/holstered_shield 
Shields holstering support
 2019-10-22 16:46:12 +02:00
Andrei Kortunov
d3a3b2f1f6 Shields holstering support (feature #5193) 2019-10-22 09:02:59 +04:00
elsid
862f50346c
Add tests for settings parser 2019-10-21 22:47:24 +02:00
Bret Curtis
36119ec2c4
Merge pull request #2562 from Capostrophic/weather 
Weather-related fixes (incl. bug #4783)
 2019-10-21 21:56:02 +02:00
Alexei Dobrohotov
678970b01d
Merge pull request #2565 from elsid/update_recastnavigation 
Update recastnavigation
 2019-10-21 02:51:28 +03:00
elsid
045ceeac11
Replace foreach macro by for-loop 2019-10-20 20:08:16 +02:00
elsid
07660b5605
Fix detournavigator tests 2019-10-20 18:59:14 +02:00
Alexei Dobrohotov
5d5ec1cf63
Merge pull request #2550 from elsid/fix_path_rebuild 
Fix rebuild path for walking actors (Bug #5181)
 2019-10-20 16:05:29 +03:00
Capostrophic
fc7b4d73a8 Remove on-strike enchantment support for ranged weapon types (bug #5190) 2019-10-20 13:34:42 +03:00
Alexei Dobrohotov
85a5355e5c
Merge pull request #2563 from akortunov/ammofix 
Fix OnStrike bows charges
 2019-10-20 11:25:12 +03:00
Andrei Kortunov
dd781b3da2 Fix OnStrike bows charges (regression #5191) 2019-10-20 10:21:47 +04:00
elsid
e4d0af6a6d
Use z coordinate for path distance when diff by z is greater then actor height 2019-10-19 22:01:32 +02:00
Capostrophic
43b1b9dfa2 Weather-related fixes (incl. bug #4783) 
Simplify some calculations
Fix Blizzard weather direction
Fix sky direction during storm
 2019-10-19 22:47:21 +03:00
elsid
81832f8e17
Reuse distance functions 2019-10-19 12:51:37 +02:00
bzzt
1316816148 fix #5176 2019-10-18 13:37:00 +00:00
Alexei Dobrohotov
dec64a7fba
Fix typos in invalid spell effect warnings, clarify them 2019-10-17 23:45:27 +03:00
Andrei Kortunov
6e6d6d7bda Use forward declaration 2019-10-14 15:40:35 +04:00
Andrei Kortunov
606b73ee96 Use rain settings from openmw.cfg (bug #4262) 2019-10-13 22:32:23 +04:00
Capostrophic
bc5d54a161 Fix GetEffect result when running on dead actors 2019-10-12 19:06:10 +03:00
Andrei Kortunov
31e78ed41f Rework 'prevent merchant equipping' feature 2019-10-12 14:17:03 +04:00
Capostrophic
ce943b4f9e Make enchantments affect all actors with an inventory (bug #5186) 2019-10-11 19:29:12 +03:00
Andrei Kortunov
19e9ece291
Merge pull request #2551 from Capostrophic/onpcequip 
Set OnPCEquip properly when a race can't equip an item (bug #5182)
 2019-10-11 20:07:35 +04:00
Andrei Kortunov
67bef9a3a1
Merge pull request #2554 from Capostrophic/summon 
Make sure summoned creatures are removed upon caster death (#5183)
 2019-10-11 20:06:16 +04:00
Alexei Dobrohotov
ccb557edf0
Merge pull request #2552 from akortunov/greeting 
Split greetings from AiWander
 2019-10-11 02:11:46 +03:00
Alexei Dobrohotov
cdbe58c33a
Merge branch 'master' into windspeed 2019-10-11 02:04:30 +03:00
Andrei Kortunov
2fc819cdae Encode ID's in all places to UTF-8 (bug #3977) 2019-10-10 20:52:32 +04:00
Capostrophic
e9009f8d10 Make sure summoned creatures are removed upon caster death 2019-10-10 17:57:45 +03:00
Nelsson Huotari
78f2a5181d Default brush size to 1 2019-10-10 14:27:22 +03:00
Nelsson Huotari
fbb9800e89 Better terrain texture ID handling 2019-10-10 14:27:22 +03:00
Nelsson Huotari
301c05662b assignment to memb. init. list, publics to private, virtual -> final 2019-10-10 14:27:22 +03:00
Andrei Kortunov
69aceb5c1e Split greetings from AiWander (bug #4594) 2019-10-10 09:28:40 +04:00
Alexei Dobrohotov
b7a1e6561b
Merge pull request #2080 from akortunov/recharge 
Recharge items outside of player inventory
 2019-10-09 23:37:10 +03:00
Capostrophic
c718f89325 Set OnPCEquip properly when a race can't equip an item (bug #5182) 2019-10-07 23:38:22 +03:00
Andrei Kortunov
c51aba0b13 Recharge items outside of player's inventory (bug #4077) 2019-10-07 22:59:43 +04:00
elsid
d1d6ba3ed0
Fix rebuild path for walking actors 
Ignore z coordinate for not swimming nor flying actors to calculate
distance from actor destination to last path point. If walking actor
destination point is floating above the ground then a point on navmesh
may be too far away when z coordinate is included. In this case path
will be rebuild on each AI_REACTION_TIME.
 2019-10-07 20:25:07 +02:00
Andrei Kortunov
f75f9cb337 Use localized faction name when using TFH 2019-10-07 12:14:22 +04:00
Andrei Kortunov
f0b73e0a27 Do not store owners for items in container stores (bug #1933) 2019-10-05 17:29:00 +04:00
Andrei Kortunov
2b2f63c919
Merge pull request #2538 from Capostrophic/animation 
Use random attack strength if there's no wind up animation (bug #5059)
 2019-10-02 08:23:13 +04:00
Alexei Dobrohotov
6f99747fff
Merge pull request #2507 from elsid/door_stuck 
Fix actors stuck in closing door (bug #5138)
 2019-10-01 22:39:58 +03:00
elsid
7fbc696d44
Change angle direction by rolling dice to avoid rotating door 2019-09-29 13:44:06 +02:00
elsid
6253d2a7ac
Undo door rotation once 2019-09-29 13:42:51 +02:00
Andrei Kortunov
ca46da8b04 Do not stack initially added scripted items (bug #5136) 2019-09-29 13:08:52 +04:00
Alexei Dobrohotov
e744090339
Merge pull request #2535 from akortunov/activate 
Implement vanilla-style AiActivate
 2019-09-26 00:42:43 +03:00
Capostrophic
4d381d0804 Use random attack strength if there's no wind up anim (bug #5059) 2019-09-24 22:42:04 +03:00
Andrei Kortunov
e5564df8cb Implement vanilla-style wind speed calculations (bug #4449) 2019-09-24 10:59:58 +04:00
Andrei Kortunov
48aba76ce9 Implement vanilla-style AiActivate (bug #4456) 2019-09-24 09:30:39 +04:00
Capostrophic
421a9d2e50 [Regression] Fix pickpocket crashes 2019-09-23 23:56:37 +03:00
Andrei Kortunov
b360deaec3 Store raw data about fog of war instead of RGBA images (bug #5108) 2019-09-22 19:59:12 +04:00
Alexei Dobrohotov
ac5491b5c2
Merge pull request #2534 from akortunov/toggleview 
Improve resurrection handling
 2019-09-22 02:02:03 +03:00
Andrei Kortunov
eb1245664f
Merge pull request #2533 from Capostrophic/levelledlist 
Fix chance none logic for nested levelled lists (bug #5169)
 2019-09-21 20:58:13 +04:00
Andrei Kortunov
6450d84473 Improve resurrection handling 2019-09-21 20:22:45 +04:00
Andrei Kortunov
0ff8e83a39
Merge pull request #2532 from Assumeru/undefined 
Fix undefined behaviour
 2019-09-21 18:35:08 +04:00
Evil Eye
3d3ffdfcd8 override eraseStatic for dialogue 2019-09-21 16:24:05 +02:00
Capostrophic
7c9a9d7de0 Fix chance none logic for nested levelled lists (bug #5169) 2019-09-21 14:30:38 +03:00
Alexei Dobrohotov
acc4811d12
Merge branch 'master' into guifixes 2019-09-20 20:03:02 +03:00
Andrei Kortunov
7cb6a9c1e9 Do not allow to use quick keys during chargen 2019-09-20 07:27:34 +04:00
Andrei Kortunov
1bddbbcfa0 Check if related menus are allowed when using cycle hotkeys (bug #5167) 2019-09-20 07:27:27 +04:00
Andrei Kortunov
a4d196f33f Force view change when using Force1stPerson and Force3rdPerson commands (bug #5168) 2019-09-19 21:48:43 +04:00
Alexei Dobrohotov
fb87778493
Merge branch 'master' into organic-locks 2019-09-18 20:36:40 +03:00
Andrei Kortunov
94a281370f Continue scripts execution after player's death (bug #5166) 2019-09-17 22:40:51 +04:00
Evil Eye
32de86d114 merge master 2019-09-17 20:31:53 +02:00
Evil Eye
7c8b82f45c move locking behaviour to cellref 2019-09-17 20:30:37 +02:00
Andrei Kortunov
85bb4a76f6 Improve faction items handling (bug #5164) 2019-09-17 19:09:08 +04:00
Andrei Kortunov
4a6d2cbaff Do not allow player to take items from evidence chests (bug #3609) 2019-09-17 19:08:33 +04:00
Andrei Kortunov
649a14dfae
Merge branch 'master' into activation 2019-09-16 10:52:16 +04:00
Andrei Kortunov
a7cfe5853c
Merge pull request #2522 from Capostrophic/extradata 
Refactor NIF extra data and particle modifier handling
 2019-09-16 10:19:49 +04:00
Capostrophic
480000da07 Use Open action as fallback for companion activation (bug #5161) 2019-09-15 23:17:36 +03:00
elsid
209e33f5ce
Open door when it is on the way to a next path point 2019-09-15 21:16:00 +02:00
elsid
653a391084
Do not open doors when actor has no path 
When actor is not going anywhere it doesn't require to go through doors
so there is no need to open them.
 2019-09-15 21:12:33 +02:00
elsid
d4b7b3e999
Check for AiPackage type before find nearby door 2019-09-15 21:12:29 +02:00
Capostrophic
790531671a Fix tests 2019-09-13 21:29:49 +03:00
Capostrophic
8baddefdbd Refactor extra data and particle modifier handling 
Objects no longer inherit from extra data class
"Controlled" harmful abstraction no longer exists
Introduced NiParticleModifier/NiParticleCollider abstractions
Extra data size reading moved into the base read() method
 2019-09-13 20:26:22 +03:00
Evil Eye
85d52ec183 oops 2019-09-11 22:05:24 +02:00
Alexei Dobrohotov
6128279dbf
Merge pull request #2517 from unelsson/terraintextureselection 
[Final tests] Editor: Terrain texture selection
 2019-09-11 14:09:45 +03:00
Capostrophic
718dbd3f9a Use object ID as the substitution for their name (bug #5158) 2019-09-11 00:06:50 +03:00
Capostrophic
6b74630f6e Preparation work 
Phase out canBeActivated() to unify activation checks
Use getName() for the name caption in tooltips
Always use tooltips for non-activator objects
Invert hasTooltip default value
 2019-09-10 23:38:16 +03:00
Capostrophic
9788a776b9 Avoid Qt "opening user openmw.cfg twice" warning 2019-09-10 22:56:04 +03:00
Evil Eye
a86a8ecc0e Allow locking/picking just about everything 2019-09-10 21:53:26 +02:00
Nelsson Huotari
4ccb951126 move check to outermost scope 2019-09-10 12:15:19 +03:00
Nelsson Huotari
0880923189 Consistency for variable and header argument names. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
6dc3d8b44b More readable code 2019-09-10 12:15:19 +03:00
Nelsson Huotari
780055899d Don't add empty primitive sets to geometry. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
3becacf6d1 Remove globals, const int& -> int, values to const ref. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
1dcee833a1 Less verbose syntax 2019-09-10 12:15:19 +03:00
Nelsson Huotari
5a143fe99d Remove extra include 2019-09-10 12:15:19 +03:00
Nelsson Huotari
39ab449431 Only allow selection of cells in view 2019-09-10 12:15:19 +03:00
Nelsson Huotari
dc8de6c6e6 Make less copies 2019-09-10 12:15:19 +03:00
Nelsson Huotari
001ca68cc7 Remove empty lines 2019-09-10 12:15:19 +03:00
Nelsson Huotari
46ee639892 pass by const ref and other fixes 2019-09-10 12:15:19 +03:00
Nelsson Huotari
20ab7df19f Fixes, cleanup. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
1a08944a8b Remove unused code, clarifications, optimizations 2019-09-10 12:15:19 +03:00
Nelsson Huotari
d6722c7492 Terrain texture selection, support for vertex selection 2019-09-10 12:15:19 +03:00
Evil Eye
56b6a7ada4 Fix #5155 2019-09-09 22:29:59 +02:00
Andrei Kortunov
d58f93f388 Use sayDone() only for scripting backward compatibility 2019-09-06 09:19:41 +04:00
Andrei Kortunov
c9deb1b325 Generate sCrimeMessageReport only once per frame (bug #5012) 2019-09-05 20:16:03 +04:00
Andrei Kortunov
58be8dc976
Merge pull request #2513 from Capostrophic/crime 
Make sure failed pick/trap attempts are a crime (bug #5149)
 2019-09-05 18:51:16 +04:00
Capostrophic
c89c14bb68 Rename objectOpened() to make its role more clear 2019-09-05 17:36:49 +03:00
Capostrophic
8317dc0709 Make sure failed pick/trap attempts are a crime (bug #5149) 2019-09-05 17:29:49 +03:00
James Stephens
bafbc0a055 Cancel door sound if collision is detected and the sound is playing 2019-09-05 07:49:53 +00:00
Alexei Dobrohotov
2daecc633e
Revert Vampirism behavior upon death to 0.45.0-like state 
Until we figure out the better way to handle vampire stuff tangled together with post-death animation magic effect reset.
 2019-09-04 16:42:34 +03:00
James Stephens
7d3f6e1cd9 Altered process so that cost only appears on spell purchase window. 
Added myself to authors
 2019-09-02 17:18:56 +00:00
James Stephens
b33429001c Fixes the offset question mark in the alchemy tooltip when the effect is not known 2019-09-02 17:13:56 +00:00
James Stephens
1cd1bfca74 Fixes bug #4650 2019-09-02 16:49:29 +02:00
Andrei Kortunov
b6044d231a Handle death event manually before disposing a corpse if a death animation was not finished yet (feature #5146) 2019-08-27 22:42:41 +04:00
Andrei Kortunov
84b3aaedaa
Merge pull request #2506 from akortunov/refactor 
Rename getWeaponPart() function
 2019-08-27 10:05:44 +04:00
Andrei Kortunov
c059bf04cc Rename getWeaponPart() function 2019-08-27 09:55:02 +04:00
elsid
16170131b7
Add enum type for door state 2019-08-25 15:21:00 +02:00
Alexei Dobrohotov
43a58e181f
Merge pull request #2455 from Capostrophic/input 
Revert questionable input manager decisions
 2019-08-24 15:02:50 +03:00
Andrei Kortunov
bd18655d23
Merge pull request #2439 from Capostrophic/jumping 
Fix jumping mechanics framerate dependency (bug #4991)
 2019-08-18 10:57:11 +04:00
Andrei Kortunov
b58c632c20
Merge pull request #2502 from akortunov/master 
Optimize custom bones search visitor
 2019-08-18 10:36:01 +04:00
Andrei Kortunov
fe71ce9cb2 Optimize custom bones search visitor 2019-08-18 10:30:21 +04:00
Andrei Kortunov
ed8828d3bc
Merge pull request #2457 from Capostrophic/sneak 
Sneaking consistency fixes (bug #5103)
 2019-08-18 08:57:22 +04:00
Andrei Kortunov
661d11c83e
Merge pull request #2465 from Capostrophic/duration 
Human-readable light source duration (feature #5091)
 2019-08-18 08:43:51 +04:00
Andrei Kortunov
d0bc06b849
Merge pull request #2438 from Capostrophic/camera 
Rewrite messed up playerlooking switch handling (bug #5078)
 2019-08-17 23:15:21 +04:00
capostrophic
e5331aab28 Escape number signs in object names for tooltips 2019-08-17 21:53:52 +03:00
elsid
ad05de44ae
Use 3d coordinates to detect stuck 
To able water and flying creatures move to player going up or down.
 2019-08-17 18:09:00 +02:00
elsid
7b94183d83
Revert "Take in account actor half extents for obstacle check" 
This reverts commit 5434e92437.
 2019-08-17 17:55:49 +02:00
Andrei Kortunov
f7917964a0
Merge pull request #2484 from Capostrophic/fallbackanim 
Allow SwimRunForward state WalkForward fallback (bug #5126)
 2019-08-17 12:45:25 +04:00
Andrei Kortunov
ca724d45a1
Merge pull request #2498 from akortunov/master 
[Regression] inject bones for NPC's with custom animation models
 2019-08-17 12:21:34 +04:00
Andrei Kortunov
6156ab45de [Regression] inject bones for NPC's with custom animation models 2019-08-17 12:17:13 +04:00
Alexei Dobrohotov
1eac6f67db
Merge pull request #2496 from Capostrophic/reverb 
Change the default reverb preset to improve underwater FX transition
 2019-08-17 00:29:29 +03:00
Andrei Kortunov
0afb142b8e [Regression] restore ammo inventory sounds 2019-08-16 21:56:14 +04:00
capostrophic
99710e8f55 Allow SwimRunForward state WalkForward fallback (bug #5126) 2019-08-16 20:46:22 +03:00
Andrei Kortunov
786a6c6d42 Use a common doors rotation code in the "lock" command handler 2019-08-16 21:30:24 +04:00
capostrophic
f779529cab Change the default reverb preset to improve underwater FX transition 2019-08-16 17:37:38 +03:00
elsid
4d86bf3bf2
Update rotated world objects in navigator 2019-08-15 18:19:19 +02:00
Alexei Dobrohotov
17991164e4
Merge pull request #2489 from ArgonianAccount/class-quiz 
Class quiz fixes
 2019-08-13 21:47:30 +03:00
Andrei Kortunov
deeccb2783
Merge pull request #2461 from Capostrophic/geteffect 
Use up-to-date magic effects for GetEffect (bug #3894)
 2019-08-11 22:20:20 +04:00
ArgonianAccount
53facf7baa Class quiz fixes 2019-08-12 00:54:02 +12:00
Alexei Dobrohotov
e10bbea7c0
Revert 3.4-breaking 8b1ed6c 2019-08-11 12:07:49 +03:00
Alexei Dobrohotov
5640a305e2
Merge pull request #2487 from akortunov/arrows 
Corrections for extended weapon animations feature
 2019-08-10 20:00:34 +03:00
Andrei Kortunov
6019f6507d Corrections for extended weapon animations feature 2019-08-10 20:57:37 +04:00
Julien Valentin
8b1ed6c357
fix Sunglare bug with osg 3.6 2019-08-10 18:28:03 +02:00
Andrei Kortunov
1f7d2f8da0 Revert "Do not use a separate GlowUpdater for every arrow in quiver" 
This reverts commit b7c214b1bc.
 2019-08-09 21:38:03 +04:00
Andrei Kortunov
b09f0f8c2d
Merge pull request #2458 from Capostrophic/jump 
Don't "jump" with 0 vertical velocity in all cases (bug #5106)
 2019-08-09 21:03:24 +04:00
Alexei Dobrohotov
307e9ba666
Merge pull request #2413 from akortunov/weapon 
Refactor weapon types behaviour
 2019-08-09 20:02:10 +03:00
capostrophic
26f59e47db Improve readability 2019-08-09 19:56:21 +03:00
capostrophic
a9c4b18d38 Make sure cast chance checks mana when necessary (bug #5112) 2019-08-09 19:27:25 +03:00
Andrei Kortunov
134631ad72
Merge pull request #2463 from Capostrophic/crit 
Vanilla-friendly ranged crits (bug #5067)
 2019-08-09 20:23:56 +04:00
Andrei Kortunov
fcd6e915d4 Fallback for long animation groups 2019-08-09 19:40:30 +04:00
Andrei Kortunov
123ca175c8 Fallback for short weapon groups 2019-08-09 19:40:30 +04:00
Andrei Kortunov
afaff8231d Use the Weapon Bone as fallback 2019-08-09 19:40:30 +04:00
Andrei Kortunov
f0cef772fa Refactor weapon types behaviour 
1. Move weapon types behaviour from switches to the table (should allow
us to de-hardcode weapon types later)
2. Gereralize bones injection to actors skeletons (instead of using the
hardcoded xbase_anim_sh.nif)
 2019-08-09 19:40:27 +04:00
Andrei Kortunov
07cf93f4db Update weapon state when we cancel attack animation (bug #5124) 2019-08-09 09:17:36 +04:00
Alexei Dobrohotov
ed364a1e29
Merge pull request #2476 from akortunov/arrows 
Use magic glow for enchanted arrows
 2019-08-07 17:32:38 +03:00
Andrei Kortunov
b7c214b1bc Do not use a separate GlowUpdater for every arrow in quiver 2019-08-07 12:58:18 +04:00
Andrei Kortunov
8557346fbd Use glow for enchanted arrows (feature #5122) 2019-08-07 12:58:14 +04:00
unknown
2a53f6bc3e Merge branch 'master' of https://github.com/OpenMW/openmw into script-respawn 2019-08-07 10:56:21 +02:00
Andrei Kortunov
1eed511b4e Use enchanted glow for pulled arrows 2019-08-07 09:45:10 +04:00
Andrei Kortunov
4c92f0c4e1 Move getEnchantmentColor() from Animation to Class 2019-08-07 08:51:46 +04:00
unknown
6baa5da6c9 Fix scripts not executing on respawn 2019-08-06 21:30:21 +02:00
Andrei Kortunov
06ba80e19b
Merge pull request #2469 from Capostrophic/instant 
Apply instant effects of permanent spells in AddSpell immediately (bug #5055)
 2019-08-06 07:57:18 +04:00
capostrophic
cac05ef826 Sneaking consistency fixes (bug #5103) 
Correct pickpocketing behavior when not actually sneaking
Fix first person swimming animation regression when sneaking stance is on
Move typical sneaking use case checks into mechanics manager
Correct awareness checks
 2019-08-05 20:22:03 +03:00
Andrei Kortunov
ad8b10c8db
Merge pull request #2464 from Capostrophic/enchant 
Ignore on-strike enchanted projectile charge (#5104)
 2019-08-05 11:32:16 +04:00
capostrophic
6928adcee1 Prevent front() and operator[] from causing undefined behavior 2019-08-04 14:47:33 +03:00
Alexei Dobrohotov
4d4a21ff09
Merge pull request #2460 from Capostrophic/swim 
Don't force-trace down swimming actors (bug #5089)
 2019-08-03 23:23:12 +03:00
Alexei Dobrohotov
b3fe85fb6d
Merge pull request #2324 from elsid/aiwander_navmesh 
Use navmesh for AiWander
 2019-08-03 23:11:18 +03:00
Alex Rice
e7ae7a8ca6 Allow user controller bindings 2019-08-03 19:55:58 +00:00
elsid
6c46d929c2
Build path to first pathgrid node by navmesh 2019-08-03 16:10:55 +02:00
elsid
f684c90932
Make angular velocity depending on actor speed 
To avoid moving in circles for actors with high speed.
 2019-08-03 16:06:04 +02:00
capostrophic
82ac99ec56 Apply instant FX in AddSpell immediately (bug #5055) 2019-08-02 21:26:47 +03:00
capostrophic
f8c07ca9dc Don't "jump" with 0 vertical velocity in all cases (bug #5106) 2019-08-02 18:16:47 +03:00
capostrophic
e9c71a3808 Ignore on-strike enchanted projectile charge (#5104) 2019-08-02 18:15:27 +03:00
capostrophic
ff133bd740 Don't clamp final actor fight rating to 0 (bug #5105) 
Fix werewolf aggro distance
 2019-08-02 18:11:48 +03:00
Alexei Dobrohotov
3f2b63122d
Merge pull request #2467 from Capostrophic/stream 
[Regression] Editor: Avoid locale-related settings parsing issues
 2019-08-01 20:39:06 +03:00
elsid
4ad04a28f9
Reset path after AiTravel is fast forwarded 
Otherwise actor will keep going to the first path point that may be
unreachable.
 2019-08-01 15:13:03 +02:00
Artem Nykolenko
610e87cb24 Fix Non-swimming enemies entering water if player is water walking (bug #5099) 2019-08-01 10:02:35 +00:00
Andrei Kortunov
264a769827
Merge pull request #2466 from Capostrophic/doll 
[Regression] Avoid confusing inventory doll with player in non-uniform scaling
 2019-08-01 13:10:40 +04:00
capostrophic
5341ca4e22 [Regression] Avoid locale-related conversion issues in editor 2019-08-01 11:47:31 +03:00
capostrophic
2affb8ed63 Human-readable light source duration (feature #5091) 2019-07-31 21:37:20 +03:00
Alexei Dobrohotov
1a2f51ef6f
Merge pull request #2415 from Assumeru/unix-console 
Unix console hotkeys
 2019-07-31 21:34:09 +03:00
capostrophic
dcbe76d888 [Regression] Avoid confusing inventory doll with player 2019-07-31 17:34:32 +03:00
capostrophic
e2496af5c5 Vanilla-friendly ranged crits (bug #5067) 2019-07-31 13:55:09 +03:00
capostrophic
e7ec27e45d Use up-to-date magic effects for GetEffect (bug #3894) 2019-07-31 01:06:06 +03:00
capostrophic
6fe429c4e8 Don't force-trace down swimming actors (bug #5089) 2019-07-31 00:45:54 +03:00
capostrophic
15bf05215e Revert questionable input manager decisions 
Remove Options Menu shortcut
Revert to more pleasant 0.45.0 Escape behavior
Re-enable keyboard GUI arrow conversion feature
Remove gamepad button release handling
 2019-07-30 19:48:46 +03:00
Capostrophic
4e54ed86b3 Fix jumping mechanics framerate dependency (bug #4991) 2019-07-29 15:45:57 +03:00
Capostrophic
0b074f2211 Rewrite messed up playerlooking switch handling (bug #5078) 2019-07-29 15:44:17 +03:00
Alexei Dobrohotov
facbb2e0db
[Regression] Make sure unloaded objects can be opened 2019-07-20 00:12:05 +03:00
Chris Djali
576285573b
Merge pull request #2404 from Capostrophic/framerate 
Make framerate limit configurable in the launcher
 2019-07-19 16:16:20 +01:00
Andrei Kortunov
69277b52d0
Merge pull request #2451 from Capostrophic/sounds 
Fix combat sound inconsistencies (bugs #5092, #5093)
 2019-07-19 08:03:33 +04:00
Artem Nykolenko
d996b565a5 Improve character window resizing (bug #4276) 2019-07-17 00:44:36 -04:00
Alexei Dobrohotov
29ebfe709e
Play 'Hand To Hand Hit' only for fatigue damage (bug #5093) 2019-07-14 23:56:38 +03:00
Alexei Dobrohotov
65ee420ab9
Only play on-strike failure sound on the player (bug #5092) 2019-07-14 23:42:42 +03:00
Alexei Dobrohotov
366906ac51
Fix paralyzed actors' death animations 2019-07-12 12:31:10 +03:00
Axel Vestin
c0f66ac70c Fixes Albemic typo in OpenMW-CS 2019-07-06 00:13:30 +02:00
jeremy
962462c1c5 Removed unnecessary calls to stopSound3D 
playSound3D (the one taking a ptr) already stops the sound if it's playing.
 2019-07-04 22:54:39 +02:00
jeremy
c8c06ceee9 Fixed SoundManager::stopSound when output is not initialized (bug #4600 probably) 2019-07-04 22:48:33 +02:00
Evil Eye
cb4664b31b Remove arrow key behaviour as it's in MyGUI now 2019-07-03 22:38:07 +02:00
Evil Eye
405c556ce9 Merge branch 'master' of https://github.com/OpenMW/openmw into unix-console 2019-07-03 21:58:06 +02:00
Nat Meo
bcc5142b32 Issue #4202: Open .omwaddon files without needing to open openmw-cs first. 2019-07-02 16:07:38 +00:00
Justin Ivany
643f259cbf Adding option for cursor speed when using gamepad 2019-07-02 11:19:10 +00:00
Nat Meo
af1e5e01b4 Issue #5005: Instance window via Scene window 2019-07-01 23:26:05 +00:00
Justin Ivany
49f2615d2b Fix scrolling with controller on gui 2019-07-01 17:32:20 -03:00
Alexei Dobrohotov
9dfee1dfe2
Fix invisibility/chameleon alpha (thanks Hrnchamd) 2019-06-30 16:13:11 +03:00
Alexei Dobrohotov
19dc01232c
Fix CenterOnCell target rotation 2019-06-30 16:03:24 +03:00
Capostrophic
b8afe14206 Disallow paralyzed actors to greet the player (bug #5074) 2019-06-29 13:31:36 +03:00
Andrei Kortunov
633b8e26ad
Merge pull request #2436 from Capostrophic/enchanting 
Correct cast style behavior when there's no item picked (bug #5075)
 2019-06-29 13:01:13 +04:00
Capostrophic
cbb22f0f63 Correct cast style behavior when there's no object (bug #5075) 2019-06-28 15:52:37 +03:00
Capostrophic
453068cc7d Disallow actors to start combat with themselves (bug #3550) 
Allow creatures to play initial attack dialogue
Don't add combat package to dead actors
 2019-06-27 19:50:54 +03:00
Alexei Dobrohotov
3cbe4ab85d
Fix idlestorm blend mask (bugs #4240, #5071) 2019-06-22 23:05:20 +03:00
Capostrophic
9502e9f3f7 Disable FPS limit spinbox by default and set the maximum to 1000 
Make window border and framerate limit labels consistent with other labels
 2019-06-22 18:15:19 +03:00
Capostrophic
b87b29eeb0 Make framerate limit configurable in the launcher 2019-06-22 18:15:19 +03:00
Andrei Kortunov
b9a1e4d796
Merge pull request #2425 from Capostrophic/esm 
Signedness fixes
 2019-06-21 10:01:10 +04:00
Capostrophic
df89c6b6ce Make unarmed creature attacks affect shield condition again (bug #5069) 2019-06-20 20:45:52 +03:00
Capostrophic
3aa65273c5 Signedness fixes 2019-06-18 14:47:10 +03:00
Alexander Perepechko
19b0b056e5 Remove spell FX and VFX after playing the death animation (bug #5060) 2019-06-13 21:42:25 +00:00
Andrei Kortunov
4fcbc1c96b
Merge pull request #2391 from Capostrophic/contentselector 
Content selector: don't add file namesakes (bug #2395)
 2019-06-10 10:15:19 +04:00
Andrei Kortunov
dcf03f6785
Merge pull request #2416 from Capostrophic/cast 
Make Player->Cast select the spell instead (bug #5056)
 2019-06-10 09:39:23 +04:00
Andrei Kortunov
a62b6910ba
Merge pull request #2411 from Capostrophic/fader 
Make sure fade operations properly end (bug #4639)
 2019-06-10 08:58:26 +04:00
Capostrophic
56539fee4f Partially revert "Get rid of redundant setKeyFocusWidget() method" 2019-06-09 02:12:44 +03:00
Capostrophic
295ee11063 Make Player->Cast select the spell instead (bug #5056) 2019-06-08 17:08:39 +03:00
Alexei Dobrohotov
ef2a7160fa
Fix automovement toggling on "joystick used" flag 2019-06-08 15:06:04 +03:00
Evil Eye
67fb19c2b9 fix deletion when not at end of line and implement ^LEFT and ^RIGHT 2019-06-07 18:41:35 +02:00
Evil Eye
4aca8240e5 implement ^W and ^U in the console 2019-06-06 22:09:54 +02:00
Capostrophic
596dbbe70b Make sure fade operations properly end (bug #4639) 2019-06-06 12:25:01 +03:00
Alexei Dobrohotov
61db93e7da
Merge pull request #2407 from akortunov/scrollbars 
Add separate textures for scrollbars
 2019-06-06 09:09:55 +03:00
Capostrophic
25e52f7dfe Use 2D distance for fight rating of vertically moving actors (bug #4961) 2019-06-05 21:41:02 +03:00
Andrei Kortunov
a02f730a77
Merge pull request #2406 from Capostrophic/invalid 
Erase effects with invalid indices from spells (bug #5050)
 2019-06-03 09:21:11 +04:00
Andrei Kortunov
08716ed330
Merge pull request #2409 from Capostrophic/input 
Correct always run behavior when both a gamepad and a keyboard are used
 2019-06-03 08:18:46 +04:00
Capostrophic
b7afb213ae "Handle" RepairedOnMe scripting function (feature #4255) 2019-06-03 02:17:32 +03:00
Capostrophic
70635ed1e2 Correct always run behavior when both a gamepad and a keyboard are used 2019-06-02 22:57:31 +03:00
Capostrophic
d98a90194b Erase effects with invalid indices from spells (bug #5050) 2019-06-02 14:56:39 +03:00
Andrei Kortunov
2436652181
Merge pull request #2405 from Capostrophic/idlestorm 
Improve face shielding behavior in general case (bug #4240)
 2019-06-02 08:41:32 +04:00
Andrei Kortunov
34fe896f4e
Merge pull request #2400 from Capostrophic/colorcode 
Escape number signs in cell/region names (bug #5047)
 2019-06-02 08:06:40 +04:00
Alexei Dobrohotov
8ebecb7584 Merge branch '7' into 'master' 
fixes pitch black ripples in shadow

See merge request OpenMW/openmw!123
 2019-06-01 12:13:14 +00:00
Andrei Kortunov
ae935a8084 Add separate textures for scrollbars (feature #5051) 2019-06-01 16:12:03 +04:00
Capostrophic
5cd781b3eb Experimental folder handling rewrite 2019-05-31 20:01:46 +03:00
Alexei Dobrohotov
58f8d1ac04
Merge pull request #2402 from akortunov/console 
Make console to do not hide other GUI windows
 2019-05-30 13:41:00 +03:00
Capostrophic
e7208bb80e Improve face shielding behavior in general case (bug #4240) 2019-05-30 12:16:25 +03:00
bzzt
403171e083 fixes pitch black ripples in shadow 2019-05-29 13:37:00 +00:00
Andrei Kortunov
1ce370e7fa Make console to do not hide other GUI windows (bug #1515) 2019-05-29 17:10:57 +04:00
Alexei Dobrohotov
44a07efc27
Fix trapped soul object verifier warning 2019-05-29 02:54:19 +03:00
Capostrophic
9a19af5b33 Escape number signs in cell/region names (bug #5047) 2019-05-28 23:02:30 +03:00
Andrei Kortunov
4d292425b3
Merge pull request #2398 from Capostrophic/saydone 
Make SayDone return 1 on the frame speech is started (bug #4879)
 2019-05-28 22:55:07 +04:00
Andrei Kortunov
f9143decc9
Merge pull request #2397 from Capostrophic/gamepad 
Analogue movement fixes
 2019-05-28 22:45:42 +04:00
Capostrophic
e095d51999 More queue handling adjustments 2019-05-26 19:23:42 +03:00
Capostrophic
c975dab7c3 Update say sound queue explicitly once per frame 2019-05-26 18:46:53 +03:00
Capostrophic
4c2b694b29 Make SayDone return 1 on the frame speech is started (bug #4879) 2019-05-26 18:00:50 +03:00
Alexei Dobrohotov
e0fb411fc8 Merge branch '2' into 'master' 
stop making new reflacttetures at intext change

See merge request OpenMW/openmw!116
 2019-05-24 14:08:09 +00:00
bzzt
6c310c64d2 stop making new reflacttetures at intext change 2019-05-24 13:37:00 +00:00
Capostrophic
f271ac255d Avoid conflicts between gamepad movement and always run setting 2019-05-24 12:50:16 +03:00
Capostrophic
40c1db32bd Apply analogue speed mult to fatigue loss 2019-05-24 12:50:16 +03:00
Andrei Kortunov
fae5843347 Setup the ICO settings only once instead of every loading (bug #5025) 2019-05-24 08:04:20 +04:00
Andrei Kortunov
ab03b9ac1c Do not sort the Land store every savegame load - it is static anyway (bug #4844) 2019-05-24 08:04:20 +04:00
Andrei Kortunov
57176ff8d4 Unload viewer and stop background jobs before resources unloading 2019-05-24 08:03:45 +04:00
Alexei Dobrohotov
7c46102f0c
Merge pull request #2389 from akortunov/fmt 
Introduce a custom format() function
 2019-05-21 21:45:52 +03:00
Alexei Dobrohotov
54ee08cb75
Merge pull request #2396 from akortunov/master 
Remove BOM from CPP files
 2019-05-21 21:22:34 +03:00
Andrei Kortunov
6832a2fa9a Remove BOM from CPP files (allows to build OpenMW with LCC on Elbrus) 2019-05-21 19:22:34 +04:00
Andrei Kortunov
e679190f31 Introduce a custom format() function to get rid of boost::format() and hackish replace() 2019-05-20 09:20:01 +04:00
Alexei Dobrohotov
0ee73d89f0
Correct selling prices of creature merchants 2019-05-19 23:43:40 +03:00
Alexei Dobrohotov
c66ddea429
Merge pull request #2392 from akortunov/guifixes 
Get ride of some redundant GUI stuff
 2019-05-18 19:05:01 +03:00
Andrei Kortunov
add3b9dcea
Merge pull request #2390 from Capostrophic/launcher 
Launcher: Clone content list button (feature #4784)
 2019-05-18 09:04:50 +04:00
Andrei Kortunov
faf940546b Get rid of redundant setKeyFocusWidget() method 2019-05-17 19:09:40 +04:00
Andrei Kortunov
675be20a0f Get rid of redundant ControllerRepeatClick class 2019-05-17 10:49:00 +04:00
Andrei Kortunov
ac8fa54e6e Get rid of redundant MWScroll class 2019-05-17 10:23:34 +04:00
Capostrophic
3f73766304 Make enchanting make more sense (bug #5038) 2019-05-15 18:40:52 +03:00
Capostrophic
686049679c Launcher: Clone content list button (feature #4784) 2019-05-15 18:17:57 +03:00
Andrei Kortunov
7023e86d19
Merge pull request #2388 from Capostrophic/animation 
Hardcode the correct first person sneaking anim speed (bug #4787)
 2019-05-15 09:02:53 +04:00
Andrei Kortunov
316c79fecd
Merge pull request #2387 from Capostrophic/spells 
Don't break GetSpellEffects execution if the spell doesn't exist
 2019-05-15 08:55:54 +04:00
Andrei Kortunov
6bf5960b96
Merge pull request #2386 from Capostrophic/waiting 
Exit waiting at the correct time when the player is in air
 2019-05-15 08:44:47 +04:00
Capostrophic
1de984364a Hardcode the correct first person sneaking anim speed (bug #4787) 2019-05-15 01:46:55 +03:00
Alexei Dobrohotov
3d3e9f373c
Merge pull request #2384 from akortunov/ranks 
Fix RaiseRank/LowerRank script functions
 2019-05-15 01:42:59 +03:00
Capostrophic
5f7343ad7f Don't break GetSpellEffects execution if the spell doesn't exist 2019-05-14 21:24:03 +03:00
Andrei Kortunov
f775f7977b Fix RaiseRank/LowerRank script functions (feature #4316) 2019-05-14 21:43:19 +04:00
Capostrophic
272df29a12 Exit waiting at the correct time when the player is in air 2019-05-14 20:38:41 +03:00
Capostrophic
485ed903c4 Enchanting window stays open after a failed attempt (feature #5034) 2019-05-14 17:16:37 +03:00
Andrei Kortunov
a79955352f Revert MR !103 and !105 since they cause issues with dialogue window 2019-05-14 14:22:54 +04:00
Andrei Kortunov
55767eaf7e
Merge pull request #2380 from Capostrophic/faction 
Allow scripted faction leaving using PCLowerRank (feature #5036)
 2019-05-13 21:21:47 +04:00
Andrei Kortunov
27737d4258 Fix an exception during reload when container windows is active. 
It is a regression in the animated containers feature.
 2019-05-13 17:59:32 +04:00
Alexei Dobrohotov
bb0c989f87
Clear expelled status when leaving faction 2019-05-13 10:22:03 +03:00
Alexei Dobrohotov
d37cb871d6
Fix last-minute typo 2019-05-13 09:50:32 +03:00
Capostrophic
555e43855d Allow scripted faction leaving using PCLowerRank (feature #5036) 2019-05-12 20:57:54 +03:00
Capostrophic
144b1b9b06 Magic armor mitigation for creatures (feature #5033) 2019-05-11 19:21:49 +03:00
Capostrophic
c67eb6d9db Drop bogus accounting for armor rating from weapon priority 2019-05-11 19:06:45 +03:00
Alexei Dobrohotov
4a5e2d1d4e
Merge pull request #2281 from akortunov/shaders 
Minor water shader fixes
 2019-05-11 18:07:58 +03:00
Capostrophic
62482657fc GetWeaponType returns -2 for picks and -3 for probes (feature #5031) 2019-05-11 14:18:29 +03:00
Alexei Dobrohotov
0cea76c684
Merge pull request #2375 from akortunov/warnfix 
Do not copy pointers during iteration
 2019-05-11 14:10:01 +03:00
Andrei Kortunov
ef4042703d
Merge pull request #2373 from Capostrophic/barter 
Make offered price caps barter-specific (bug #5028)
 2019-05-11 15:05:41 +04:00
Andrei Kortunov
9ba6f5f36c Do not copy pointers during iteration 2019-05-11 09:44:30 +04:00
Alexei Dobrohotov
216f908a07
Merge pull request #2286 from akortunov/map 
Do not re-render maps for all active cells during cell transitions
 2019-05-11 02:30:38 +03:00
Phillip A
c4d5203e14 Fix MR !103 breaking of dialogue with actors with no greetings 2019-05-09 23:28:43 +00:00
Capostrophic
9d191055bf Make offered price caps barter-specific (bug #5028) 2019-05-09 21:19:10 +03:00
Bret Curtis
e0af6532ec
Merge pull request #2371 from Capostrophic/sneak 
Don't toggle sneaking when controls are disabled
 2019-05-07 09:52:21 +02:00
Frederic Chardon
6619150b23 Do not show magnitude for ingredients 2019-05-06 23:48:13 +00:00
Alexei Dobrohotov
310e19d47f Merge branch 'ptr-fix' into 'master' 
Make sure pointers are set before GUI windows are brought up

See merge request OpenMW/openmw!103
 2019-05-06 20:33:25 +00:00
Phillip Andrews
a481d2dc1a Make sure pointers are set before GUI windows are brought up 
This most noticiably fixes an issue when resting in a bed while levitating.
 2019-05-06 14:53:20 -05:00
Alexei Dobrohotov
1d12d778ea
Merge pull request #2370 from akortunov/herbalism 
Container search tweaks
 2019-05-06 22:34:12 +03:00
Capostrophic
4787e6b9a7 Don't toggle sneaking while controls are disabled 2019-05-06 22:30:07 +03:00
Andrei Kortunov
7214f24f5c Ignore containers, when we search for owner 2019-05-06 23:06:13 +04:00
Andrei Kortunov
abe1009e98 Do not resolve container's content during search 2019-05-06 23:05:31 +04:00
Capostrophic
cb9d16cf5f Support negative effect magnitude in spell/ingredient/potion tooltips 2019-05-05 21:27:48 +03:00
Capostrophic
458c0bba41 Avoid using null pointer for player's cell in moveObjectImp 2019-05-05 16:43:32 +03:00
Capostrophic
3add9765c3 Fix spell deletion for character without a birthsign 2019-05-04 21:51:36 +03:00
Alexei Dobrohotov
15142a608d
Merge pull request #2344 from xyzz/delete-spell 
Add a button to delete spells from spellwindow
 2019-05-04 21:05:12 +03:00
Alexei Dobrohotov
acae586765
Merge pull request #2365 from akortunov/guifixes 
Refactor Settings::Manager::apply()
 2019-05-04 21:01:15 +03:00
Andrei Kortunov
4f42fe5595 Refactor Settings::Manager::apply() 2019-05-04 21:38:36 +04:00
Alexei Dobrohotov
e4ef7e8d3f
Merge pull request #2355 from akortunov/transparency 
Use the StateSetUpdater to modify alpha for Animation objects
 2019-05-04 20:24:01 +03:00
Alexei Dobrohotov
1bfe0e43af
Merge pull request #2360 from akortunov/guifixes 
Do not track resolution settings changes in the InputManager
 2019-05-04 20:23:03 +03:00
Alexei Dobrohotov
632e7b973b
Merge pull request #2349 from akortunov/pinning 
Allow to maximize windows via Shift + Double Click
 2019-05-04 20:21:30 +03:00
Alexei Dobrohotov
a737935748
Merge pull request #2363 from akortunov/herbalism 
Additional herbalism-related tweaks
 2019-05-04 13:57:17 +03:00
Andrei Kortunov
c91d1e7394 Ignore containers without resolved content for Detect spells 2019-05-04 14:40:32 +04:00
Andrei Kortunov
29cfd2c583 Do not respawn container if player did not touch it 2019-05-04 14:09:09 +04:00
Andrei Kortunov
c01153569d Add missing Organic flag check for herbalism 2019-05-04 12:36:58 +04:00
Alexei Dobrohotov
4f74d09179
Handle GetAngle axis more gracefully too 2019-05-04 00:24:23 +03:00
Alexei Dobrohotov
6aef52931f
Merge pull request #2166 from akortunov/distant_slider 
Rework the viewing distance slider
 2019-05-03 21:19:47 +03:00
Alexei Dobrohotov
74112976b2
Merge pull request #2085 from akortunov/herbalism 
Native graphics herbalism support
 2019-05-03 20:58:22 +03:00
Andrei Kortunov
4513c5516c Increase the viewing distance cap in the slider when the Distant Terrain is enabled 2019-05-03 10:23:10 +04:00
Andrei Kortunov
5876a417c3 Use the StateSetUpdater to modify alpha for Animation objects (bug #5001) 2019-05-03 08:18:52 +04:00
Andrei Kortunov
ed859c41be
Merge pull request #2353 from Capostrophic/drop 
Make Drop behavior closer to vanilla (bug #4999)
 2019-05-03 08:12:46 +04:00
Andrei Kortunov
861d41f4a4 Native graphics herbalism support (feature #5010) 2019-05-02 23:03:47 +04:00
Capostrophic
3c18079c14 Handle invalid instruction axis more gracefully 2019-05-02 20:50:05 +03:00
Andrei Kortunov
0cd8d4b842 Do not track resolution settings changes in the InputManager (bug #4902) 2019-05-02 19:00:47 +04:00
Bret Curtis
05ee769518
Merge pull request #2357 from Capostrophic/overflow 
Editor: Don't accept overflowing input in NPC fields
 2019-05-02 13:55:01 +02:00
Andrei Kortunov
c5ac580e74 Allow to maximize windows via Shift + Double Click (feature #3999) 2019-05-01 20:15:11 +04:00
Ilya Zhuravlev
1d02c1ef37 engine: fix window creation when SDL returns different-sized window 2019-04-30 14:25:24 -04:00
Capostrophic
548d336933 Editor: Don't accept overflowing input in NPC fields 2019-04-30 20:41:23 +03:00
Capostrophic
b42f981200 Make Drop and soulgem instruction behavior closer to vanilla (bug #4999) 2019-04-30 19:06:02 +03:00
Andrei Kortunov
c3fdccac1f Do not use the xbase_anim.kf as a fallback for werewolves (bug #5004) 2019-04-30 17:51:38 +04:00
Andrei Kortunov
0bec84342c
Merge pull request #2346 from Capostrophic/shaders 
Make sure forcePPL and clamp are defined in the editor
 2019-04-30 07:24:43 +04:00
Capostrophic
05d94d35f9 Make disabled shadow defines map static 2019-04-29 19:31:46 +03:00
Capostrophic
9f9b7cb0ae Init shadow defines in the editor too for a good measure 2019-04-29 19:21:37 +03:00
Capostrophic
158f4e23cb Make sure forcePPL and clamp are defined in the editor 2019-04-29 19:21:37 +03:00
Ilya Zhuravlev
16d2db8492 android: remove unused file 2019-04-28 18:21:48 -04:00
Ilya Zhuravlev
7865ffa1a7 android: Switch to C++ 2019-04-28 18:21:31 -04:00
Andrei Kortunov
c610a58cf0 Improve reset of idle animations (bug #4847) 2019-04-28 22:28:24 +04:00
Andrei Kortunov
1832f1759d AI: use a consistent check if a target is hidden (bug #4920) 2019-04-28 16:41:10 +04:00
Alexei Dobrohotov
b77bd9cf9b Merge branch 'issue-4971' into 'master' 
Bug #4971: OpenMW-CS: Make rotations display as degrees instead of radians

See merge request OpenMW/openmw!100
 2019-04-26 14:20:52 +00:00
Nat Meo
a3b7a12fe7 Bug #4971: OpenMW-CS: Make rotations display as degrees instead of radians 2019-04-25 14:26:28 -04:00
Andrei Kortunov
c36a22653f
Merge pull request #2348 from Capostrophic/music 
Increase music crossfade time to 1 second
 2019-04-25 21:36:42 +04:00
Capostrophic
6e98cd8eaa Increase music crossfade time to 1 second 2019-04-25 20:26:40 +03:00
Alexei Dobrohotov
5e405ca679
Merge pull request #2347 from akortunov/pinning 
Make pinnable windows hiding persistent
 2019-04-25 20:15:05 +03:00
Andrei Kortunov
8e48493264 Make pinnable windows hiding persistent (feature #4994) 2019-04-25 21:05:43 +04:00
Ilya Zhuravlev
e057ea171f spell window: don't manually recalculate edit box width every update 2019-04-25 09:13:32 -04:00
Ilya Zhuravlev
e1ce15efb5 spellwindow: do onWindowResize in ctor after dimensions are set 2019-04-25 08:51:57 -04:00
Ilya Zhuravlev
26ac7412a0 Spell window: dynamically resize the edit box, change delete button caption 2019-04-25 08:46:11 -04:00
Ilya Zhuravlev
2ee0b1287b spellmodel: add a break to getSelectedIndex 2019-04-25 06:14:12 -04:00
Ilya Zhuravlev
6c96b5653b Add a button to delete spells from spellwindow 2019-04-24 19:22:47 -04:00
Andrei Kortunov
28252bb359 Merge branch 'hashRefID' into 'master' 
Remove string copy in CellStore::search

See merge request OpenMW/openmw!77
 2019-04-24 16:46:13 +00:00
Capostrophic
8abe92fe41 Don't recover normalise speed setting every frame 2019-04-24 16:22:56 +03:00
Capostrophic
34ea9ea813 Add an option to restore MCP-like movement behavior 2019-04-24 16:21:12 +03:00
Capostrophic
c7ac06b960 Always account for every follower travelling 2019-04-24 16:21:12 +03:00
Andrei Kortunov
95d6a99c7f Do not use the CPU affinity of OSG viewer (bug #4785) 2019-04-24 14:51:00 +04:00
Bret Curtis
b43eb56b7c
Merge pull request #2336 from akortunov/logging 
Use the logging system for compiler errors
 2019-04-24 12:00:44 +02:00
Andrei Kortunov
df94bfbf29
Merge pull request #2343 from Capostrophic/vfx 
Tweak object VFX scaling (bug #4989)
 2019-04-24 10:47:35 +04:00
Andrei Kortunov
bd2188a0f8 Use the logging system for compiler errors 2019-04-23 22:20:18 +04:00
Bret Curtis
2cc359a205
Merge pull request #2339 from akortunov/mygui 
Increase required MyGUI version to 3.2.2
 2019-04-23 16:43:14 +02:00
Capostrophic
f2638b58c1 Tweak object VFX scaling (bug #4989) 2019-04-22 21:27:33 +03:00
Andrei Kortunov
9059971a69 Increase required MyGUI version to 3.2.2 2019-04-22 20:52:18 +04:00
Andrei Kortunov
6a01e4cd8a Fix arguments order for raytracing in the getHitContact() (bug #4990) 2019-04-22 20:46:38 +04:00
Andrei Kortunov
626a05f825
Merge pull request #2128 from Capostrophic/blood 
Support all eight possible blood types (feature #4958)
 2019-04-21 21:14:30 +04:00
Alexei Dobrohotov
3e61ef32e7
Merge pull request #2332 from akortunov/particles 
Apply looping particles when adding spell to existing actor
 2019-04-21 10:39:17 +03:00
Andrei Kortunov
09686d684e Update background texture if a new one is empty (regression #4986) 2019-04-20 11:40:42 +04:00
Andrei Kortunov
5508e67aad Apply looping particles when adding spell to existing actor (bug #4918) 2019-04-20 09:52:15 +04:00
Capostrophic
f0433704b4 Only collect every unique magic bolt sound once (bug #4964) 2019-04-17 19:23:50 +03:00
Alexei Dobrohotov
89a0b2d2d4 Merge branch 'issue-4805' into 'master' 
Bug #4805: NPC movement speed calculations do not take race Weight into account

See merge request OpenMW/openmw!89

(cherry picked from commit 98f52fa8ad8d8746786c529373db81f8602135df)

61682570 Bug #4805: NPC movement speed calculations do not take race Weight into account
0c8308bc Revert "Bug #4805: NPC movement speed calculations do not take race Weight into account"
4b43e91f Change to only affect movement speed and not animation speed
a66ae118 Use adjustScale() to adjust movement calculation instead of using race weight
6295eadc Make sure height is also factored into movement speed
fde0ca8b Remove height from movement calculation and factor in cell reference scale
 2019-04-17 14:28:49 +00:00
Andrei Kortunov
e534153d00 Use friendly hits only for player's followers (bug #4984) 2019-04-16 17:12:37 +04:00
Capostrophic
7814bd1b76 Support eight possible blood types (feature #4958) 2019-04-14 18:48:31 +03:00
Andrei Kortunov
6b49ce965b Do not update drowning state for actors outside of AI distance (bug #4980) 2019-04-14 18:09:11 +04:00
Andrei Kortunov
4da21942af Do not use the actors processing range to determine a maximum range of AiTravel (bug #4979) 2019-04-14 17:51:12 +04:00
Capostrophic
2c473d84ee Fix zero division in enchantment magnitude calculation 2019-04-14 12:47:11 +03:00
Alexei Dobrohotov
5b8fc5a151
Merge pull request #2314 from OpenMW/stdc++14 
bump from C++11 to C++14
 2019-04-12 17:34:18 +03:00
Capostrophic
0333cd2dd4 Fix frozen rain when water refractions are disabled 2019-04-12 16:43:18 +03:00
terabyte25
27292ef4a3 Disable quick keys when fighting and spellcasting are disabled (bug #4962) 2019-04-12 13:08:55 +00:00
Bret Curtis
f4e113e7c1
Merge pull request #2277 from akortunov/terrain 
Camera-related fixes
 2019-04-12 11:17:20 +02:00
Bret Curtis
4fa529e093
Merge pull request #2320 from akortunov/cursorfix 
[Regression] Fix disappearing cursor in the self-enchanting menu
 2019-04-12 11:10:29 +02:00
Bret Curtis
785a667517
Merge pull request #2302 from akortunov/guifixes 
Scalable UI textures
 2019-04-12 11:09:30 +02:00
Andrei Kortunov
f165d22cde Fix a regression with disappearing cursor in the self-enchanting menu 2019-04-12 08:29:45 +04:00
Andrei Kortunov
9b716a2f8d
Merge pull request #2311 from Capostrophic/random 
Use dice rolls instead of chance for spell magnitude (bug #4945)
 2019-04-12 07:59:38 +04:00
Bret Curtis
10643a10f2
Merge branch 'master' into lighting 2019-04-11 09:55:09 +02:00
Capostrophic
85e99182ce Revise light source configuration (bug #4965) 
Set up attenuation less awkwardly
Use global attenuation settings for magic light source
Use constant attenuation settings
 2019-04-10 22:31:31 +03:00
Capostrophic
424716977b Only play miss sound for player attacks (bug #4969) 2019-04-10 22:28:22 +03:00
Bret Curtis
2ab7f903d7 make use of std::make_unique to test that MSVC2015 can handle that 2019-04-10 11:09:44 +02:00
Andrei Kortunov
31ddb0a482 Allow to calculate UI skin size based on texture resolution (feature #4968) 2019-04-10 10:34:07 +04:00
terrabyte25
61c3847a12 Add magic animation option to advanced page 2019-04-08 14:21:51 -05:00
Andrei Kortunov
413207f9af Reset old record, if its ID does not match with ID of new record (bug #4932) 2019-04-08 22:24:49 +04:00
Capostrophic
d4c1bd81b6 Use dice rolls instead of chance for spell magnitude (bug #4945) 2019-04-08 20:25:30 +03:00
Andrei Kortunov
14b756a692 Use a generic logging system for RecastNavigation 2019-04-08 20:31:21 +04:00
Alexei Dobrohotov
e9f6c11cc9
Merge pull request #2309 from akortunov/enchant_animations 
Add an option to use casting animations for magic items
 2019-04-08 18:54:07 +03:00
Andrei Kortunov
0079a6bf05 Correct the Enchant skill progress (bug #4963) 2019-04-08 16:15:19 +04:00
Bret Curtis
ca6f1bdd13
Merge pull request #2288 from Capostrophic/magiceffect 
Validate spell effect argument (bug #4927)
 2019-04-08 13:51:02 +02:00