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
24271 commits 38 branches 54 tags 122 MiB
Commit graph

12542 commits

Author SHA1 Message Date
bzzt lost a hitlab login
4ea018c594 Should resolve #5493 by better supporting objects that are placed across cells. 2020-07-09 23:17:01 +02:00
Bret Curtis
bbba524a6c Resolves #5517 by removing the object being rotated from the paging system. 2020-07-09 22:36:57 +02:00
psi29a
46db69a349 Merge branch 'swimming' into 'master' 
Swimming-related fixes

See merge request OpenMW/openmw!247

(cherry picked from commit 8be328ef80f29e9692e29d24beefa8ced16537a7)

738c71fd Extend the "turn to movement direction" mode for swimming up and down.
10d3e82b New setting "swim upward coef"
 2020-07-09 20:05:59 +00:00
elsid
1c9ce03575
Lookup sound when need to fade out 2020-07-08 22:43:16 +02:00
Andrei Kortunov
700f70595f
Merge pull request #2956 from elsid/sound_reoder_conditions 
Check distance to object before load sound
 2020-07-08 08:53:20 +04:00
elsid
41434f26a6 Merge branch 'Fix-Trainers-Issue-5486' into 'master' 
Trainers training skills based on base skill issue #5486

See merge request OpenMW/openmw!257
 2020-07-07 20:25:21 +00:00
elsid
624baa6d89
Check distance to object before load sound 2020-07-07 21:19:00 +02:00
CedricMocquillon
096e25b29a Make the getSkillForTraining a member method of TrainingWindow class. 
The implementation is based now on the member of the class
mTrainingSkillBasedOnBaseSkill instead of local static
 2020-07-07 11:13:35 +02:00
CedricMocquillon
1aa4f6bf96 The number of skills points a trainer can teach is based either on its base 
values or on its modified ones depending on the new setting 'trainers training
 skills based on base skill' value
 2020-07-06 20:30:14 +02:00
CedricMocquillon
281cef9769 The 3 skill selected by a trainer are based on its 3 best skills. 
The skills are sorted either on their base value or on their modified one
depending on the new setting 'trainers training skills based on base skill'
 2020-07-06 20:28:08 +02:00
elsid
3c460fb3e9
Use pointer to Sound to stop sounds started by NpcAnimation 2020-07-06 17:38:09 +02:00
Bret Curtis
67c2f0b26c
Merge pull request #2951 from elsid/sound_object_pool 
Store SoundManager sounds and streams in object pool
 2020-07-06 07:18:46 +02:00
Bret Curtis
0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads 
Replace OpenThreads by std types
 2020-07-04 13:11:23 +02:00
Andrei Kortunov
9ec61c14d2 Mark some methods as overrides to avoid warnings 2020-07-04 12:00:30 +04:00
Andrei Kortunov
d1b5f17390 Remove redundant virtual qualifier 2020-07-04 10:17:39 +04:00
elsid
02f9b44f01
Use RAII for object ptr from pool 2020-07-04 01:15:27 +02:00
elsid
6ca29c6107
Use common type for pool of sounds and streams 2020-07-04 01:09:04 +02:00
elsid
b424aac25e
Choose next action for water sound in a separate function 2020-07-03 21:04:25 +02:00
elsid
080b0d6319
Remove unused duration from updateWaterSound 2020-07-03 21:01:48 +02:00
psi29a
08469af742 Merge branch '#5509_invisibility_fix_round_2' into 'master' 
Should resolve the original cause of #5509

See merge request OpenMW/openmw!256
 2020-07-02 21:28:13 +00:00
Bret Curtis
d3c24a6ea4 Should resolve the original cause of #5509 and prevent mesh from growing while switching back and for from 3rd and 1st person view 2020-07-02 22:01:42 +02:00
elsid
6ab1a1f907
Make last cell a field of SoundManager and initialize 2020-07-02 19:28:58 +02:00
elsid
3fa1e7ebaf
Make time passed SoundManager field 2020-07-02 19:28:58 +02:00
Bret Curtis
e9126fae54 Resolve #5509 where culling did not take invisiblity into accont 2020-07-02 12:36:25 +02:00
elsid
a36a55bfb5
Clamp sound volume on settings update 2020-07-02 06:38:20 +02:00
Bret Curtis
f639c62428
Merge pull request #2939 from elsid/more_stats 
Add stats for all updates
 2020-07-01 23:00:48 +02:00
Bret Curtis
acf36344d4
Merge pull request #2946 from elsid/sound_update_water 
Put logic to update water sound id and volume into a separate class
 2020-07-01 22:50:29 +02:00
Roman Siromakha
859ab63679
Merge pull request #2889 from akortunov/statswatcher 
Add a separate stats watcher for GUI
 2020-07-01 19:05:15 +02:00
elsid
439891ef53
Put logic to update water sound id and volume into a separate class 2020-07-01 17:49:39 +02:00
Bret Curtis
3d7f8a573a
Merge pull request #2941 from elsid/lookup_stop_sound 
Lookup sound when need to stop
 2020-07-01 17:30:23 +02:00
Andrei Kortunov
27f1a3376c Add a separate stats watcher for GUI 2020-07-01 15:55:44 +04:00
Bret Curtis
26024e7d0d
Merge pull request #2944 from akortunov/input 
Regression fixes for input system
 2020-07-01 10:45:58 +02:00
Andrei Kortunov
7fb78e801f Fix mouse release injection 2020-07-01 11:02:02 +04:00
Andrei Kortunov
5f0cc87a67 Do not discard remnants 2020-07-01 09:52:57 +04:00
elsid
0594b7d1a0
Put logic for the next region sound selection into a separate class 2020-06-30 23:23:37 +02:00
elsid
eb68df1a37
Add stats for all updates 2020-06-30 22:00:23 +02:00
Alexei Dobrohotov
c53516a4b7
Merge pull request #2940 from akortunov/deadzone 
Make joysticks dead zone configurable
 2020-06-30 01:15:58 +03:00
elsid
02587ed1e9
Remove unused SoundManager::stopSound overload 2020-06-28 22:55:21 +02:00
elsid
0ff5e9bfb9
Lookup sound when need to stop 
Instead of loading.
 2020-06-28 22:16:48 +02:00
Andrei Kortunov
230e06dec7 Make joysticks dead zone configurable (bug #5502) 2020-06-28 13:12:12 +04:00
Petr Mikheev
a455b99ed6 Fix incorrect speed for creatures, that is caused by https://gitlab.com/OpenMW/openmw/-/merge_requests/245/diffs?commit_id=eebbacd8b4ab22b3e824538df2d7faec0038c1a1 2020-06-27 23:56:48 +02:00
psi29a
e83fb8c3fd Merge branch 'fix_turn_to_movement' into 'master' 
Bugfix for "turn to movement direction"

Fix for #5457.

Users complain that movement is not smooth enough when the character turns from "straight right" to "straight right and a bit backward" movement.

This MR fixes it.

The problem was mostly caused by the logic that at first changes animation speed to match movement speed, and then adjusts the movement speed to match the animation. IMHO it is a doubtful logic because then the real movement speed may be not consistent with the result of getSpeed.

Also I've removed the setting "turn to movement direction speed coef" because:
1) It was added as a workaround for this "non smooth movement" problem. After the fix it is not needed.
2) Users mistakenly think that it is somehow related to movement speed for diagonal movement.

See merge request OpenMW/openmw!245
 2020-06-26 20:04:02 +00:00
Petr Mikheev
63f828fea8 Bugfix for "turn to movement direction" 2020-06-26 20:04:02 +00:00
Alexei Dobrohotov
c94d6336b5
Merge pull request #2936 from akortunov/refactoring 
Use more C++11 in the physics code
 2020-06-26 19:44:16 +03:00
Bret Curtis
c4453322e5
Merge pull request #2931 from Capostrophic/intimidate 
Increase disposition on marginal Intimidate wins (#5485)
 2020-06-26 13:47:35 +02:00
Andrei Kortunov
4a5fce8ca5 Use more C++11 in the physics code 2020-06-26 14:22:00 +04:00
Andrei Kortunov
d0fe15b095 Use meaningful names instead of mSkill1 and mSkill2 2020-06-26 11:47:59 +04:00
Andrei Kortunov
fde0f20a6f Fix faction requirement calculations (bug #5499) 2020-06-26 11:14:38 +04:00
Andrei Kortunov
3dc3fe06e2
Merge pull request #2934 from akortunov/master 
Fix MSVC warning about variable re-declaration
 2020-06-26 09:55:30 +04:00
Andrei Kortunov
30b63270ce Fix MSVC warning about variable re-declaration 2020-06-26 09:49:26 +04:00
elsid
40ad87bc4d
Replace OpenThreads by std types 2020-06-25 22:16:09 +02:00
Capostrophic
b592fa826c Increase disposition on marginal Intimidate wins (#5485) 2020-06-25 20:28:55 +03:00
Bret Curtis
585755a502
Merge branch 'master' into shieldlocation 2020-06-25 14:58:45 +02:00
Capostrophic
2b2f9a8714 Redistribute hits to carried left slot when possible (#5490) 2020-06-25 15:44:40 +03:00
Capostrophic
c7aea20657 Don't offer a price of 1 gold for zero value items (#5484) 2020-06-25 14:56:20 +03:00
Petr Mikheev
63137a3b5a Make vertical offset of "view over shoulder" configurable 2020-06-24 20:07:41 +02:00
psi29a
abc77075b9 Merge branch 'doc-formattopics' into 'master' 
Follow up to MR 126 - make it more obvious for end users how to set colors

See merge request OpenMW/openmw!234
 2020-06-24 11:26:22 +00:00
Petr Mikheev
b4c699348f Improved strafe movement 2020-06-22 15:22:34 +02:00
Petr Mikheev
d3bd67d747 Advanced third person camera. 2020-06-22 15:22:34 +02:00
fredzio
ae27ad6bcd Follow up to MR 126 
Fill settings-default.cfg with default values as RGBA values are not intuitive for end users.
Add a boolean setting to enable the formatting (disabled by default).
 2020-06-22 04:31:12 +02:00
psi29a
981184109e Merge branch 'formattopics' into 'master' 
Change color of keywords in the dialogue window (#2159)

See merge request OpenMW/openmw!126
 2020-06-21 07:58:02 +00:00
Andrei Kortunov
142a9e772b Merge branch '5468_progress_caption_overlapping' into 'master' 
Issue #5468: Apparently this was always a problem but OP made "nested loading"...

See merge request OpenMW/openmw!228
 2020-06-18 16:27:06 +00:00
Andrei Kortunov
1541c7e5eb Fix ordering warning 2020-06-18 19:19:57 +04:00
Bret Curtis
c3dc0e62e8 OP profiling regression fix; Billboards such as those from Westly's tree mod should work again. 2020-06-18 16:16:16 +02:00
Bret Curtis
9446cece62 Issue #5468: Apparently this was always a problem but OP made "nested loading" more visible. This should resolve nested loading correctly. 2020-06-18 13:23:39 +02:00
Andrei Kortunov
808c905e1f Initialize fields to avoid undefined behaviour 2020-06-18 14:50:06 +04:00
Bret Curtis
c944acf26b
Merge pull request #2913 from akortunov/warnfix 
Get rid of ECLD and dependencies
 2020-06-17 15:00:57 +02:00
Bret Curtis
51136a75f2
Merge pull request #2915 from akortunov/guifixes 
Reset selected slot when closing savegame dialogue
 2020-06-17 14:09:31 +02:00
Andrei Kortunov
d1a3cc98ff Get rid of ECLD and dependencies 2020-06-17 13:09:16 +04:00
Bret Curtis
1db58575c8
Fixed missed AiPackageTypeId::Wander 'fix' 2020-06-17 09:58:18 +02:00
Andrei Kortunov
3e396a904e Reset selected slot when close savegame dialogue to avoid accidental saving/loading 2020-06-17 11:09:17 +04:00
Alexei Dobrohotov
2d23dad2bc
Merge branch 'master' into ai_package_type 2020-06-17 01:47:23 +03:00
psi29a
0dc7715c35 Merge branch 'object_paging_retry' into 'master' 
Object Paging

See merge request OpenMW/openmw!209
 2020-06-16 08:21:54 +00:00
elsid
b095ca6c86
Use actor speed to define area cost for pathfinding 2020-06-13 02:24:52 +02:00
elsid
374b85a00d
Add Class methods to get walk, run, swim speed 2020-06-13 02:24:51 +02:00
elsid
a35497de0c
Remove redundant runSpeed as always equal to walkSpeed 2020-06-13 02:24:45 +02:00
bzzt lost a hitlab login
26ab176389 profiling 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
daa2761c2d alphablending & billboardfix 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
4e2efb3cdb avoid sqrt 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
66c9469a80 fix 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
f12879a04c allow statesetupdater as cullcallback = faster + works in paging 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
4238fbccdf view fix 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
b27b76e325 avoid pagerebuild when reloading a same save 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
6fa12a6eb8 preload tweak 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
89ec6cfea2 tooltips labels 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
9f0398c021 intersection by refnum tag + enable paging for acti,door,cont 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
340d626589 static moving support 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
c7fda6d280 activegrid paging = 2xfps 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
b4af2ac672 avoid blocking on pagerebuild 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
17637c6575 pagerebuild on disable 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
c1ebd9474b stop navmesh updates when ai off 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
ffbed7ee38 loadingscreen 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
4dccabeb83 fix analyzation not taking instancecount in account + settings calibration 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
b7b31926a8 fix map glitch + cleanup 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
00e56ae862 batch debug colours 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
8a624e5a71 minsize based on mergedecision solves partial culling 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
0b4226f3e2 ico effieciency 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
38c21163ea + meshsizecache for reduce i&o stalling 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
bzzt lost a hitlab login
69514dfd46 ico redundency fix + stats counter 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
bzzt lost a hitlab login
1f891ca46d billboarding support for tree mods 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
bzzt lost a hitlab login
cf439581e1 comply by elsid review 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
bzzt lost a hitlab login
ce505a9bb3 crashfix + optimiziation 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
bzzt
c0f128bcb3 disablesupprort 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
bzzt
d684f1a78f terrainbased objectpaging 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
elsid
d863267d5c
Do not fallback to direct path without pathgrid 
Assume this might happen only due buildPath call when navmesh can't
provide path.
 2020-06-12 21:46:10 +02:00
elsid
c4cd3b2c4f
Add pathgrid to navmesh as off mesh connection 2020-06-12 21:04:02 +02:00
elsid
095a45c714
Remove unused PathgridGraph::mIsExterior 2020-06-11 21:43:51 +02:00
elsid
82893c30f4
Store package type id as enum except ESM 2020-06-11 21:02:27 +02:00
Capostrophic
4a2fd1e140 Revert the changes for "bug" #4551 2020-06-11 00:06:37 +03:00
Bret Curtis
6bc04507ef
Merge pull request #2715 from akortunov/cleanup 
Remove custom data for disposed actors
 2020-06-08 12:29:28 +02:00
Bret Curtis
cd97d0c61c
Merge branch 'master' into automove 2020-06-08 11:42:05 +02:00
Andrei Kortunov
3741355dca
Merge pull request #2898 from akortunov/master 
Update active spells during rest
 2020-06-08 13:30:16 +04:00
Andrei Kortunov
0c3b12c40f
Merge pull request #2893 from Capostrophic/projectile 
Clean up magic bolts casted by actors that are gone (bug #5451)
 2020-06-08 13:26:58 +04:00
Bret Curtis
857f4bd232
Merge pull request #2896 from akortunov/rendermanager 
Add a FogManager
 2020-06-08 11:20:51 +02:00
Andrei Kortunov
3dd4023e8d Update active spells during rest 2020-06-08 11:29:38 +04:00
Alexei Dobrohotov
d5d385fe9e
Merge pull request #2891 from elsid/ai_packages_options 
Replace AiPackage virtual methods by options
 2020-06-08 02:06:38 +03:00
Andrei Kortunov
4afc332a0c Add a FogManager 2020-06-07 15:51:03 +04:00
Capostrophic
456f0f9f44 Clean up magic bolts of actors that are gone (#5451) 2020-06-06 19:11:22 +03:00
Alexei Dobrohotov
05884e690f
Merge pull request #2880 from akortunov/rendermanager 
Remove redundant variables from the RenderingManager
 2020-06-06 16:09:44 +03:00
Capostrophic
1873da4c91 Don't save to or read automove state from saved games (#5452) 2020-06-06 15:58:21 +03:00
Fanael Linithien
48758116d6 Make sure the skill level up message box displays the value correctly 
Fixes regression introduced in 204d2acf25.
 2020-06-06 14:24:33 +02:00
Andrei Kortunov
6de97e6bc2 Remove redundant variables from RenderingManager 2020-06-06 14:10:24 +04:00
elsid
5b34ef224b
Replace AiPackage virtual methods by options 2020-06-06 12:00:17 +02:00
Bret Curtis
3b1c717ab9
Merge pull request #2888 from elsid/ai_packages_const 
Mark not changing AiPackages fields as const
 2020-06-05 23:11:10 +02:00
Bret Curtis
204d2acf25
Merge pull request #2092 from akortunov/float_stats 
Store attributes and skills values as floats
 2020-06-05 22:38:12 +02:00
Bret Curtis
5d019c27ae
Merge pull request #2887 from akortunov/worldmanager 
Introduce a separate class to control world date and time
 2020-06-05 13:15:44 +02:00
Andrei Kortunov
81805b7263 Introduce a separate class to control world date and time 2020-06-05 12:07:32 +04:00
elsid
da8ea9d8c7
Mark not changing AiPackages fields as const 2020-06-04 23:12:23 +02:00
elsid
d35ccc39c6
Fix build tests with double precision bullet 2020-06-03 21:34:05 +02:00
Andrei Kortunov
5468fcb29f Store attributes and skills values as floats (bug #4021) 2020-06-03 17:34:15 +04:00
Bret Curtis
2eb9d4ad4e
Merge pull request #2878 from Assumeru/mutate-ai 
Mutate base records when editing AI settings (#2798)
 2020-06-03 15:09:40 +02:00
Bret Curtis
dd7f5fcde7
Merge pull request #2884 from Capostrophic/deathmagic 
Update spell effects during death animation (#5403)
 2020-06-03 15:07:08 +02:00
Bret Curtis
109057e53f
Merge pull request #2544 from akortunov/corprus 
Rework corprus implementation
 2020-06-03 13:41:57 +02:00
Andrei Kortunov
3dce225f28 Implement vanilla-style corprus handling (bug #3714, bug #4623) 2020-06-03 12:58:17 +04:00
Andrei Kortunov
c0e62e9529 Refactor list of variables in the WorldManager 2020-06-03 11:21:34 +04:00
Evil Eye
4d7947d27c Mutate base records when editing AI settings (#2798) 2020-06-02 21:59:37 +02:00
elsid
b67e18329e
Store AI packages as unique_ptr 2020-06-01 17:07:08 +02:00
elsid
ce7c47ee12
Return cloned AiPackage as unique_ptr 2020-06-01 17:07:08 +02:00
Bret Curtis
18bb6dd223
Merge pull request #2859 from elsid/aipackage_single_clone 
Single clone function definition for all AI packages
 2020-06-01 01:21:57 +02:00
Capostrophic
d72152183f Update spell effects during death animation (#5403) 2020-05-30 23:24:06 +03:00
Bret Curtis
d3b3b74945
Merge pull request #2871 from Capostrophic/tcl 
Don't "disable" player's collision shape in TCL (#5435)
 2020-05-30 17:57:27 +02:00
Capostrophic
577786f110 Don't disable player's collision shape in TCL (#5435) 2020-05-30 00:55:17 +03:00
Capostrophic
b0b4550f05 Pass Actor by reference, simplify GetTarget for greetings 2020-05-30 00:51:58 +03:00
Capostrophic
efd5f13b2b Make greeting-related actor data temporary (bug #5397) 2020-05-30 00:51:58 +03:00
Bret Curtis
9d0855baa5
Merge pull request #2866 from elsid/extend_osg_stats 
Extend OSG stats
 2020-05-29 23:23:38 +02:00
Alexei Dobrohotov
6f2b0252fa
Merge pull request #2881 from akortunov/statemanager 
Use C++11-style loops in the StateManager
 2020-05-29 23:53:59 +03:00
Bret Curtis
6f2fdb990b
Merge pull request #2876 from Capostrophic/blending 
Reenable weapon animation lower body anim blending in first person view (#5441)
 2020-05-29 11:05:33 +02:00
Andrei Kortunov
48b3fe5733 Use C++11-style loops in the StateManager 2020-05-29 12:26:02 +04:00
Andrei Kortunov
396afe79f1 Move font loading to the FontLoader 2020-05-28 23:18:31 +04:00
Bret Curtis
f36288569c
Merge pull request #2874 from akortunov/windowmanager 
Cleanup WindowManager
 2020-05-28 13:22:23 +02:00
Andrei Kortunov
1759276ac5
Merge pull request #2869 from Capostrophic/appliedonce 
Use AppliedOnce flag in more effect duration calculations (#5425)
 2020-05-27 17:00:14 +04:00
Alexei Dobrohotov
afc537384d
Merge pull request #2875 from akortunov/input 
Move cursor update to the MouseManager
 2020-05-26 20:34:31 +03:00
Evil Eye
a8231ae297 fix explicit startscript calls 2020-05-26 19:01:33 +02:00
Andrei Kortunov
2ff04b4e73 Move TextColours initialization to the TextColours itself 2020-05-26 18:35:16 +04:00
Andrei Kortunov
dcfc4cc5dd Rename onFrame() to update() to make WindowManager consistent with other managers 2020-05-26 18:35:16 +04:00
Andrei Kortunov
000e44a18e Move data from WindowManager to CharacterCreation to simplify API 2020-05-26 18:35:13 +04:00
Andrei Kortunov
b00d72b9e4 Move cursor update to the MouseManager 2020-05-26 18:03:29 +04:00
Capostrophic
95cd473352 Reenable weapon animation lower body animation blending in FPV (#5441) 
Disabling it is a non-vanilla behavior that breaks things that aren't broken in vanilla
 2020-05-26 17:01:45 +03:00
Roman Siromakha
b3b8480d49
Merge pull request #2868 from Capostrophic/opcodes 
Give new opcodes to old functions made custom
 2020-05-26 14:08:27 +02:00
Andrei Kortunov
e3df170a53 Fix mControlsDisabled flag usage 2020-05-26 10:58:24 +04:00
Capostrophic
51c0806a31 Use AppliedOnce flag in more effect duration calculations (#5425) 2020-05-24 18:37:21 +03:00
Capostrophic
e0ecbc08df Give new opcodes to old functions made custom 2020-05-23 11:57:15 +03:00
elsid
69df6098e5
Report frame number, number of actors and objects to stats 2020-05-22 17:39:18 +02:00
Capostrophic
c9c9599ec5 Improve GetDistance and object search warnings (bug #5427) 
Allow GetDistance to work with a non-existent object argument or with inventory items that belong to a container store that doesn't exist
 2020-05-22 15:50:04 +03:00
Capostrophic
904b245d30 Re-enable non-biped creature headtracking (bug #5424) 2020-05-22 14:45:28 +03:00
Alexei Dobrohotov
a68a4338a0
Merge pull request #2841 from Assumeru/consistent-refs 
Script reference consistency
 2020-05-22 12:48:50 +03:00
Bret Curtis
357a845d00
Merge pull request #2862 from elsid/optimize_has_animation 
Optimize MWRender::Animation::hasAnimation
 2020-05-22 10:33:37 +02:00
elsid
9326111f4c
Use vector for Animation::mActiveControllers 
Container is only used to add elements, iterate over all of them and
clear. Multimap adds overhead for all of these operations without any
benefits. Reduce Animation::resetActiveGroups CPU time usage by 50%.
 2020-05-21 17:32:25 +02:00
elsid
a59e25e093
Optimize MWRender::Animation::hasAnimation 
Use a set to check for group start existence.
Reduce time taken from 2.6% to 0.08% and
MWMechanics::MechanicsManager::update from 7% to 5%
in relative CPU time usage for a scene with ~100 actors.
 2020-05-21 16:21:11 +02:00
elsid
8e0934cbd8
Single AI package clone definition 2020-05-20 20:15:29 +02:00
elsid
103188b61d
Derive all AI package classes from template to support CRTP features 2020-05-20 20:15:29 +02:00
elsid
d7a920a04b
Env variable to write OSG stats into file 2020-05-18 23:44:21 +02:00
David Cernat
411b6dcd8e Don't clear spells for a dead player, preventing resurrection problems 2020-05-18 14:46:20 +03:00
Bret Curtis
88a7ecc18d
Merge pull request #2528 from akortunov/effectstime 
Use real time to update spell effects
 2020-05-18 11:07:48 +02:00
Bret Curtis
730d0493db
Merge pull request #2856 from elsid/aisequence_cleanup 
AiSequence cleanup
 2020-05-18 09:47:36 +02:00
Bret Curtis
72507e57c6
Merge pull request #2857 from elsid/aipackage_cleanup 
Remove redundant explicit dtor definition for AiPackage
 2020-05-18 00:13:30 +02:00
elsid
a4fbcb8a10
Remember package iterator to erase it from list without find call 2020-05-17 22:37:44 +02:00
Evil Eye
3875b837bc make MenuMode, Random, GetSecondsPassed regular functions 2020-05-17 22:34:54 +02:00
elsid
d48eead038
Check type id of current package 
If package is changed the following usage of it is not consistent.
 2020-05-17 22:34:15 +02:00
elsid
f566ab03ab
Mark overriden AiPackage methods as final 2020-05-17 22:19:50 +02:00
elsid
3b5ce71d71
Remove redundant explicit dtor definition for AiPackage 2020-05-17 22:18:26 +02:00
elsid
ca93f8ee39
Compare initialized iterator 
Comparsion of untilialized iterator is UB. Initialize with packages end.
 2020-05-17 21:42:38 +02:00
elsid
e3cce0949e
Replace condition that may lead to UB by assert 
If mPackages is empty it means package is a pointer to a deleted object
at line . We can assume it couldn't happen because execute is always called
next for this object at line 289.
 2020-05-17 21:42:38 +02:00
Alexei Dobrohotov
b168544445
Merge pull request #2852 from elsid/aiwander_cleanup 
AiWander cleanup
 2020-05-17 00:37:22 +03:00
Bret Curtis
59bda361f0
Merge pull request #2848 from akortunov/bullet 
Fix Bullet flags usage
 2020-05-16 23:22:34 +02:00
elsid
d86669843e
Remove unseud pointTolerance argument 2020-05-16 18:44:12 +02:00
elsid
256c9917a4
Make AiWander::isPackageCompleted const 2020-05-16 18:44:12 +02:00
elsid
131f2557b1
Split functions to remove redundant clearPath argument 2020-05-16 18:44:12 +02:00
elsid
b8513e0318
Remove unused arguments 2020-05-16 18:44:12 +02:00
elsid
489a92de95
Check for hidden path only for actors wandering manually 
Actors who doesn't wander over pathgrid.
 2020-05-16 16:26:42 +02:00
elsid
e616188265
Do not allow wandering actor to have empty path 2020-05-16 16:11:30 +02:00
elsid
71350c6dff
Remove redundant variable 2020-05-16 16:11:30 +02:00
Andrei Kortunov
b5833f3c59 Use real time to update spell effects instead of game timestamps (bug #5165) 2020-05-16 11:00:28 +04:00
Andrei Kortunov
3ebbe14a62 Avoid zero division 2020-05-16 10:56:51 +04:00
Capostrophic
8265ebc484 Fix spell school calculation 2020-05-15 22:24:48 +03:00
Andrei Kortunov
add42830d9 Add a flag to use double-precision functions from Bullet 2020-05-15 12:48:47 +04:00
Andrei Kortunov
e827d9c04f Disable physics profiler, if Bullet was compiled without profiling support 2020-05-15 12:48:41 +04:00
Evil Eye
f0e2ee45fa reuse ImplicitRef and ExplicitRef for enable, disable, getdisabled, startscript; move scriptrunning and stopscript 2020-05-13 21:17:08 +02:00
elsid
2d7c3bae61
Support bullet with double precision 2020-05-13 19:24:28 +02:00
Capostrophic
110e3761bf Disable small feature culling for orthographic cameras 2020-05-12 23:25:07 +03:00
Capostrophic
77bdd124ee Address akortunov's save loading message complaints 
Add quotes to the character's name
Don't print the full path to save file
Use better terminology
 2020-05-12 13:51:07 +03:00
Bret Curtis
42cba092b7
Merge pull request #2716 from akortunov/png 
Store fog of war as a PNG image instead of TGA
 2020-05-12 11:52:23 +02:00
Bret Curtis
b7c33dbe0a
Merge pull request #2831 from Capostrophic/pursue 
Allow guards to pursue an invisible player (bug #4774)
 2020-05-12 11:45:01 +02:00
Bret Curtis
4b30bf5699
Merge pull request #2829 from Capostrophic/logging 
Log some more things
 2020-05-12 11:44:05 +02:00
Bret Curtis
62290182eb
Merge pull request #2648 from Assumeru/start-scripts 
Allow targeting non-unique actors with StartScript. Fixes #2311
 2020-05-12 10:39:11 +02:00
Bret Curtis
507adac8cd
Merge pull request #2783 from akortunov/input 
Refactor InputManager
 2020-05-12 09:34:22 +02:00
Capostrophic
ece0db4f82 Cap movement animation playback speed 2020-05-11 15:11:32 +03:00
unknown
3b4782959e Allow targeting non-unique actors with StartScript (bug #2311) 2020-05-10 14:57:06 +02:00
Andrei Kortunov
41beca8125 Refactor actions order setup 2020-05-10 10:13:19 +04:00
Capostrophic
a5d0d13e14 Allow guards to pursue an invisible player (bug #4774) 2020-05-09 21:23:06 +03:00
Capostrophic
aa5161f99e Log some more things 2020-05-09 20:27:12 +03: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
Andrei Kortunov
a6514e7740 Add missing include 2020-05-09 11:28:30 +04:00
Andrei Kortunov
73552f1d3c Move control switch reading/writing to relevant class 2020-05-09 11:27:02 +04:00
Andrei Kortunov
b4e52a6bc8 Add missing include 2020-05-09 11:27:02 +04:00
Andrei Kortunov
0455f48d02 More formatting changes 2020-05-09 11:27:02 +04:00
Andrei Kortunov
b575712cb1 Formatting changes 2020-05-09 11:27:02 +04:00
Andrei Kortunov
85f91a7de8 Remove some redundant code 2020-05-09 11:27:02 +04:00
Andrei Kortunov
3328775eff Unify cursor enabling 2020-05-09 11:27:02 +04:00
Andrei Kortunov
b33c4c920c Move all OICS handling to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
0eb24da2e7 Fix controls disabling 2020-05-09 11:27:02 +04:00
Andrei Kortunov
2f2b3173e3 Fix copy-paste error 2020-05-09 11:27:02 +04:00
Andrei Kortunov
8512133bb1 Move control switches to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
f990150c49 Move video wrapper to the WindowsManager 2020-05-09 11:27:02 +04:00
Andrei Kortunov
13b7c5b519 Rework actions update 2020-05-09 11:27:02 +04:00
Andrei Kortunov
d3a9f893c8 Move keyboard-specific code to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
c368250e6a Rename misleading mInputManager variable 2020-05-09 11:27:02 +04:00
Andrei Kortunov
e353647d15 Move gamepads handling to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
f9d6137a29 Do not store player reference in the InputManager 2020-05-09 11:27:02 +04:00
Andrei Kortunov
ce40294124 Move input actions handling to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
fcac7d3ab7 Split mouse handling to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
1560e71f4e Move SDL mappigs to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
3c09d05615 Split actions enum to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
15dc4d241d Split sensors handling so the separate file 2020-05-09 11:27:02 +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
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
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
fredzio
947f3cf13c Optionally change color of keywords in the dialogue window based on the 
next answer:
- if the answer was already heard, apply "color topic exhaused" setting
- if the answer was never heard, and the current actor is specified in
the dialog, apply "color topic specific"
- otherwise, do nothing special
 2020-05-02 01:42:05 +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
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
7345c89b54
Merge pull request #2813 from Capostrophic/collisionswitch 
Fix collision switch node mask (again)
 2020-04-30 13:50:09 +02:00
Capostrophic
844838c46a Revert an invalid attempt to autoequip shields instead of torches 2020-04-30 00:12:52 +03:00
Capostrophic
89282d14aa Fix collision switch node mask (again) 2020-04-29 17:18:39 +03:00
AnyOldName3
a3b032bf2b Fix chameleon shadows 2020-04-27 23:49:48 +01:00
Capostrophic
69cd53ef8a Fix reflect 2020-04-27 14:06:50 +03:00