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
Andrei Kortunov
35facc5cde
Add an option to use casting animations for magic items (feature #4962 )
2019-04-08 15:41:29 +04:00
Bret Curtis
7808cbbfe8
Merge pull request #2292 from akortunov/fallback
...
Make fallback map static to simplify constructors
2019-04-07 17:43:59 +02:00
bzzt
391f6faffb
Remove unused defaultViewer / defaultViewPoint
2019-04-07 11:21:09 +04:00
bzzt
e908790584
Inherit the view point from main camera for water RTT cameras
2019-04-07 11:21:07 +04:00
Andrei Kortunov
489e5c6cce
Store preloaded terrain view in the main thread
2019-04-07 11:15:21 +04:00
bzzt
63ab7345be
Reuse traversal result for different traversal with same view point
...
Rename eyePoint to viewPoint to match OSG conventions (eyePoint is the camera position, viewPoint is for LOD handling)
2019-04-07 11:14:37 +04:00
Nelsson Huotari
4c4fb0d955
Add include
2019-04-06 10:38:59 +03:00
Nelsson Huotari
69f900349c
Remove unnecessary include
2019-04-06 10:07:07 +03:00
Nelsson Huotari
ee4a8d2166
Add various coordinate conversion functions
2019-04-05 01:54:10 +03:00
Bret Curtis
1766a252dc
Merge branch 'master' into voiceover
2019-04-04 19:54:22 +02:00
Capostrophic
af80eddc0e
Use loudness data for 2D voiceover (bug #4947 )
2019-04-04 19:07:29 +03:00
Capostrophic
1424399118
Disable any footstep sounds when flying (bug #4948 )
2019-04-04 17:22:24 +03:00
Capostrophic
7202f45771
Only allow resting in air when a bed is used
2019-04-04 17:22:24 +03:00
Capostrophic
be125aa996
Add spell effect argument validation (bug #4927 )
2019-04-01 16:22:24 +03:00
Bret Curtis
aacc275e9c
Merge pull request #2299 from Capostrophic/position
...
Replicate vanilla Position/SetPos behavior more closely (bug #3109 )
2019-04-01 08:58:50 +02:00
Capostrophic
80a65e81dd
Only set attack type randomly if "best attack" is on (bug #4942 )
2019-03-31 22:20:26 +03:00
Capostrophic
3a0e374dc6
Replicate vanilla Position/SetPos behavior more closely (bug #3109 )
2019-03-31 14:17:06 +03:00
bzzt
ed4ce4609b
Do not re-render maps for all active cells during cell transitions
2019-03-30 09:10:48 +04:00
Bret Curtis
2c57abc245
Merge branch 'master' into dialoguefix
2019-03-29 15:07:45 +01:00
Andrei Kortunov
a302ec9c65
Make fallback map static to simplify constructors
2019-03-29 15:30:49 +04:00
Bret Curtis
886c77bced
Merge pull request #2145 from akortunov/rest
...
Update jail state once instead of for every single hour
2019-03-27 13:14:22 +01:00
Chris Djali
1860d720bc
Merge pull request #2263 from akortunov/actor_culling
...
Do not recreate shaders to update transparency
2019-03-26 14:13:50 +00:00
Bret Curtis
d727a2f25c
Merge pull request #2285 from Capostrophic/mainmenu
...
Avoid menu button textures vertical cutoff
2019-03-25 13:33:03 +01:00
Bret Curtis
1e9eac568f
Merge pull request #2249 from akortunov/cache
...
Implement generic caching system
2019-03-25 13:32:23 +01:00
Capostrophic
93f78aad60
Avoid menu button texture vertical cutoff
2019-03-24 22:55:27 +03:00
Bret Curtis
354f904a24
Merge pull request #2279 from akortunov/map
...
Optimize map window update
2019-03-24 16:45:16 +01:00
Capostrophic
6dbd875f75
Disallow binding some reserved keys (bug #3282 )
2019-03-23 22:56:30 +03:00
bzzt
1143985bc7
Do not update map texture if it did not change
2019-03-23 16:22:57 +04:00
bzzt
d707eaac36
Use ICO for water shader
2019-03-23 15:44:03 +04:00
bzzt
231e629e66
Store map widgets and textures in one vector instead of 4 different ones
2019-03-23 07:46:41 +04:00
bzzt
c2176945bd
Do not use the delayed map cells update
2019-03-22 18:58:34 +04:00
Bret Curtis
bbbdefce5f
Merge pull request #2275 from elsid/fix_map_iteration
...
Use auto for map value_type in range-based for loops
2019-03-22 11:13:58 +01:00
elsid
5434e92437
Take in account actor half extents for obstacle check
2019-03-21 23:15:47 +03:00
elsid
1e8bf3846e
Remove unused argument
2019-03-21 23:15:47 +03:00
elsid
287433efa8
Stop walking for water and flying creatures after single stuck
2019-03-21 23:15:47 +03:00
elsid
a65f60e1f1
Build path only by navmesh for wandering near spawn
2019-03-21 23:15:47 +03:00
elsid
ff67a9e233
Build straight path for wandering flying and water creatures
2019-03-21 23:15:47 +03:00
elsid
ebdff5d96e
Check for height map when cast ray for AiWander path
2019-03-21 23:15:47 +03:00
elsid
e033b0c565
Avoid build path through the ground for flying wandering creatures
2019-03-21 23:15:46 +03:00
elsid
e82d65a2c7
Use if-continue to skip build path
2019-03-21 23:15:46 +03:00
elsid
fa7b304e78
Use auto for map value_type in range-based for loops
...
To avoid implicit call of copy constructor for
pair<const K, V> to pair<K, V> conversion.
2019-03-21 23:09:42 +03:00
Chris Djali
e14682e353
Merge pull request #2273 from AnyOldName3/conformant-comparator
...
Use irreflexive, asymmetric comparator as required by the spec.
2019-03-20 23:55:03 +00:00
AnyOldName3
32da9a8ab1
Use irreflexive, asymmetric comparator as required by the spec.
2019-03-20 23:32:01 +00:00
Capostrophic
695cd5bb49
Minor NpcAnimation cleanup
2019-03-20 16:11:21 +03:00
Bret Curtis
7ccfec4d21
Merge pull request #2270 from akortunov/animfix
...
Fixes for werewolf animations
2019-03-20 12:32:11 +01:00
Andrei Kortunov
be12d241da
Reset current attack during force update (bug #4922 )
2019-03-20 12:28:29 +04:00
Andrei Kortunov
e171d34192
Init NPC type properly in the NpcAnimation
2019-03-20 12:28:03 +04:00
elsid
ccb325c663
Add override to fix warnings
2019-03-20 00:19:26 +03:00
Andrei Kortunov
7501f18d21
Avoid the 'structurally dead code' warning
2019-03-19 09:16:03 +04:00
Andrei Kortunov
7995a92672
Initialize missing variables
2019-03-19 09:12:31 +04:00
Andrei Kortunov
fd5e9cf271
Catch possible boost::bad_any_cast exception
2019-03-19 09:11:14 +04:00
Bret Curtis
b819690e82
Merge pull request #2264 from akortunov/optimize_terrain
...
Delete composite map layers in the background thread
2019-03-18 13:52:17 +01:00
bzzt
aa5a071aef
Delete composite map layers in the background thread
2019-03-18 14:00:50 +04:00
Bret Curtis
e2ed90e67b
Merge pull request #2262 from akortunov/guifixes
...
[Regression] Fix missing \n characters on the active effects tooltips
2019-03-18 08:59:31 +01:00
Bret Curtis
d56733149c
Merge pull request #2201 from akortunov/optimize_terrain
...
Optimize terrain
2019-03-18 08:59:10 +01:00
Bret Curtis
4e3de9b00c
Merge pull request #2206 from Capostrophic/title
...
Loop title screen music (bug #4896 )
2019-03-18 08:58:14 +01:00
bzzt
5ec28e09c9
Do not recreate shaders to update transparency
2019-03-18 10:37:53 +04:00
Andrei Kortunov
c6cb91ce61
Limit maximum FOV value
2019-03-18 10:27:30 +04:00
bzzt
6029ed4ecc
Reject empty quad tree nodes at the cell level without land data
2019-03-18 10:27:29 +04:00
Andrei Kortunov
80e0fbdd88
Fix missing \n characters on the active effects tooltips
2019-03-18 08:47:46 +04:00
elsid
4624f31788
Report navigator stats
2019-03-17 22:15:18 +03:00
Capostrophic
abae35e88b
Loop title screen music (bug #4896 )
2019-03-17 21:05:52 +03:00
Capostrophic
168e758921
Correct look and behavior of some setting sliders
2019-03-17 06:44:42 +03:00
Bret Curtis
433893e733
Merge pull request #2256 from unelsson/instance_viewcell
...
Editor: Implement exterior cell view from Instances table
2019-03-16 20:47:40 +01:00
Nelsson Huotari
2b674cedaa
Implement view cell from r-type hint
2019-03-16 14:38:51 +02:00
Capostrophic
dd03d3b231
Print SDL version at startup
2019-03-15 19:07:31 +03:00
Andrei Kortunov
2ed05a5195
Implement generic caching system
2019-03-14 09:10:19 +04:00
Bret Curtis
f62c1c59b4
Merge pull request #2241 from Capostrophic/console
...
Use selected object local variables in the console (feature #3893 )
2019-03-13 15:42:43 +01:00
Bret Curtis
7b1a62fc1d
Merge pull request #2247 from akortunov/loadtex
...
Allow to override texture records in the game
2019-03-11 21:05:30 +01:00
Andrei Kortunov
943279abbb
Consider land texture with given ID and index as override for base texture with the same ID and index (bug #4736 )
2019-03-11 20:19:19 +04:00
Bret Curtis
cb1a5f3679
Merge pull request #2245 from elsid/navigator_refactor
...
Refactor navigator related code
2019-03-11 07:51:43 +01:00
elsid
518e34b403
Remove useless variables
2019-03-10 23:58:48 +03:00
elsid
614d5243c3
Make NavMeshCacheItem consistent
...
Move all logic related to this type into its methods.
2019-03-10 23:07:36 +03:00
Capostrophic
dd952c3ddb
Fix extra space in "no script" showvars output
2019-03-10 17:12:43 +03:00
Capostrophic
578beb6305
Use selected object local variables in console (feature #3893 )
2019-03-10 17:09:54 +03:00
elsid
ccc709a316
Store guarded navmesh cache item in shared_ptr
...
Remove useless SharedGuarded type.
2019-03-10 17:06:19 +03:00
elsid
0479ebf5ae
Remove unused actors and navmeshes on update
...
When there is only one actor (player) on a scene and it moving to other
cell first it will be removed from navigator then added. Remove cause
navmesh removing for its half extents. After it is added navmesh for
same half extents is created and added. While this all happens there are
still jobs for old navmesh are processing. Old navmesh still exists
because it is stored by shared pointer. So jobs take tiles from cache
and place them into old navmesh. After that other jobs take same tiles
from cache (half extents and coordinates are equal) and place them into
other navmesh. dtNavMesh changes tile data on add and remove. Adding tile
to two dtNavMesh corrupts tile in both nameshes.
2019-03-10 17:06:15 +03:00
Bret Curtis
1078708da0
Merge pull request #2235 from akortunov/aifix
...
[0.45 regression] Fix AI regressions
2019-03-10 11:48:48 +01:00
Bret Curtis
a4b647db3e
Merge pull request #2236 from Capostrophic/audio
...
Fix EAGAIN error leading to packets getting lost (bugs #4906 , #4909 )
2019-03-10 11:40:09 +01:00
Andrei Kortunov
08202f8185
Fix missing null check
2019-03-10 11:03:51 +04:00
Capostrophic
d1967562a3
Fix the last audio packet getting lost
2019-03-09 21:25:16 +03:00
Andrei Kortunov
2a08b85998
Combat AI: normalize hit chance in the weapon priority calculation
2019-03-09 22:24:50 +04:00
Andrei Kortunov
5f0c8a4783
Combat AI: decrease priority multiplier for enchantments (bug #3830 )
2019-03-09 22:05:24 +04:00
Bret Curtis
947bf880df
Merge pull request #2232 from elsid/fix_div_by_zero
...
Do not scale duration when timescale is zero
2019-03-09 18:06:53 +01:00
Bret Curtis
9b190eceab
Merge pull request #2230 from akortunov/preloading
...
Minor preloading improvements
2019-03-09 17:56:18 +01:00
elsid
d3bdf912a4
Do not scale duration when timescale is zero
2019-03-09 17:14:07 +03:00
Bret Curtis
573e64e9c9
Merge pull request #2184 from elsid/fix_startup_script
...
[Testing needed] Always run startup script once at engine start (bug #4877 )
2019-03-09 14:04:06 +01:00
Bret Curtis
048cfdfac6
Merge pull request #2228 from Capostrophic/mainmenu
...
Fix main menu toggling again
2019-03-09 10:27:09 +01:00
Andrei Kortunov
12f9184d00
Allow to interrupt terrain preloading
2019-03-09 13:15:23 +04:00
Bret Curtis
c20e69ef24
Merge pull request #2227 from elsid/fix_twitchy_massive_creatures
...
Fix twitchy movement for massive creatures (bug #4907 )
2019-03-09 02:11:11 +01:00
Bret Curtis
e3bde5ec91
Merge pull request #2226 from akortunov/projectilefix
...
Use relative animation time only for bows and crossbows
2019-03-08 22:52:10 +01:00
Bret Curtis
c2a7aa2932
Merge pull request #2225 from elsid/retry_async_navmesh_update_job
...
Support explicit limit of navmesh tiles for scene
2019-03-08 22:39:45 +01:00
Capostrophic
ca83b9ee90
Refactor main menu and settings toggling again
2019-03-08 23:09:57 +03:00
elsid
ea80a81538
Drop path points while tolerance allows
2019-03-08 22:33:34 +03:00
elsid
b9f21ec81a
Use custom steps size to make smooth path depending on half extents
2019-03-08 22:33:34 +03:00
elsid
8fd6b37e34
Make path point tolerance depending on actor half extents
2019-03-08 22:33:33 +03:00
bzzt
e0cf460ba3
Do not load terrain beyond the viewing distance
2019-03-08 22:15:27 +04:00
Andrei Kortunov
4c21776b94
Use relative animation time only for bows and crossbows (bug #3778 )
2019-03-08 20:16:02 +04:00
elsid
f2e47d640d
Add option to limit max number of navmesh tiles
2019-03-08 17:39:04 +03:00
Bret Curtis
1e4bbe8997
Merge pull request #2223 from Capostrophic/animation
...
Fix raki creatures in Skyrim: Home of the Nords (bug #4810 )
2019-03-08 15:25:45 +01:00
Andrei Kortunov
de41c98022
Refactor menu toggling
2019-03-08 13:36:44 +04:00
Capostrophic
b05531818c
Fix raki creatures in Skyrim: Home of the Nords (bug #4810 )
...
Make bip01 have higher priority than 'root node' node when determining the movement accumulation root
2019-03-07 21:09:00 +03:00
Bret Curtis
c55141d18d
Merge pull request #2217 from Capostrophic/shader
...
Move forcePPL and clamp to global shader defines (task #4869 )
2019-03-07 16:56:09 +01:00
Bret Curtis
df6112aa35
Merge pull request #2221 from akortunov/iter
...
Use C++11-style loops in the game world instead of iterators
2019-03-07 16:53:18 +01:00
Perry Hugh
b8b7568ce5
Correct odd toggling menu behavior.
2019-03-07 11:41:48 +01:00
Bret Curtis
088de40365
Merge pull request #2218 from akortunov/warnfix
...
Fix MSVC warning about variable re-declaration
2019-03-07 11:37:07 +01:00
Bret Curtis
a5d7efc009
Merge pull request #2207 from CyberShadow/gettooltipinfo-var
...
[Trivial] Reuse a previously-saved value
2019-03-07 11:36:44 +01:00
Bret Curtis
9adb557833
Merge pull request #2211 from Capostrophic/messages
...
Small script verifier tweaks
2019-03-07 10:11:56 +01:00
Andrei Kortunov
d23a0ce2ae
Use C++11-style loops in the game world instead of iterators
2019-03-07 12:39:57 +04:00
Andrei Kortunov
dcec9df345
Fix MSVC warning about variable re-declaration
2019-03-07 08:08:13 +04:00
Bret Curtis
8bd7effae1
Merge pull request #2212 from elsid/navigator_log_spam
...
Do not build path by navigator for pure water and flying creatures
2019-03-06 21:37:41 +01:00
Bret Curtis
41d1521f1d
Merge pull request #2213 from elsid/min_path_point_tolerance
...
Use min point tolerance to prevent face wrong direction (bug #4814 )
2019-03-06 21:36:43 +01:00
Bret Curtis
7e5c7064af
Merge pull request #2214 from CyberShadow/pull-20190305-225227
...
DRY skill widget updates in stats window
2019-03-06 21:36:16 +01:00
Vladimir Panteleev
9d5fc7954f
DRY skill widget updates in stats window
...
The skill widgets were configured in two places: initial creation, and
updates. The former was redundant, and duplicated the functionality of
the latter.
To fix this redundancy, replace the duplicate code with a call to
setValue.
2019-03-05 22:52:30 +00:00
Capostrophic
0cdc46dfd6
Move forcePPL and clamp to global shader defines (bug #4869 )
2019-03-05 23:36:08 +03:00
elsid
cf1e1d9f4b
Use min point tolerance to prevent face wrong direction (bug #4814 )
...
When next path point is too close to actor and it has speed 0,
it can face direction not pointing to path target.
2019-03-05 23:18:55 +03:00
elsid
eb45f99880
Remove unused code
2019-03-05 23:18:55 +03:00
elsid
5405efd3b5
Do not build path by navigator for pure water and flying creatures
...
They don't need to move by surfaces and to open/close doors.
2019-03-05 22:45:05 +03:00
Capostrophic
44da71fdb3
Restructure script verifier message
2019-03-05 20:47:19 +03:00
Capostrophic
59f7df187d
Add explicit variant of Journal
2019-03-05 20:47:05 +03:00
Bret Curtis
cb29dc7b85
Merge pull request #2209 from akortunov/effectfix
...
[Regression] Fix magic glow update for sheathing weapons
2019-03-05 17:05:17 +01:00
Andrei Kortunov
bcf086d72d
Fix magic glow update for sheathing weapons
2019-03-05 11:51:56 +04:00
fredzio
93ffdc915d
SearchVisitor copy a new std::string everytime CellsStore::search is
...
called. Use a reference instead
2019-03-05 06:07:59 +01:00
elsid
84fbb486d3
Fix switch from invalid navmesh number to valid
2019-03-04 22:59:47 +03:00
elsid
80051db8f8
Update rotated objects in navigator
2019-03-04 22:59:39 +03:00
elsid
8c08c3c7d6
Update moved objects in navigator
2019-03-04 22:59:39 +03:00
elsid
27d7452267
Update scaled objects in navigator
2019-03-04 22:59:39 +03:00
elsid
2e063d59ce
Update scaled agent half extents in navigator (bug #4763 )
2019-03-04 22:59:39 +03:00
elsid
43b39e8418
Use not scaled player half extents as default to find path
2019-03-04 22:59:38 +03:00
elsid
1218e4e15d
Use player half extents only to find path in exterior cells
2019-03-04 22:59:20 +03:00
Vladimir Panteleev
12bbecacfd
Reuse a previously-saved value
2019-03-04 16:23:57 +00:00
Bret Curtis
14c93b3df0
Revert "Merge pull request #2204 from elsid/fix_navigator_update"
...
This reverts commit 26fb0e7a0f42b2391303
2019-03-04 11:06:15 +01:00
Bret Curtis
84ce9814fd
Merge pull request #2203 from elsid/update_recastnavigation
...
Update recastnavigation
2019-03-03 20:48:50 +01:00
elsid
b51a54e976
Update rotated objects in navigator
2019-03-03 16:46:41 +03:00
elsid
f394ace4d5
Update moved objects in navigator
2019-03-03 16:46:41 +03:00
elsid
133d7447f3
Update scaled objects in navigator
2019-03-03 16:46:41 +03:00
elsid
1f41d5721d
Update scaled agent half extents in navigator (bug #4763 )
2019-03-03 16:46:39 +03:00
elsid
c066ee9dc5
Use not scaled player half extents as default to find path
2019-03-03 16:21:12 +03:00
elsid
a4f300f810
Use player half extents only to find path in exterior cells
2019-03-03 16:21:09 +03:00
elsid
895899b25b
Fix tests
2019-03-03 13:46:24 +03:00
elsid
2b3bc4fe61
Add detailed output for osg::Vec3f in tests
2019-03-03 13:46:24 +03:00
Perry Hugh
37f5ab2104
Gamepad controls now sent to keyboard input, excluding joystick. Added right thumbstick button to toggle mouse emulation.
2019-03-03 09:21:00 +00:00
Bret Curtis
aa513bba29
Merge pull request #2202 from Capostrophic/icon
...
Fix enchanted item icon update
2019-03-03 01:03:28 +01:00
Perry Hugh
313611b79d
Analogue Joystick Movement
2019-03-02 23:46:48 +00:00
Capostrophic
2f38e4fbb3
Fix enchanted item icon update
2019-03-02 20:01:42 +03:00
Bret Curtis
79fca2e7c6
Merge pull request #2095 from akortunov/reflections
...
Add more settings to water reflections
2019-03-02 15:37:06 +01:00
Bret Curtis
f6127a30c0
Merge pull request #2199 from akortunov/guifixes
...
Use C++11-style loops in the GUI instead of iterators
2019-03-02 15:36:54 +01:00
Bret Curtis
e7bf89d3d5
Merge pull request #2200 from akortunov/warnfix
...
Replace boost GCD by the homebrew implementation
2019-03-02 15:36:25 +01:00
Perry Hugh
7b6f41c5c3
Correct gamepad default bindings to exactly match vanilla XBOX, create fair interplay between toggling main menu and options menu, allow toggling menus at any time.
2019-03-02 14:28:26 +00:00
Andrei Kortunov
bf5f68a4d8
Replace boost GCD to the homebrew implementation
2019-03-02 17:32:05 +04:00
Andrei Kortunov
9398117ea7
Allow to do not reflect terrain
2019-03-02 14:26:14 +04:00
Andrei Kortunov
00ab552184
Add more settings to water reflections in exteriors (feature #4859 )
2019-03-02 14:26:14 +04:00
Bret Curtis
cd70354f34
Merge pull request #2190 from akortunov/terrain
...
Make Distant Terrain configurable
2019-03-02 11:19:45 +01:00
Andrei Kortunov
8df8bd3f37
Use C++11-style loops in the GUI instead of iterators
2019-03-02 13:27:59 +04:00
Andrei Kortunov
56fea4b062
Add setting to control composite geometry size
2019-03-01 18:02:40 +04:00
bzzt
9d44e18af6
Allow to configure terrain vertex LOD
2019-03-01 18:02:38 +04:00
bzzt
fd94d7f7ff
Make Distant Terrain more configurable (feature #4890 )
2019-03-01 14:51:13 +04:00
Bret Curtis
cf20682d0c
Merge branch 'gamepad-sneak-shortcut' into 'master'
...
Gamepad - Toggle Sneak Shortcut
See merge request OpenMW/openmw!73
2019-02-28 20:11:51 +00:00
Grigory Latyshev
3872d7476b
Move makeOsgVec3f() to settingsutils.hpp
...
Remove all other makeOsgVec3f() implementations
2019-02-28 20:03:42 +00:00
Andrei Kortunov
a14c832f4f
Fix Boost version check in the launcher
2019-02-28 15:11:30 +04:00
David Cernat
12cef51122
Merge pull request #2192 from Capostrophic/bzzt
...
Port minor fixes from bzzt's branch
2019-02-28 12:55:58 +02:00
AnyOldName3
ac18983f37
Finish gldebug location move
2019-02-28 00:02:07 +00:00
AnyOldName3
3d917fcbad
Add basic OpenGL debug callback
2019-02-28 00:02:07 +00:00
Perry Hugh
3ac5481ab4
Enable toggling sneak via gamepad.
2019-02-27 14:03:16 -08:00
elsid
619a111a11
Run startup script once at engine start when game is running (bug #4877 )
2019-02-27 22:55:13 +03:00
Perry Hugh
c6fb94d6cb
xbox-bindings
2019-02-27 13:29:48 +00:00
bzzt
bcbee08a1b
Fix creature model instance preloading
2019-02-27 00:15:39 +03:00
bzzt
5ffb40e8ba
Don't preload terrain when loading an interior save
2019-02-27 00:02:57 +03:00
Bret Curtis
735bcf17c2
Merge branch 'boost-gcd-deprecation' into 'master'
...
Fix boost deprecation warning
See merge request OpenMW/openmw!66
2019-02-26 18:02:01 +00:00
AnyOldName3
cd4303da23
Add preprocessor check to determine which common_factor header to use.
2019-02-26 17:03:07 +00:00
elsid
33f6fb258d
Option to set specific random seed for random number generator
2019-02-26 09:36:34 +03:00
Bret Curtis
f6da025f02
Merge pull request #2188 from Capostrophic/memory
...
Always include <memory> for smart pointers in MWGui
2019-02-25 20:16:21 +01:00
Capostrophic
216e1ab16f
Always include <memory> for smart pointers in MWGui
2019-02-25 18:50:51 +03:00
Bret Curtis
dc1c2358b9
Merge pull request #2089 from akortunov/qthelp
...
Editor: Add basic info window
2019-02-25 16:40:11 +01:00
Bret Curtis
3316938dfc
Merge pull request #2182 from Capostrophic/format
...
Replace Boost format and replace_all where possible
2019-02-24 20:17:31 +01:00
Bret Curtis
56d5fc788c
Merge pull request #2163 from Capostrophic/hello
...
AI data handling minor revisions
2019-02-24 20:14:08 +01:00
Capostrophic
e70cc10305
Some more de-boosting
2019-02-24 03:20:20 +03:00
Capostrophic
8ecd0b82a4
Replace Boost format and replace_all where possible
2019-02-24 03:20:20 +03:00
Bret Curtis
d4564a9be7
Merge pull request #2180 from akortunov/includes
...
Remove redundant includes
2019-02-24 01:14:16 +01:00
Bret Curtis
44920352ce
Merge pull request #2181 from Capostrophic/boost
...
Get rid of Boost.Array
2019-02-23 23:54:30 +01:00
Capostrophic
594ea39f5d
Revise AI data handling
...
Make Hello 16-bit unsigned as it's intended to be
Get rid of redundant mHasAI boolean
Always save AI data subrecord
Adjust creature and NPC default rating values to Morrowind defaults
2019-02-23 21:00:47 +03:00
Bret Curtis
4a69d96483
Merge branch 'esm_name_template_fix' into 'master'
...
Make sure that proper operator function of ESM:FIXED_STRING is used for char[N] argument
See merge request OpenMW/openmw!63
2019-02-23 13:39:15 +00:00
Bret Curtis
8e3b10b5b4
Merge branch 'detour_navigator_unit_test_fix' into 'master'
...
Fix DetourNavigatorNavMeshTilesCacheTest on Windows
See merge request OpenMW/openmw!65
2019-02-23 07:59:03 +00:00
Bret Curtis
f8b34bf7f1
Merge branch 'preview_levelled_item' into 'master'
...
Fixes #4703 Disable preview for item leveled list
Closes #4703
See merge request OpenMW/openmw!57
2019-02-23 07:49:18 +00:00
Bret Curtis
df2de8a661
Merge pull request #2068 from Capostrophic/normalweapons
...
Make normal weapon resistance behavior closer to vanilla (bug #4384 )
2019-02-23 08:38:30 +01:00
Andrei Kortunov
f5eacfcf63
Support for temporary stunted magicka effects
2019-02-23 09:17:06 +04:00
Andrei Kortunov
fcdb0c16bf
Update jail state once instead of for every single hour
2019-02-23 09:17:06 +04:00
Andrei Kortunov
3032b177a1
Remove redundant includes
2019-02-23 08:02:12 +04:00
Capostrophic
58788de7c4
Get rid of Boost.Array
2019-02-22 23:16:34 +03:00
Capostrophic
4138e29ca4
Add option to restore the previous ammo behavior
2019-02-22 17:18:23 +03:00
Bret Curtis
ba491a8af0
Merge pull request #2069 from Capostrophic/skeleton
...
Use the skeleton from the NPC's set model (bug #4747 )
2019-02-22 15:12:24 +01:00
Bret Curtis
cc214cf6b0
Merge pull request #2082 from Capostrophic/teleporting
...
Make magic teleportation attempts detectable even when teleportation is disabled (bug #3765 )
2019-02-22 15:07:36 +01:00
Bret Curtis
c815a2cb42
Merge pull request #2107 from Capostrophic/idledialogue
...
Move idle dialogue playback from AiWander (bug #4594 )
2019-02-22 15:06:39 +01:00
Bret Curtis
4d09c8bb50
Merge pull request #2126 from Capostrophic/sneaking
...
Account for running/sneaking stances while in air (bug #4797 )
2019-02-22 15:04:55 +01:00
Bret Curtis
d2b93fc702
Merge pull request #2146 from Capostrophic/quest
...
Make quest status update handling closer to vanilla (bug #4815 )
2019-02-22 15:04:14 +01:00
Bret Curtis
942f7f776d
Merge pull request #2168 from Capostrophic/gamepad
...
Option to disable controller (feature #3980 )
2019-02-22 15:03:01 +01:00
Bret Curtis
212f097b3c
Merge pull request #2172 from akortunov/pvs_fix
...
Fix some issues, found by PVS-Studio
2019-02-22 15:01:37 +01:00
Bret Curtis
55fc04e462
Merge pull request #2175 from Capostrophic/includes
...
Include cleanup
2019-02-22 14:56:20 +01:00
Bret Curtis
09d57c5154
Merge pull request #2177 from akortunov/alpha
...
Handle initial actor's transparency
2019-02-22 14:55:59 +01:00
elsid
2342a31add
Add more tests for TileCachedRecastMeshManager
2019-02-22 11:49:02 +03:00
elsid
73734fc04d
Fix update navmesh for not changed objects
...
When update method is called for not changed object befor this change
all object tiles were considered as not object tiles and were removed.
Also this marked those tiles as changed. This lead to alternation
between remove and add each tile update method was called. Problem was
detected by using Animated Containers mod.
2019-02-22 11:48:31 +03:00
Capostrophic
b738cc0383
Make normal weapon resistance behavior closer to vanilla (bug #4384 )
...
Check both the ranged weapon and the projectile before modifying the damage
Don't attempt to apply NPC-specific werewolf damage mult to damage to creatures
2019-02-22 00:01:21 +03:00
Capostrophic
64d5cd17d6
Move werewolf silver damage mult applying into a new function
2019-02-22 00:01:21 +03:00
Capostrophic
808b8ce8db
Refactor normal weapon resistance
2019-02-22 00:01:21 +03:00
Capostrophic
7a7e390099
Make unsuccessful magic teleportation attempts detectable (bug #3765 )
2019-02-21 18:38:09 +03:00
Andrei Kortunov
629a6be477
Handle initial actor's transparency (bug #4860 )
2019-02-21 14:57:55 +04:00
Andrei Kortunov
097c649885
Use enumerable instead of magic number
2019-02-21 14:57:31 +04:00
Chris Djali
cb5a57e41b
Merge pull request #1547 from AnyOldName3/osgshadow-test-vdsm
...
Shadows
2019-02-20 15:35:49 +00:00
Bret Curtis
7566370981
Merge pull request #2160 from Capostrophic/topicindex
...
Fix hiding three-column (Cyrillic) topic index
2019-02-19 21:29:15 +01:00
Bret Curtis
bc71db947a
Merge pull request #2174 from Capostrophic/jumping
...
[0.45.0 regression] Correct jumping velocity
2019-02-19 21:28:53 +01:00
Capostrophic
c03ed4cd50
Include cleanup
2019-02-19 18:40:33 +03:00
Bret Curtis
fdb84dddc8
Merge pull request #2059 from Capostrophic/stacks
...
Don't stack scripted items (bug #2969 )
2019-02-18 16:02:55 +01:00
Bret Curtis
09262e0336
Merge pull request #2170 from elsid/disable_navigator_option
...
Add option to disable DetourNavigator component (feature #4833 )
2019-02-18 16:01:30 +01:00
Capostrophic
c20030d8c9
Correct jumping velocity
2019-02-18 16:22:01 +03:00
Andrei Kortunov
ff9afda18d
Avoid to keep reference to the local 'encoder' variable outside the Engine::go()
2019-02-17 14:29:39 +04:00
Andrei Kortunov
9de0c9045a
Fix API usage errors
2019-02-17 14:29:39 +04:00
Andrei Kortunov
229bd8505e
Init missing variables
2019-02-17 14:29:39 +04:00
Andrei Kortunov
dc6ef15571
Simplify loop in the addSkills()
2019-02-17 14:29:39 +04:00
Andrei Kortunov
80c62a4fe1
Fix endsWith() call
2019-02-17 14:29:39 +04:00
Andrei Kortunov
ad9412a117
Remove some redundant checks
2019-02-17 14:29:36 +04:00
Andrei Kortunov
18a59df050
Throw exceptions by value instead of reference
2019-02-17 10:24:25 +04:00
elsid
da6df818ff
Fix update navmesh
...
Every updated object should produce a set of changed tiles where it is
placed. Before this change only current object tiles were updated. If
object was moved to another set of tiles then navmesh were not changed
in new tiles.
TileCachedRecastMeshManager::updateObject should add all new tiles if object
was moved and remove all no more used tiles. Both new and old tiles should be
marked as changed.
Also add tests to show desired result for add, update, remove.
2019-02-17 01:50:53 +03:00
elsid
9626b6ec42
Add option to disable DetourNavigator component to find paths
2019-02-16 15:50:58 +03:00
elsid
16675fd254
Return empty path when navmesh is not found for agent
2019-02-16 15:37:06 +03:00
elsid
1d3668cd22
Add Navigator interface
2019-02-16 15:37:06 +03:00
elsid
c68e64a2a7
Make navigator from settings manager setting in separate function
2019-02-16 14:41:11 +03:00
Capostrophic
39dcbacf44
Option to disable controller (feature #3980 )
2019-02-15 18:40:22 +03:00
AnyOldName3
c68ccbc6b6
Use new common_factor header in the launcher, too
2019-02-13 18:37:01 +00:00
AnyOldName3
89d4d3be08
Fix boost deprecation warning
2019-02-13 14:49:36 +00:00
Azdul
2412017685
Fix DetourNavigatorNavMeshTilesCacheTest on Windows
2019-02-10 08:04:39 +01:00
Andrei Kortunov
b7adbe79b9
Allow localization to use implicit keywords (bug #4841 )
2019-02-09 14:06:05 +04:00
Capostrophic
e9c6c11418
Fix hiding three-tab (Cyrillic) topic index
2019-02-08 10:53:50 +03:00
Capostrophic
0535de6ca0
Make quest status update handling closer to vanilla (bug #4815 )
...
Don't update quest status if we're simply updating the quest index
Update quest status if a new entry is added regardless of its index
2019-02-08 10:25:31 +03:00
Bret Curtis
4a9abf1c1b
Merge pull request #2159 from Capostrophic/lighting
...
[0.45.0 regression] Fix upside-down night-time lighting
2019-02-07 11:27:22 +01:00
AnyOldName3
b1a5a72665
Restore previous night time directional light path
2019-02-07 00:27:26 +00:00
Capostrophic
796b87fde7
Fix upside-down night-time lighting
2019-02-06 23:53:13 +03:00
Bret Curtis
9e8bc29e3b
Merge pull request #2105 from Capostrophic/colorpicker
...
[0.45.0 regression] Editor: Fix color picker oddities
2019-02-06 10:07:21 +01:00
Capostrophic
e47f1ef3e3
Fix some color picker regressions
...
Don't assign invalid color returned when the color picker is closed by Cancel as the new color
Restore "picking finished" signal to make value saving work again
2019-02-05 18:02:47 +03:00
Bret Curtis
ffa3596fe4
Merge pull request #2152 from akortunov/headfix
...
[0.45 regression] Editor: hide hairs when helmet is used
2019-02-05 15:36:34 +01:00
Bret Curtis
d40f11bcb6
Merge pull request #2124 from Capostrophic/animation
...
[0.45.0 regressions] Revert poor animation decisions
2019-02-05 15:36:21 +01:00
Bret Curtis
a573efd30a
Merge pull request #2112 from Capostrophic/collision
...
[0.45.0 regression] Don't re-enable collision body for dead actors
2019-02-05 15:36:06 +01:00
Bret Curtis
a206f57f75
Merge pull request #2156 from Capostrophic/itemtaken
...
Fix redundant searchPtr call
2019-02-05 12:29:51 +01:00
Andrei Kortunov
6eb77e215b
Remove looping particles from dead actors
2019-02-05 11:02:25 +04:00
Capostrophic
650cd47255
Fix redundant searchPtr call
2019-02-05 01:04:54 +03:00
Capostrophic
a584aa25ab
Don't re-enable collision object for dead actors
2019-02-04 22:13:30 +03:00
Bret Curtis
bc1fbd5400
Merge pull request #2088 from akortunov/faction_table
...
Editor: Implement faction ranks table
2019-02-04 14:51:07 +01:00
Bret Curtis
f4313c02e1
Merge pull request #2153 from akortunov/glowing_windows
...
Native glowing windows support
2019-02-04 14:50:13 +01:00
Azdul
7940317e42
Make sure that proper operator function is used for char[N] argument
2019-02-03 09:32:32 +01:00
Andrei Kortunov
57d8df1a05
Do not check if additional animation sources are supported for every animation object
2019-02-03 11:27:48 +04:00
Andrei Kortunov
9e4a339ad3
Daytime node switch support (feature #4836 )
2019-02-02 10:50:15 +04:00
Bret Curtis
4f938492e5
Merge pull request #2150 from akortunov/vfx
...
Update magic effects VFX immediately after effects update
2019-01-30 10:25:41 +01:00
Andrei Kortunov
11c17ad9d5
Hide hairs when replace the Head bodypart by item's one in the editor
2019-01-30 10:18:48 +04:00
Andrei Kortunov
dc3a17f1f6
Update magic effects VFX immediately after effects update (bug #4828 )
2019-01-29 22:52:40 +04:00
Capostrophic
5c889f7359
Add creature-with-the-same-model soundgen fallback (bug #4813 )
...
Creatures will use sounds of the first creature that has the same model in the record store when possible.
2019-01-29 16:29:47 +03:00
Capostrophic
b33016d89f
Allow creatures to play Attack voiceover
2019-01-26 17:05:33 +03:00
Capostrophic
cec55119ca
Move idle dialogue playback from AiWander (bug #4594 )
2019-01-26 16:36:48 +03:00
Bret Curtis
f405b1e247
Merge pull request #2143 from akortunov/optimize
...
Optimize HUD update
2019-01-25 20:55:19 +01:00
Andrei Kortunov
8580a58ba0
Optimize HUD update (do not do unnecessary work)
2019-01-25 21:15:29 +04:00
Capostrophic
67450a7046
Don't apply effects when spell absorption is successful (bug #4820 )
2019-01-25 15:09:22 +03:00
AnyOldName3
8482236a82
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2019-01-24 23:09:23 +00:00
Capostrophic
6660f2f8e6
Use the skeleton from the NPC's set model (bug #4747 )
2019-01-25 01:02:27 +03:00
AnyOldName3
9d84853903
Fix nodemask snafu
2019-01-24 18:56:10 +00:00
Frederic Chardon
7ad93c1d3e
Gmst typo in MWMechanics::NpcStats::increaseSkill
2019-01-24 13:33:18 +00:00
Azdul
32013d35f2
Formatting of CMakeLists made consistent with other CMakeLists files.
2019-01-23 14:21:11 +01:00
Azdul
6d8215ecb6
Google Test / Google Mock / OpenMW unit tests on Windows
2019-01-23 14:21:03 +01:00
Capostrophic
f9a711d2fd
Revert poor animation decisions
...
Start force-updated in-air animation from loop start
Make movement animations have higher priority than jump animations
Make jumping animations have higher priority than turning animations
Don't reset idle during landing animation
Don't play default landing sound if the character is not on ground
2019-01-22 23:21:33 +03:00
Stomy
71be4cdd20
Ensure Unique Instance Refnum after clone, add, or move
2019-01-21 19:30:11 +00:00
Bret Curtis
c5a67c2079
Merge pull request #2137 from elsid/navmesh_render
...
Avoid useless read of navmeshes from navigator
2019-01-20 20:32:24 +01:00
elsid
13e94ab194
Get navmesh to update osg node only if rendering is enabled
2019-01-20 21:09:06 +03:00
elsid
3572edab72
Update navmesh in a separate method
2019-01-20 19:28:23 +03:00
Andrei Kortunov
1e8b7f0f83
Fix -Wstring-plus-int warnings
2019-01-20 15:46:19 +04:00
Justin Ivany
33c7e4e948
Don't remove whitespace...
2019-01-17 20:17:18 -04:00
Justin Ivany
8d036a79eb
Fixes #4703 Disable preview for item levelled list
2019-01-17 19:11:38 -04:00
Artur Rojek
f6e1aaae1a
Use case-insensitive compare when searching for game data by the wizard.
...
Until now, the wizard was only comparing against an exact file name
match while searching for game data, eg. "data*.cab".
This patch makes it possible to locate game data regardless of case
sensitivity, eg. "Data*.cab".
2019-01-15 13:36:24 +01:00
Capostrophic
05d5d7d57b
Account for stances when the player is in air (bug #4797 )
...
Make GetPCRunning and GetPCSneaking return 1 if the player is in air while the stance is toggled
Make sneaking skill usage possible if sneaking stance is toggled while in air
2019-01-15 00:25:26 +03:00
Capostrophic
8bb270c2bb
Update moved object collisions even if the cell is the same (bug #4800 )
2019-01-14 00:56:43 +03:00
Bret Curtis
8834ee95be
Merge pull request #2120 from Capostrophic/macros
...
Get rid of some remaining instances of C numeric limits
2019-01-10 18:59:34 +01:00
Bret Curtis
db74eb4466
Merge pull request #2094 from Capostrophic/editor
...
Cherry-pick cc9cii's minor editor improvements
2019-01-10 17:55:59 +01:00
Bret Curtis
9c795195d0
Merge pull request #2109 from Capostrophic/loops
...
Simplify some world loops
2019-01-10 11:44:41 +01:00
Bret Curtis
4617dea154
Merge pull request #2119 from akortunov/stringstream
...
Get rid of unnecessary string streams
2019-01-10 11:42:27 +01:00
Capostrophic
a71cfca580
Get rid of some remaining instances of C limit macros
2019-01-09 16:06:18 +03:00
Andrei Kortunov
3e20f36953
Handle invalid string length for hinting
2019-01-08 12:37:41 +04:00
Capostrophic
776c6c2fe6
Fix MSVC warning
2019-01-07 20:38:33 +03:00
Andrei Kortunov
0937f02598
Get rid of unnecessary string streams
2019-01-07 21:08:16 +04:00
Andrei Kortunov
b17702bf1f
Do not restore birthsign abilities upon game load (bug #4329 )
2019-01-07 20:18:21 +04:00
Bret Curtis
de24682e2f
Merge pull request #2115 from Capostrophic/slowfall
...
Don't reset player jumping flag unnecessarily (bug #4775 )
2019-01-07 17:13:39 +01:00
Capostrophic
a1af1ff487
Fix extra semicolon, redundant getStore calls and random creature spawn loop
2019-01-07 17:48:41 +03:00
Bret Curtis
9d1c0d2b22
Merge pull request #2114 from Capostrophic/cleanup
...
Remove some redundant code
2019-01-07 14:59:39 +01:00
Capostrophic
403db9afe3
Don't reset player jumping flag unnecessarily (bug #4775 )
2019-01-07 16:08:26 +03:00
Bret Curtis
573af17cf9
Merge pull request #2097 from akortunov/camerafix
...
Do not scale player's model in the 1st-person view depending on race
2019-01-07 13:57:21 +01:00
Bret Curtis
93e566a08e
Merge pull request #2117 from Capostrophic/aidata
...
Make Interiors of Illusion puzzle of Sotha Sil Expanded work (bug #4778 )
2019-01-07 13:56:11 +01:00
Andrei Kortunov
ab0841cc3d
Split physics update from world update in the profiler
2019-01-07 14:44:43 +04:00
Andrei Kortunov
02a43d0b32
Do not scale player's model in the 1st-person view depending on race (bug #4383 )
2019-01-07 12:58:47 +04:00
Capostrophic
92d7f21926
Don't interrupt compilation when spell/effect functions are used for non-actors
2019-01-06 21:45:56 +03:00
Capostrophic
624db99bf2
Remove some redundant code
2019-01-05 01:25:52 +03:00
Capostrophic
27eb64c7f0
Clean up fallback record creation again
2019-01-02 13:49:04 +03:00
Capostrophic
0ab5314755
Make scripted items not stack (bug #2969 )
2018-12-30 18:18:33 +03:00
Capostrophic
8a266803eb
Simplify some world loops
2018-12-30 15:36:42 +03:00
Bret Curtis
932691d199
Merge pull request #2091 from Capostrophic/fallheight
...
Avoid falling height reset if on-ground state wasn't actually updated (bug #4411 )
2018-12-29 08:26:28 +01:00
Bret Curtis
d80d056140
Merge pull request #2098 from xyzz/fix-loading-screen-uaf
...
loadingscreen: Fix UaF in loading screen.
2018-12-28 18:58:04 +01:00
Bret Curtis
91b962c095
Merge pull request #2099 from xyzz/replace-volatile-atomic
...
Replace volatile bools with std::atomic<bool>
2018-12-28 16:41:07 +01:00
Capostrophic
7155e787b4
Clean up fallback record creation
2018-12-28 01:22:24 +03:00
Ilya Zhuravlev
1bdec2399f
Make sure CopyFramebufferToTextureCallback is only called once and not every frame
2018-12-25 11:56:24 -05:00
Ilya Zhuravlev
07e9ce84b3
Replace volatile bools with std::atomic<bool>
2018-12-24 14:19:35 -05:00
Ilya Zhuravlev
8e7c01b561
loadingscreen: Fix UaF in loading screen.
...
When the CopyFramebufferToTextureCallback callback is called, in its operator() it resets setInitialDrawCallback by providing a NULL pointer.
However, this causes the callback to get deleted. In turn, the "this" pointer is invalidated.
When execution returns to DrawCallback::run, it accesses a _nestedCallback member of deleted "this" which is UB.
2018-12-24 14:18:26 -05:00
Ilya Zhuravlev
98b2c04404
android: Add a method so that we can send relative mouse movements from java.
2018-12-23 15:14:29 -05:00
Capostrophic
793c2a19d2
Cherry-pick cc9cii's editor improvements
2018-12-23 20:10:16 +03:00
Capostrophic
0bbcc0e787
Avoid falling height reset if onGround state didn't change (bug #4411 )
2018-12-23 13:39:35 +03:00
Ilya Zhuravlev
09585b7208
android_main.c: Replace nullptr back to NULL since there are no nullptr in C
2018-12-22 22:21:26 -05:00
Andrei Kortunov
8687a49c19
Editor: Added basic info window
2018-12-21 18:51:02 +04:00
Andrei Kortunov
b4f3ce2a0a
Editor: Implement faction ranks table (feature #4209 )
2018-12-21 14:16:40 +04:00
Capostrophic
2681435857
Editor: handle AI settings, regional sound and levelled list "none" chances as shorts (bug #2987 )
2018-12-20 19:51:55 +03:00
AnyOldName3
e2515f6db7
Merge branch 'master' into osgshadow-test-vdsm
2018-12-18 19:51:27 +00:00
Bret Curtis
6d7aacab5e
Merge pull request #2053 from akortunov/animatedContainers
...
Native animated containers support
2018-12-17 10:00:07 +01:00
Bret Curtis
d2c88f0983
Merge pull request #2071 from Capostrophic/sneaking
...
Don't interrupt sneak and swim idles in attack ready state in first person view (bug #4750 )
2018-12-17 09:34:27 +01:00
Andrei Kortunov
a53333c3d5
Native animated containers support (feature #4730 )
2018-12-13 23:11:16 +04:00
terrabyte25
c31fa3074e
Sanity check for text input in toggleWalking
2018-12-12 14:40:15 -06:00
Capostrophic
6083e5ed4b
Don't interrupt sneak and swim idles in first person view (bug #4750 )
2018-12-10 00:05:06 +03:00
Marc Zinnschlag
d791dcfbf3
Merged pull request #2051
2018-12-06 13:10:48 +01:00
Bret Curtis
32624cb3ed
Merge branch 'master' into colors
2018-12-06 09:59:13 +01:00
Bret Curtis
b296c4a3bb
Merge pull request #2058 from Capostrophic/collision
...
Don't consider non-solid actors truly levitating (bug #4746 )
2018-12-06 09:56:16 +01:00
Capostrophic
7b33838b33
Don't consider non-solid actors truly levitating (bug #4746 )
2018-12-05 23:37:32 +03:00
Bret Curtis
35ea8ecb0b
Merge pull request #2056 from Capostrophic/esmtool
...
esmtool cleanup
2018-12-05 20:58:25 +01:00
Capostrophic
7cae0017ac
Display Ambient, Sunlight and Fog field values as colors (bug #4745 )
2018-12-05 17:25:26 +03:00
Capostrophic
5c8c079718
Fix incorrect event argument which messed with hidden light pointers
2018-12-04 17:07:03 +03:00
Capostrophic
832870dc79
esmtool cleanup
2018-12-02 23:10:29 +03:00
Bret Curtis
c2c86fc4a5
Merge pull request #2052 from mp3butcher/master
...
fix moc achieving to reach unparsable boost code
2018-12-02 19:28:35 +01:00
Bret Curtis
807cab568e
Merge pull request #2050 from Capostrophic/markers
...
[Regression] Revert unnecessary case changes for fallback records
2018-12-02 11:16:20 +01:00
Bret Curtis
b1ca6c6e95
Merge pull request #2045 from akortunov/animfix
...
[Testing needed] Fix regressions in the animation system
2018-12-02 11:14:44 +01:00
mp3butcher
9de6c630f2
fix moc achieving to reach unparsable boost code
2018-12-01 21:27:43 +01:00
Capostrophic
7b5932a49d
Add Invert X Axis option (feature #3610 )
2018-12-01 19:08:02 +03:00
Capostrophic
c59513c30c
Revert unnecessary case changes for fallback records
2018-12-01 17:12:27 +03:00
AnyOldName3
642002b302
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-29 01:19:01 +00:00
Andrei Kortunov
880ec3ce7b
Fix visible sheaths for invisible actors
2018-11-24 14:57:41 +04:00
Andrei Kortunov
671f2811d5
Fix regressions in the animation system (bug #4729 )
2018-11-23 20:22:37 +04:00
Andrei Kortunov
e8b3ae8706
Improve ResetActors command (bug #4723 )
2018-11-20 21:53:27 +04:00
Andrei Kortunov
7438e20ee1
Fix shield displaying on inventory avatar (bug #4720 )
2018-11-17 22:42:29 +04:00
Andrei Kortunov
68c170f065
Refactor tools to do not use boost exceptions and exit() command
2018-11-15 18:10:19 +04:00
Andrei Kortunov
059a8fd32a
Refactor dynamic casts in the editor
2018-11-15 17:50:23 +04:00
Bret Curtis
a21792657a
Merge pull request #2034 from akortunov/guifixes
...
Improve GUI cleanup
2018-11-15 07:31:57 +01:00
Andrei Kortunov
5ac81cfbff
Throw exceptions with some info int the editor if dynamic_cast failed
2018-11-14 15:53:43 +04:00
Andrei Kortunov
f20d1b1b72
Catch exception in the NIFTest
2018-11-14 15:52:36 +04:00
Bret Curtis
419e7ea5a2
Merge pull request #2035 from akortunov/coverity
...
Fix many Coverity Scan warnings
2018-11-14 09:44:30 +01:00
Bret Curtis
8a66dec865
Merge pull request #2031 from akortunov/warnfix
...
Fix some Clang 7 warnings
2018-11-14 09:43:39 +01:00
Andrei Kortunov
4ee15ddcb9
Fix many Coverity Scan warnings
2018-11-14 11:21:49 +04:00
Andrei Kortunov
5e071e3eb0
Add a missing check if mPtr is empty (bug #4715 )
2018-11-13 10:32:23 +04:00
Andrei Kortunov
71f1a53090
Improve tooltips cleanup (bug #4714 )
2018-11-13 10:00:12 +04:00
Bret Curtis
194232abde
Merge pull request #2029 from akortunov/actorfix
...
[Regression] Handle case in the editor when actor's bodypart was not found
2018-11-12 11:44:28 +01:00
Bret Curtis
0f29a73fc9
Merge pull request #2025 from Capostrophic/actorloops
...
Use C++11 for close actor-iterating loops and avoid some redundant operations
2018-11-12 10:43:49 +01:00
Andrei Kortunov
d2613e35a2
Fix some Clang 7 warnings
2018-11-09 19:42:59 +04:00
Andrei Kortunov
0065bccf24
Handle case in the editor when actor's bodypart was not found
2018-11-09 14:51:45 +04:00
AnyOldName3
02a8c6a7ce
Merge branch 'master' into pr/fix-hidpi-resolution
2018-11-08 23:05:07 +00:00
Bret Curtis
228f6b572f
Merge branch 'master' into prisonmarker
2018-11-08 21:11:24 +01:00
Bret Curtis
f6243fae83
Merge pull request #1615 from akortunov/holstered_weapons
...
Weapon sheathing
2018-11-08 20:44:20 +01:00
Capostrophic
6d48d9329e
Avoid making string copies instead of references
2018-11-08 17:03:29 +03:00
Bret Curtis
3751bc2c11
Merge pull request #2030 from akortunov/warnfix
...
Fix some compiler warnings
2018-11-08 12:19:04 +01:00
Andrei Kortunov
ad36834671
Fix some compiler warnings
2018-11-08 13:16:04 +04:00
Stanislaw Halik
8fd71fe4ad
fix rain delay when exiting water
...
When the particle system updates its internal state noting that it's
been culled, it stops emitting any further particles. Prevent it from
having that knowledge.
v2: Fix off-by-one-frame error following review by @AnyOldName3
2018-11-07 20:55:45 +00:00
Capostrophic
4cb4f82431
Don't use bitwise AND
2018-11-07 19:44:17 +03:00
Capostrophic
39f8637e95
Simplify some actor loops and avoid some redundant calculations
2018-11-06 17:56:53 +03:00
Capostrophic
4efe1bc892
Add prison marker record fallback definition (bug #4701 )
2018-11-05 19:37:46 +03:00
Stanislaw Halik
5e3e01cac0
fix resolution on HiDPI displays under Windows
...
The same Windows functionality as scaling user interface elements,
confuses fullscreen games unless they set a particular of metadata to
indicate that they perform the scaling by themselves.
What happened was treating 2160p as 1440p despite the former being
chosen. The same occured with other game title prior to introducing the
metadata bits.
Fortunately with CMake there's no need to invoke the mt.exe "manifest
tool" manually.
Note that the setting of "per-monitor DPI aware" still leaves openmw
confused, hence the choice of global-DPI-aware.
2018-11-05 16:16:09 +00:00
Andrei Kortunov
92e45507d8
Weapon sheathing support, including quivers and scabbards (feature #4673 )
2018-11-05 11:18:20 +04:00
Bret Curtis
c114e1278e
Merge pull request #1978 from akortunov/ffmpeg3
...
Migrate to FFMPEG3
2018-11-05 07:52:43 +01:00
Bret Curtis
a8d944e756
Merge pull request #2023 from elsid/navmesh_cache_limit
...
Navmesh cache limit
2018-11-05 07:51:48 +01:00
elsid
6e78fbb538
Double key size for item cache size
2018-11-05 02:21:19 +03:00
elsid
db5638bf6d
Add global recast allocator to allocate temp buffers on stack
2018-11-04 18:11:15 +03:00
Andrei Kortunov
f88d5e808c
Rewrite media decoder to use FFMpeg 3.2+ API (task #4686 )
2018-11-03 22:34:25 +04:00
elsid
2ba026e2b2
Limit navmesh cache size by data size + key size
2018-11-03 16:14:07 +03:00
Andrei Kortunov
829faf7b2c
Improve toggleactorspaths console command
2018-11-03 10:42:14 +04:00
AnyOldName3
b178e1868a
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-03 00:27:40 +00:00
AnyOldName3
3c25e7b93d
Merge pull request #2010 from AnyOldName3/windows-debug-build-fix
...
Include missing Windows header before calling Windows-specific functions and switch CMake compile definitions to the new style.
2018-11-02 23:57:44 +00:00
AnyOldName3
e2ddb39591
Remove incorrect comment
2018-11-02 17:30:54 +00:00
Capostrophic
1de9674c81
AI package cleanup
2018-11-02 14:58:30 +03:00
Bret Curtis
5f5773f7df
Merge pull request #2009 from elsid/pathfinder_update_tolerance
...
Use default tolerance to drop last point from path
2018-11-02 00:21:08 +01:00
elsid
c52db75545
Use default tolerance to drop last point from path
...
Fixes AiEscort. Before actor tried to reach target with 0 tolerance.
Back to logic like it was before 4fe764c3a5bbd82a743
2018-11-02 01:12:41 +03:00
Capostrophic
a4eff1c871
Fix isWithinMaxRange function
2018-11-02 00:22:37 +03:00
AnyOldName3
d0c254bc7e
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-01 16:48:21 +00:00
elsid
792a0585c0
Add recastnavigation as subdirectory
2018-11-01 17:01:22 +01:00
AnyOldName3
0208cb8616
Merge pull request #2001 from AnyOldName3/enable-osg-logging
...
Allow OSG objects to be sent to the debug log.
2018-10-31 22:14:36 +00:00
AnyOldName3
6bbc1cb308
Remove outdated include
2018-10-31 19:32:52 +00:00
AnyOldName3
93843d024c
Remove another duplicate operator<<
2018-10-31 16:26:53 +00:00
Andrei Kortunov
f1eb702851
Mark virtual methods in the mechanicsmanagerimp.hpp as overrides
2018-10-31 10:09:32 +04:00
AnyOldName3
3785ba6aa0
Merge upstream/master
2018-10-30 22:38:09 +00:00
AnyOldName3
eb44de3e6b
Disable shadows properly for water reflection/refraction RTT targets, eliminating remaining OpenGL errors.
2018-10-30 22:34:53 +00:00
Bret Curtis
d6c674660a
Merge pull request #1633 from elsid/pathfinder_detour
...
Use recastnavigation for pathfinding (#2229 )
2018-10-30 20:44:13 +01:00
Bret Curtis
3c53fe16e9
Merge pull request #1986 from akortunov/rootfix
...
[Regression] Handle RootCollisionNode exactly as in original engine
2018-10-29 22:47:04 +01:00
Bret Curtis
e65f254f7f
Merge pull request #1999 from akortunov/resurrect
...
[Regression] Make sure we reset current weapon animation when resurrect actor
2018-10-29 20:43:54 +01:00
Andrei Kortunov
f98fc8d7b4
Make sure we reset current weapon animation when resurrect actor (addition to bug #2626 )
2018-10-29 22:47:04 +04:00
Marc Zinnschlag
a5efe0d596
Merged pull request #1998
2018-10-29 10:02:52 +01:00
Capostrophic
434b1fd0e3
Use Shift-C and Shift-V keybindings for View and Preview (feature #2845 )
2018-10-29 01:53:49 +03:00
Bret Curtis
7f2baa9373
Merge pull request #1995 from Capostrophic/icons
...
Add icons for record context menu actions (feature #4506 )
2018-10-28 22:22:42 +01:00
Bret Curtis
6f8a15afb0
Merge pull request #1996 from Capostrophic/cleanup
...
Clean up redundant getClass() calls in classes
2018-10-28 19:39:39 +01:00
Capostrophic
8757b3edd1
Add icons for Edit and Touch actions (kudos to akortunov)
2018-10-28 21:06:42 +03:00
Capostrophic
89b8eb029f
Add icons for record context menu actions
2018-10-28 20:35:58 +03:00
Capostrophic
77b0ff7a75
Use real thrown weapon damage in tooltips and weapon rating (feature #4697 )
2018-10-28 19:46:46 +03:00
elsid
49d81241db
Merge branch 'master' into pathfinder_detour
2018-10-28 17:08:09 +03:00
Capostrophic
4b1d287eda
Clean up redundant getClass calls in classes
2018-10-28 17:03:38 +03:00
elsid
50b6ae3e10
Fix calculation for shape local AABB
2018-10-28 16:58:22 +03:00
Bret Curtis
e7892361f6
Merge pull request #1994 from akortunov/actor_culling
...
Minor tweaks for actors processing range setting
2018-10-28 14:44:12 +01:00
Bret Curtis
3cd59d4a89
Merge pull request #1993 from akortunov/loadingbar
...
Center progress bar when there are active messageboxes
2018-10-28 14:43:33 +01:00
elsid
abc51a8a17
Add settings option to set max number of polygons per navmesh tile
2018-10-28 15:36:47 +03:00
Andrei Kortunov
06d226a1b7
Minor tweaks for actors processing range setting
2018-10-28 15:08:24 +04:00
Andrei Kortunov
6e05853478
Center progress bar when there are active messageboxes (bug #4691 )
2018-10-28 14:40:48 +04:00
Marc Zinnschlag
9dd0d641bc
Merged pull request #1931
2018-10-28 11:02:33 +01:00
Bret Curtis
9f4892ce92
Merge pull request #1990 from Capostrophic/absorption
...
Avoid making expensive visitEffectSources calls if no spell absorption effect is active
2018-10-27 17:45:48 +02:00
Capostrophic
abdf40e0d5
Avoid making expensive visitEffectSources calls if no spell absorption effect is active
2018-10-27 16:38:04 +03:00
Capostrophic
b6f23cd366
Make constants usage more obvious
2018-10-27 13:27:25 +03:00
Capostrophic
4873d33642
Adjust magic light source linear attenuation (bug #3890 )
2018-10-27 01:27:05 +03:00
Andrei Kortunov
d2f3196ee8
Fix testcase for RootCollisionNode with MRK data
2018-10-26 21:21:34 +04:00
Marc Zinnschlag
3ead33814f
Merge remote-tracking branch 'upstream/master'
2018-10-26 13:02:06 +02:00
Capostrophic
19ce1abcdf
Fix selected weapon HUD durability percentage
2018-10-26 12:53:15 +03:00
Andrei Kortunov
bf9e8c4556
Make spell absorption multiplicative (bug #4684 )
2018-10-26 12:36:58 +04:00
Andrei Kortunov
e7de6b974a
Optimize actors processing
...
1. Do not update physics and animations for actors outside processing range (bug #4647 )
2. Do not render such actors
3. Add transparency to actors near processing border, so they will not pop up suddenly
2018-10-25 22:52:59 +04:00
Bret Curtis
0fad2449f3
Merge pull request #1982 from Capostrophic/condition
...
Avoid item condition and charge zero divisions
2018-10-25 17:22:02 +02:00
Capostrophic
c3e8d536cd
Implement getNormalizedEnchantmentCharge() method and use it
2018-10-25 16:16:07 +03:00
Capostrophic
54bd7b2dcf
Implement getItemNormalizedHealth() method and use it
2018-10-25 15:45:31 +03:00
Marc Zinnschlag
2c8bbde7ef
Merged pull request #1979
2018-10-25 11:16:26 +02:00
Marc Zinnschlag
4d88d6dd58
Merged pull request #1980
2018-10-25 11:06:22 +02:00
Bret Curtis
375354ab6b
Merge pull request #1974 from akortunov/coverity
...
Fix some issues found by Coverity Scan
2018-10-25 09:42:51 +02:00
AnyOldName3
1e2bf9c447
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-10-24 20:13:13 +01:00
Capostrophic
67de61e1fb
Avoid item condition and charge zero divisions
2018-10-24 19:06:55 +03:00
Capostrophic
4ce35c6ad5
Fix fixme behavior in interiors
2018-10-24 01:43:38 +03:00
Andrei Kortunov
61e6e359c4
Allow creatures to use the autogenerated collision box (feature #2787 )
2018-10-22 15:48:23 +04:00
Capostrophic
9809eef18e
Utilize the default soundgen entries when necessary (bug #4689 )
2018-10-21 11:32:23 +03:00
Andrei Kortunov
41e90bd56c
Unify random generator usage
2018-10-19 16:16:18 +04:00
Andrei Kortunov
46bf45a6e2
Remove redundant code
2018-10-19 16:16:18 +04:00
Bret Curtis
6c4116cc8b
Merge pull request #1972 from akortunov/equipfix
...
Force actor to the 'weapon equipped' state if the weapon disappeared in the middle of attack
2018-10-18 16:43:05 +02:00
Andrei Kortunov
8fa0ffcfe4
Catch exceptions inside the loadVoice() (bug #4685 )
2018-10-18 15:02:23 +04:00
Andrei Kortunov
d7d9050d4a
Force actor to the 'weapon equipped' state if the weapon disappeared in the middle of attack (bug #4646 )
2018-10-18 11:42:03 +04:00
AnyOldName3
474770eca8
Switch shadow map rendering to a specialised, simplified shader.
2018-10-16 21:23:31 +01:00
Bret Curtis
e406c5ff81
Merge pull request #1946 from akortunov/backupfix
...
Combat AI: check for obstacle before back up
2018-10-16 21:47:21 +02:00
Andrei Kortunov
13bd81f896
Try to use collisions from basic actor model if an animated one has no collisions (feature #4682 )
2018-10-16 22:28:19 +04:00
elsid
03d4ce5e49
Log find path exception with level verbose, add more info to message
2018-10-15 23:25:42 +03:00
Bret Curtis
8cb407cfdf
Merge pull request #1969 from Capostrophic/soundgen
...
Support soundgen calls for activators (feature #4285 )
2018-10-15 14:43:11 +02:00
Capostrophic
bf3f82b9d4
Cleanup
2018-10-14 21:28:43 +03:00
Capostrophic
6ef7be3fd3
Re-enable using soundgen land for creatures
2018-10-14 20:18:17 +03:00
Capostrophic
19fd404b7b
Support soundgen calls for activators (feature #4285 )
2018-10-14 15:36:07 +03:00
Andrei Kortunov
ca07e3a364
Check for obstacle before back up (bug #4656 )
2018-10-14 12:22:43 +04:00
elsid
e57504ae7c
Lower log level
2018-10-13 22:22:15 +03:00
elsid
ed73d130f9
Cache navmesh tiles
...
Use LRU modification to hold currently used items. Use RecastMesh binary
data for item key.
Store original pointer of btCollisionShape in user pointer to make available
it as an identifier within all duplicates. Use pointer to heights data array
for btHeightfieldTerrainShape.
2018-10-13 22:22:12 +03:00
elsid
1a27489904
Add special type for object id
2018-10-13 22:16:35 +03:00
elsid
7c80bb9411
Support multiple threads for async nav mesh updater
2018-10-13 22:16:34 +03:00
elsid
7c5bedc35a
Reset shorcutting if actor can't move by z-axis on reaction time
...
If actor was shortcutting because it was swimming, then when it started
walking it still be shortcutting, but there will be no new path, because
shortcut path builds only for actor able moving by z-axis and pathfinder
path only for not shortcutting actor.
2018-10-13 22:16:34 +03:00
elsid
92b34e8bb4
Check whether can actor move along z-axis in separate function
2018-10-13 22:16:34 +03:00
elsid
bbd82a743a
Use different tolerance for path point and destination
2018-10-13 22:16:34 +03:00
elsid
ab090108cb
Assign world to local variable once per function
2018-10-13 22:16:34 +03:00
elsid
27a74725f1
Use osg::Vec3f
2018-10-13 22:16:34 +03:00
elsid
ff478aba6d
Use actor half extent for interior cells
2018-10-13 22:16:33 +03:00
elsid
346e9e3141
Add off mesh connections for doors without teleport
2018-10-13 22:16:33 +03:00
elsid
f8dbd5902f
Update doors objects in navigator
2018-10-13 22:16:33 +03:00
elsid
661da42bd2
Build path by navigator
2018-10-13 22:16:33 +03:00
elsid
d02beae5a8
Find path for actors according to their abilities to swim and walk
2018-10-13 22:16:33 +03:00
elsid
dc09674362
Add command and settings option to enable actors paths render
2018-10-13 22:16:32 +03:00
elsid
c95cea414c
Support water for NavMesh
2018-10-13 22:16:32 +03:00
elsid
72f211ef28
Add enums for area type and flags
2018-10-13 22:16:32 +03:00
elsid
fa23b590a4
Add unwalkable areas to NavMesh
2018-10-13 22:16:32 +03:00
elsid
f6a60790f8
Create collision shape for all avoided nodes
2018-10-13 22:16:31 +03:00
elsid
c3298d13a6
Add log sinks (stdout and file)
2018-10-13 22:16:31 +03:00
elsid
144e1a063b
Support animated objects
2018-10-13 22:16:30 +03:00
elsid
4aba0fa85f
Limit number of NavMesh tiles to add by distance from player tile
2018-10-13 22:16:30 +03:00
elsid
d2fd9abd51
Split RecastMesh into tiles
2018-10-13 22:16:30 +03:00
elsid
dbb1d99bff
Add NavMeshItem generation to fix update NavMesh for render
2018-10-13 22:16:30 +03:00
elsid
6f3028b8f9
Update navigator when unload cell or add/remove object to scene
2018-10-13 22:16:29 +03:00
elsid
937e8e1803
Allow to create empty RecastMesh
2018-10-13 22:16:29 +03:00
elsid
faaf50446d
Option to initially enable NavMesh render
2018-10-13 22:16:28 +03:00
elsid
02ce4a7e50
Log to detournavigator log cell load and unload
2018-10-13 22:16:28 +03:00
elsid
ed3a255f65
Do not use NavMesh to find changed tiles
2018-10-13 22:16:28 +03:00
elsid
d1e71f9322
Support btBoxShape for RecastMesh
2018-10-13 22:16:28 +03:00
elsid
70a369f70e
Add command to enable NavMesh render
...
togglenavmesh or tnm
2018-10-13 22:16:28 +03:00
elsid
dd5e6a61a3
Support btCompoundShape for RecastMesh
2018-10-13 22:16:27 +03:00
elsid
373adc6ec4
Option to enable/disable file names revisions
2018-10-13 22:16:27 +03:00
elsid
d1d034a1ec
Update NavMesh one by one tile in order from nearest to player
2018-10-13 22:16:26 +03:00
elsid
41caca24ee
Options to enable/disable write recast mesh and nav mesh into file
2018-10-13 22:16:26 +03:00
elsid
6d233ae868
Option in settings to enable/disable detour navigator debug log
2018-10-13 22:16:26 +03:00
elsid
0c8db84962
Load cells in order from nearest to player to furthest
2018-10-13 22:16:26 +03:00
elsid
0c8a7295e6
Use only player's half extents
2018-10-13 22:16:25 +03:00
elsid
fafba8ea0c
Use recastnavigation to find path
2018-10-13 22:16:25 +03:00
elsid
3d97e96f55
Add dependency to recastnavigation
2018-10-13 22:16:25 +03:00
elsid
e707202f88
Use local constant
2018-10-13 22:16:24 +03:00
elsid
ed89126828
Fix warning implicit conversion changes singedness
2018-10-13 22:16:24 +03:00
elsid
c866fdff86
Move physics object, heightfield, ptrholder into separate files
2018-10-13 22:16:24 +03:00
elsid
4fe764c3a5
Update and check for complete Pathfinder path by different methods
2018-10-13 22:16:24 +03:00
elsid
b6dd2119a6
Make Pathfinder constructor inline
2018-10-13 22:16:24 +03:00
elsid
92f52287bf
Make PathFinder::ClearPath inline
2018-10-13 22:16:24 +03:00
elsid
3655f19373
Set PathFinder::mCell to nullptr when clear path
2018-10-13 22:16:23 +03:00
elsid
85bbf9d034
Clear path without check for empty
2018-10-13 22:16:23 +03:00
elsid
ca3d0594b3
Do not store pointer to Pathgrid in PathFinder
2018-10-13 22:16:23 +03:00
elsid
3565d92e11
Make PathFinder::getPathCell inline
2018-10-13 22:16:23 +03:00
elsid
2ad3543088
Fix constant style
2018-10-13 22:16:23 +03:00
elsid
f9c651bdf3
Add const
2018-10-13 22:16:23 +03:00
elsid
2c464bd682
Evade obstacles after set rotation
2018-10-13 22:16:22 +03:00
elsid
eb10add0c4
Remove unused parameters
2018-10-13 22:16:22 +03:00
elsid
66e5a4d591
Remove useless variable
2018-10-13 22:16:22 +03:00
elsid
1a95b7a154
Remove duplicate zTurn call
2018-10-13 22:16:22 +03:00
elsid
d0bc1b75e8
Remove unused parameters
2018-10-13 22:16:22 +03:00
elsid
63b3a70ca8
Remove useless else
2018-10-13 22:16:22 +03:00
elsid
c9f3064cbd
Update ObstacleCheck once per frame
2018-10-13 22:16:22 +03:00
elsid
ad027d13fa
Remove unused
2018-10-13 22:16:21 +03:00
elsid
6d89241178
Check is path completed by osg::Vec3f position
2018-10-13 22:16:21 +03:00
elsid
2c6daa74a9
Simplify PathFinder::checkPathCompleted
2018-10-13 22:16:21 +03:00
elsid
6411c1955d
Fix indent
2018-10-13 22:16:21 +03:00
elsid
d3667945c5
Remove unused functions
2018-10-13 22:16:21 +03:00
elsid
31340a212a
Fix functions name style
2018-10-13 22:16:21 +03:00
elsid
2f424f6be2
Store aStarSearch result to deque
2018-10-13 22:16:20 +03:00
elsid
9b3756f8bc
Store path points in deque
2018-10-13 22:16:20 +03:00
elsid
925d909fea
Use rbegin
2018-10-13 22:16:20 +03:00
elsid
fbaa525c6f
Fix warning
2018-10-13 22:16:20 +03:00
elsid
4d868bec92
Use osg::Vec3f to store path nodes in Pathfinder
2018-10-13 22:16:20 +03:00
elsid
33dfe284bd
Mark local variables const which one does not change
2018-10-13 22:16:20 +03:00
elsid
0cfdf0c7b6
Remove unused virtual
2018-10-13 22:16:20 +03:00
Marc Zinnschlag
b30e309532
Merged pull request #1967
2018-10-13 11:15:45 +02:00
Andrei Kortunov
dad0b78901
Avoid overflow when handling output characters (bug #4676 )
2018-10-12 20:41:03 +04:00
AnyOldName3
0124be5713
Merge upstream/master
2018-10-10 21:23:19 +01:00
Capostrophic
47b1b0ac39
Re-fix water reflections while making a no-GUI screenshot
2018-10-10 22:44:26 +03:00
Capostrophic
4ec727c50b
Disallow to open the journal while settings window is open (bug #4674 )
2018-10-10 18:33:56 +03:00
Marc Zinnschlag
2d87d1d9d2
Merged pull request #1959
2018-10-10 15:05:29 +02:00
Marc Zinnschlag
d466785aa7
Merged pull request #1958
2018-10-10 15:04:32 +02:00
Marc Zinnschlag
38a3632be7
Merged pull request #1960
2018-10-10 14:56:51 +02:00
Andrei Kortunov
5617bb3f0c
Improve pitch factor handling for crossbow animations (bug #4672 )
2018-10-09 11:35:28 +04:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
Capostrophic
09aecb955c
getSkill usage cleanup (bug #4671 )
2018-10-08 17:06:30 +03:00
Capostrophic
cae2e84ab4
Trace the player down after enabling collision with TCL (bug #4669 )
2018-10-08 16:15:15 +03:00
Capostrophic
768c532b8f
Editor: display light source color as a color (bug #4668 )
2018-10-07 19:43:51 +03:00
Marc Zinnschlag
71f80db886
Merged pull request #1954
2018-10-07 11:25:32 +02:00
Bret Curtis
585313a71f
Merge pull request #1953 from Capostrophic/animation
...
Fix first person swimming animations
2018-10-06 14:24:48 +02:00
Capostrophic
03788edd63
Fix redundant drag call in instance dragging (bug #4593 )
2018-10-05 18:48:17 +03:00
Capostrophic
34e45efac3
Fix first person swimming animations
2018-10-05 17:29:49 +03:00
Marc Zinnschlag
503352e840
Merged pull request #1951
2018-10-03 13:23:56 +02:00
Marc Zinnschlag
b410d87aae
Merged pull request #1952
2018-10-03 13:19:28 +02:00
Andrei Kortunov
07ccc5abdb
Remove non-looping effects after rest
2018-10-01 21:57:13 +04:00
Andrei Kortunov
3896a2eba6
Do not use a PartHolder for spell effect node
2018-10-01 20:18:20 +04:00
Andrei Kortunov
632045e145
Improve the 'part has no parents' warning
2018-10-01 20:18:19 +04:00
Andrei Kortunov
4dc424036f
Cleanup magic effects, when create a new ActorAnimation
2018-10-01 20:17:58 +04:00
Capostrophic
674e33170b
Fix quick key system regressions (bug #4662 )
2018-09-30 21:16:02 +03:00
Marc Zinnschlag
38758a9555
Merged pull request #1944
2018-09-29 11:16:14 +02:00
Andrei Kortunov
43c7438e8e
Move WeakCache to components/misc
2018-09-28 16:47:47 +04:00
Marc Zinnschlag
33044add97
Merged pull request #1938
2018-09-28 11:31:45 +02:00
Marc Zinnschlag
3dc15d39e3
Merged pull request #1936
2018-09-28 11:30:13 +02:00
Capostrophic
2e98cad895
Fade out sun glare and specularity completely at night start, not sunset start
2018-09-27 17:34:46 +03:00
Andrei Kortunov
35abf7367c
Implement wearing priority for editor
2018-09-27 18:22:17 +04:00
Andrei Kortunov
ac848b0902
Use male bodyparts as fallback for females in the editor
2018-09-27 13:14:59 +04:00
Kyle Cooley
0096951f25
cleanup
2018-09-27 13:14:59 +04:00
Kyle Cooley
676fc48855
Re-add logic for empty model
2018-09-27 13:14:59 +04:00
Kyle Cooley
f43b70d77b
Centralize actor data, simplify logic
2018-09-27 13:14:59 +04:00
Kyle Cooley
c1ec926f43
Workaround inconsistencies with record status changes
2018-09-27 13:14:59 +04:00
Kyle Cooley
1518d630ca
Fix issue with body part events not propogating to actors
2018-09-27 13:14:59 +04:00
Kyle Cooley
031502b2ab
Reorganize ActorAdapter data, use weak cache for sharing
2018-09-27 13:14:59 +04:00
Kyle Cooley
2a9ebac572
Simplify update logic, update when race parts are changed.
2018-09-27 13:14:59 +04:00
Kyle Cooley
1276e0fa9b
Handle changes to race record when rendering actors
2018-09-27 13:14:59 +04:00
Kyle Cooley
b2115b60e6
Fix qt4 build
2018-09-27 13:14:59 +04:00
Kyle Cooley
6bece13a32
Use new Log class for error message
2018-09-27 13:14:59 +04:00
Kyle Cooley
97ac0a92dd
Move data handling out of rendering code, equip armor/clothes
2018-09-27 13:14:59 +04:00
Kyle Cooley
6b42f37918
Handle creatures too
2018-09-27 13:14:59 +04:00
Kyle Cooley
e2ac392a40
Move common stuff to scene util, fix errors with 1st person meshes
2018-09-27 13:14:59 +04:00
Kyle Cooley
8444ee9981
Start rendering npc's
2018-09-27 13:14:59 +04:00
Marc Zinnschlag
5fa9b32e76
Merged pull request #1937
2018-09-27 11:06:21 +02:00
Marc Zinnschlag
43880ca47b
Merged pull request #1919
2018-09-27 11:06:00 +02:00
Marc Zinnschlag
8b30f15df7
Merged pull request #1942
2018-09-27 11:05:22 +02:00
Marc Zinnschlag
c566514c9d
Merged pull request #1940
2018-09-27 10:50:04 +02:00
Andrei Kortunov
ee4ca87352
Traverse child nodes of cell node in the editor (bug #4654 )
2018-09-26 23:13:18 +04:00
Capostrophic
ba2fd8b795
Rename reflected absorb spells setting and add it to Advanced tab
2018-09-26 21:21:03 +03:00
Andrei Kortunov
8af021d729
Restore dynamic stats for actors in inactive cells (bug #1875 )
2018-09-26 07:46:28 +04:00
Andrei Kortunov
0176ee389e
Handle length of UTF-8 strings properly in plugin metadata (bug #4653 )
2018-09-25 21:40:26 +04:00
Andrei Kortunov
bce8de5fe9
Respect selected encoding in the content selector (bug #4467 )
2018-09-25 21:39:18 +04:00
Capostrophic
d2cad229f8
Ugly hack: don't reset player idle and movement animations in first person view
2018-09-25 17:09:54 +03:00
Marc Zinnschlag
0e06a25f21
Merged pull request #1935
2018-09-25 12:11:20 +02:00
Capostrophic
77fb4d6dd2
Make sure the idle animations are reset while jumping
2018-09-24 19:30:02 +03:00
Capostrophic
56ef11b023
Reset sneak and swim idle animations when moving
2018-09-24 19:30:02 +03:00
Capostrophic
713330351b
Experimental animation regression fixes
...
Don't unnecessarily start movement and jump animations from loop start
Don't play movement animation until jumping animation finishes
2018-09-24 19:30:02 +03:00
Sergey Fukanchik
b2a52a5b6c
Change 'after function'-style doxygen comment to normal.
2018-09-24 14:59:10 +03:00
Marc Zinnschlag
6ce6108eb4
Merged pull request #1932
2018-09-24 11:57:08 +02:00
Marc Zinnschlag
84a2752db9
Merged pull request #1933
2018-09-24 11:53:07 +02:00
Sergey Fukanchik
f00f35ba86
Add const to canRest()
2018-09-23 06:25:20 +03:00
Sergey Fukanchik
f2e11e6def
Fix MSVC C4596 illegal qualified name
2018-09-23 04:06:29 +03:00
Capostrophic
52da65b776
Fix issues with sun specularity (bug #4527 )
2018-09-23 03:39:06 +03:00
Sergey Fukanchik
44bcd9b25f
Fix tab characters
2018-09-23 02:46:29 +03:00
Sergey Fukanchik
c50ee22772
Wrap up World::canRest() implementation by moving enemiesNearby() from InputManager::rest() to World::canRest().
2018-09-23 01:52:56 +03:00
Andrei Kortunov
cd60d4fdf0
Store character controller in the variable make code less bulk
2018-09-22 21:13:00 +04:00
Andrei Kortunov
2ac2d01432
Optimize drowning state update
2018-09-22 21:12:56 +04:00
Andrei Kortunov
90d35aaa8f
Handle current health level during levelup (bug #4649 )
2018-09-22 07:48:47 +04:00
Andrei Kortunov
b3fd173e00
Check if current weapon has health at all in HUD (bug #4648 )
2018-09-22 06:51:56 +04:00
Andrei Kortunov
1634284739
Cache player's position outside of loops
2018-09-21 22:39:47 +04:00
Andrei Kortunov
b9346798c6
Optimize combat music update
2018-09-21 22:34:18 +04:00
Andrei Kortunov
fb484c6fde
Optimize AI loop a bit
2018-09-21 19:02:28 +04:00
Marc Zinnschlag
7be9f2ca45
Merged pull request #1891
2018-09-21 11:38:19 +02:00
Andrei Kortunov
01b3f92f7e
Make coc and fixme console commands close to vanilla (bug #4292 , bug #4217 )
2018-09-20 16:25:02 +04:00
Andrei Kortunov
bdd9eba2b8
Use C++ limits instead of C ones
2018-09-20 16:02:26 +04:00
Andrei Kortunov
276b7830a9
Mass potion creation (feature #4642 )
2018-09-20 15:45:14 +04:00
Marc Zinnschlag
3761aaadfd
Merged pull request #1928
2018-09-20 13:31:56 +02:00
Marc Zinnschlag
82d37dda20
Merged pull request #1927
2018-09-20 13:31:41 +02:00
Marc Zinnschlag
29bc5cbecf
Merged pull request #1925
2018-09-20 13:14:55 +02:00
Andrei Kortunov
6f4f6a155f
Combat AI: take ranged weapon speed in account
2018-09-19 12:23:24 +04:00
Andrei Kortunov
62f6f174cf
Show attack speed of ranged weapons
2018-09-19 12:23:21 +04:00
Andrei Kortunov
989de05f80
Do not show duration for infinite light sources as -1
2018-09-18 15:23:16 +04:00
Andrei Kortunov
6d0e6ab012
Use book font by default in the text formatter
2018-09-17 22:24:21 +04:00
Andrei Kortunov
dda02bd696
Do not use book fonts for dialogue window
2018-09-17 19:56:36 +04:00
Andrei Kortunov
70ed8fd1a9
Use constants instead of widely used magic numbers (task #4645 )
2018-09-17 19:22:50 +04:00
Bret Curtis
07be9ae8ac
Merge pull request #1926 from akortunov/warnfix
...
Fix MSVC warning about possibly uninitialized movestate variable
2018-09-17 17:10:25 +02:00
Andrei Kortunov
9c8fc0557a
Fix MSVC warning about possibly uninitialized movestate variable
2018-09-17 14:45:16 +04:00
Marc Zinnschlag
06b2a23e74
Merged pull request #1768
2018-09-17 12:10:21 +02:00
Marc Zinnschlag
d76367918a
Merged pull request #1907
2018-09-17 12:10:00 +02:00
Marc Zinnschlag
c6b62308cd
Merged pull request #1921
2018-09-17 12:02:44 +02:00
Marc Zinnschlag
29f6ee30a6
Merged pull request #1922
2018-09-17 12:00:49 +02:00
Andrei Kortunov
2961f0d810
Allow to use the %Name for creatures (bug #4644 )
2018-09-16 21:53:28 +04:00
Capostrophic
95aa05e41b
Tweaks to script parser messages and pathgrid warnings
2018-09-16 16:47:33 +03:00
Andrei Kortunov
ae1c054635
Make GetPCJumping return true only when jumping (bug #4641 )
2018-09-16 11:58:01 +04:00
Capostrophic
5909297809
Make underwater SFX always apply based on camera position (bug #4532 )
2018-09-15 23:26:07 +03:00
Capostrophic
5a86554f97
Cleanup
2018-09-14 21:55:50 +03:00
Capostrophic
c025427575
Implement enchantment record effect list verification (feature #1617 )
2018-09-14 21:06:50 +03:00
Capostrophic
d6560d3f20
Make several messages more strict and clean up topic info verifier
2018-09-14 21:06:50 +03:00
Capostrophic
5d1c1f25f7
Remove now redundant NPC fields checks
2018-09-14 21:06:50 +03:00
Capostrophic
015cd6064f
Implement basic enchantment record verifier (feature #1617 )
2018-09-14 21:06:50 +03:00
Capostrophic
dabdb0bfaf
Get rid of deprecated Messages::push_back()
2018-09-14 21:06:50 +03:00
Capostrophic
47b9008743
Renovate reference record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
0bdb7ea92f
Cleanup
2018-09-14 21:06:50 +03:00
Capostrophic
34ffaa2fe2
Make finishing touches to object record verifiers
2018-09-14 21:06:50 +03:00
Capostrophic
d1b2fc11ef
Use messages::add in object record verifiers
...
Add NPC head and hair body part existence checks and expand creature record verifier, update playable class checks in class record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
85dc1e4ef2
Revert unnecessary universalid changes in Journal record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
e1ae7a9b0e
Avoid duplicate duplicate pathgrid point warnings
2018-09-14 21:06:50 +03:00
Capostrophic
1e5330d9da
Use Messages::add in skill record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
35281d7c38
Use Messages::add in race, soundgen, spell and start script record verifiers
2018-09-14 21:06:50 +03:00
Capostrophic
b2b9bd94f0
Fix bolt object type
2018-09-14 21:06:50 +03:00
Capostrophic
8dcb58d745
Use Messages::add in Faction, Sound, Bodypart and Class record verifiers
2018-09-14 21:06:50 +03:00
Capostrophic
d433929194
Use Messages::add in birthsign record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
6b226eef8f
Use Messages::add in magic effect record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
5b8880c6fa
Update cell reference record verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
dc847dce09
Add item icon checks to object record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
34077a6987
Purge unnecessary namespaces
2018-09-14 21:06:50 +03:00
Capostrophic
d90940011f
Add model checks to object record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
38ea7928f5
Add sound file checks to sound record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
1f717def35
Update journal, start script and spell verifiers messages
2018-09-14 21:06:50 +03:00
Capostrophic
a6d3cd9190
Update topic info verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
14ef145b3b
Update region and pathgrid record verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
a9ce155a7b
Update faction and body part record verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
7535daa94d
Update class and race record verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
fd1a3ad88d
Update object and script record verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
cf7a8c5775
Update soundgen record verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
5249492a31
Update skill record verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
51fdb94e34
Add texture check to birthsign verifier
2018-09-14 21:06:50 +03:00
Capostrophic
d3aa5840ec
Refactor magic effect record verifying
2018-09-14 21:06:50 +03:00
Bret Curtis
6035636e29
Merge pull request #1915 from akortunov/enterfix
...
Disable repeating for Accept GUI action
2018-09-14 15:17:47 +02:00
Marc Zinnschlag
a0f7282966
Merged pull request #1820
2018-09-14 11:44:06 +02:00
Marc Zinnschlag
ea053d9f47
Merged pull request #1881
2018-09-14 11:43:11 +02:00
Andrei Kortunov
6066f02010
Do not use universal IDs for menu items
2018-09-13 22:15:59 +04:00
Marc Zinnschlag
252ed9bd4b
Merged pull request #1914
2018-09-13 11:53:21 +02:00
Andrei Kortunov
275d10e1f7
Add missing icons for UniversalId tables and use them in the editor menu (feature #912 )
2018-09-12 22:37:19 +04:00
Capostrophic
664c630ac0
Don't make sTo strings static references
2018-09-12 16:36:03 +03:00
Andrei Kortunov
e300a16b24
Use field for columns count instead of out integer
2018-09-12 14:31:01 +04:00
Andrei Kortunov
7a986f38da
Support for user-defined TrueType fonts
2018-09-12 14:31:01 +04:00
Andrei Kortunov
c9c0230d2a
Scale journal fonts separately from common ones
2018-09-12 14:31:01 +04:00
Andrei Kortunov
f89393fd62
Validate 'ttf resolution' option value
2018-09-12 14:31:01 +04:00
Andrei Kortunov
adbaeb7cca
Improve GUI scaling (bug #3288 )
2018-09-12 14:31:01 +04:00
Marc Zinnschlag
6100e34051
Merged pull request #1912
2018-09-12 12:04:49 +02:00
Marc Zinnschlag
2ba15c86f8
Merged pull request #1913
2018-09-12 12:01:13 +02:00
Marc Zinnschlag
3fd40e4a4e
Merged pull request #1916
2018-09-12 11:58:39 +02:00
Marc Zinnschlag
50775dd411
Merged pull request #1917
2018-09-12 11:38:52 +02:00
Andrei Kortunov
0136f0552b
Do not update mIdleState directly
2018-09-11 22:24:44 +04:00
Andrei Kortunov
929d78d6a3
Randomize attacks for non-bipedal creatures with Weapon flag
2018-09-11 22:24:44 +04:00
Andrei Kortunov
0440c11ccd
Fix swim crossbow animations
2018-09-11 22:24:44 +04:00
Andrei Kortunov
9918212a1e
Set focus to Close button when opening the container window (bug #4333 )
2018-09-11 11:22:26 +04:00
Andrei Kortunov
c2c24a76a4
Handle MyGUI exceptions inside destructors
2018-09-11 11:11:27 +04:00
Andrei Kortunov
d5bcc49079
Initialize missing struct fields
2018-09-11 11:11:24 +04:00
Andrei Kortunov
e5a81b1f99
Fix some issues, found by Coverity Scan
2018-09-10 16:35:27 +04:00
Andrei Kortunov
dcc1a122f7
Use drag and drop for ActionTake when InventoryWindow is active (bug #4543 )
2018-09-10 15:18:07 +04:00
Andrei Kortunov
269ef7a559
Disable repeating for ENTER key in GUI
2018-09-10 12:55:00 +04:00
Andrei Kortunov
33a66b778f
Disable repeating for Accept action in keyboard navigation (bug #4260 )
2018-09-09 23:10:09 +04:00
Capostrophic
702868255a
Use sTo GMST in spellmaking menu (feature #4636 )
2018-09-09 13:56:58 +03:00
Capostrophic
6ab42919cf
Make sure the actor is actually crouching/running before tweaking movement speed
2018-09-08 22:43:09 +03:00
Evil Eye
6705e5aae4
forget about the setting till #2887 is implemented at least
2018-09-08 11:21:43 +02:00
Evil Eye
bbcdfd4078
Implements vanilla's off-by-one error, fixing #4611
2018-09-06 21:49:50 +02:00
Capostrophic
9408876b58
Utilize AI GMSTs for priority rating (feature #4632 )
...
Fix on-target effect rating calculation
2018-09-06 17:39:37 +03:00
Bret Curtis
387b3e9e87
Merge pull request #1909 from akortunov/warnfix
...
Fix all MSVC warnings left
2018-09-04 21:11:14 +02:00
Andrei Kortunov
6529883527
Fix MSVC warning C4389
2018-09-04 18:14:51 +04:00
Bret Curtis
86809af2cd
Merge pull request #1908 from akortunov/warnfix
...
Fix some warnings
2018-09-04 16:00:37 +02:00
Andrei Kortunov
aed7c1b2bb
Fix a couple of Clang warnings
2018-09-04 12:37:43 +04:00
Capostrophic
d758b573e2
Fix erroneous assumption that ranged weaponry has speed
...
Restrict speed mult to melee weaponry
2018-09-01 12:13:18 +03:00
Capostrophic
ceb6121b33
Better checks for enemy incapacitation
2018-09-01 12:13:18 +03:00
Capostrophic
2965373ed6
Avoid potential zero division
2018-09-01 12:13:18 +03:00
Capostrophic
e66be02e2e
Account for enemy armor rating in weapon rating
2018-09-01 12:13:18 +03:00
Capostrophic
fa3e45fa7d
Slight cleanup
2018-09-01 12:13:18 +03:00
Capostrophic
533b72eff6
Cache weapon type strings
2018-09-01 12:13:18 +03:00
Capostrophic
00c847db19
Make AI Blind, Sound and Silence effect rating more logical
2018-09-01 12:13:18 +03:00
Capostrophic
374e98d665
Make rateWeapon more sensible and account for weapon speed
2018-09-01 12:13:18 +03:00
Marc Zinnschlag
78a84042ad
Merged pull request #1901
2018-09-01 11:08:24 +02:00
Marc Zinnschlag
3b01355f27
Merged pull request #1895
2018-09-01 11:06:38 +02:00
Marc Zinnschlag
f2981a81c9
Merged pull request #1900
2018-09-01 11:06:10 +02:00
Marc Zinnschlag
ef72024e2c
Merged pull request #1902
2018-09-01 11:01:05 +02:00
Capostrophic
b673cdf70e
Grant Enchant experience even if recharging fails (bug #4622 )
2018-08-30 23:52:33 +03:00
Capostrophic
7ef6fa9f61
Remove deprecated GMST get* functions
2018-08-29 18:38:12 +03:00
Andrei Kortunov
5d54214acb
Optimize combat action iteration
2018-08-29 17:20:34 +04:00
Andrei Kortunov
2cac8b59b1
Use square distance to target
2018-08-29 17:20:32 +04:00
Andrei Kortunov
4c0ef4ddb6
Do not initialize magic schools map every time we access it
2018-08-29 17:20:32 +04:00
Capostrophic
23834b5ed8
Don't apply falling damage twice (bug #4608 )
2018-08-29 15:09:03 +03:00
Capostrophic
b8ba9092cb
Purge effects from all permanent spells with the same ID
2018-08-29 14:09:43 +03:00
Capostrophic
ed1f8f7be7
Remove effects from all active spells with the same ID
2018-08-29 13:52:03 +03:00
Capostrophic
6c47f95677
Make RemoveSpellEffects affect permanent spells (bug #3920 )
...
Also make it remove the effects but not the spells themselves
2018-08-29 13:52:03 +03:00
Marc Zinnschlag
c280a71b33
Merged pull request #1897
2018-08-29 12:15:05 +02:00
Marc Zinnschlag
57922a272c
Merged pull request #1899
2018-08-29 12:13:28 +02:00
Marc Zinnschlag
6fc6fef72e
Merged pull request #1892
2018-08-29 12:08:13 +02:00
Marc Zinnschlag
f05e494f6f
Merged pull request #1894
2018-08-29 12:06:42 +02:00
Marc Zinnschlag
21d414187f
Merged pull request #1896
2018-08-29 12:05:50 +02:00
Marc Zinnschlag
e4e18d6642
Merged pull request #1869
2018-08-29 12:02:56 +02:00
Capostrophic
7f459f0610
Knockdown and godmode fixes
...
Make sure an incapacitated player is not able to jump
Cleanup of redundant player and godmode checks in creature class
Make sure the player is not knocked down while in godmode
2018-08-28 16:42:15 +03:00
Capostrophic
079b60c1ea
Don't allow actors to use sneaking while flying (bug #4618 )
2018-08-28 14:32:03 +03:00
Capostrophic
2564fcc37e
Apply sneaking offset to camera while the character is in air (bug #4617 )
2018-08-28 03:35:42 +03:00
Andrei Kortunov
8fa6c6f726
Update pinned windows in-game (bug #4560 )
2018-08-27 09:44:04 +04:00
Andrei Kortunov
d448b802ef
Add a small threshold for player turning animations
2018-08-26 22:58:26 +04:00
Andrei Kortunov
60698e6f8a
Optimize new magic effects update system
2018-08-26 21:02:14 +04:00
Sophie Kirschner
a1e076a37e
Merge branch 'master' into pineapple/fix-video-incomplete-type-2
...
Resolve merge issues related to CHANGELOG.md
* master:
Optimize skinning (task #4605 )
Update changelog
Update some comments
Set the OpenAL source offset after setting the buffer
Make Move and MoveWorld console commands move actors standing on moving object (bug #2274 )
Adding Changelog entry
Allow messageboxes arguments to have newline characters (bug #3836 )
Check for impact immediately when launch a projectile (bug #3059 )
Fix gold count calculation in pickupObject (bug #4604 )
Correct special case soundgen comparisons
Move "land" check earlier
Fixes #3681
Play landing sound manually and ignore land soundgen textkeys (bug #2256 )
Make some more optimizations to actor processing loops
Fix freeze in getActorsSidingWith
Addiong missing "to" word
Adding common problems that were previous on the site FAQ
Treat <> and << operators as < and >< and >> as > in scripts
stage1: priorities for event music and other minor improvements to the music system
# Conflicts:
# CHANGELOG.md
2018-08-26 12:05:02 +03:00
Andrei Kortunov
c6dcfd1fce
Do not apply scale twice for animated collision nodes (bug #4607 )
2018-08-25 17:26:17 +04:00
Sophie Kirschner
dd01c4d224
Fix: 'sizeof' to an incomplete type 'Video::VideoPlayer'
...
Alternate solution to same problem reported in https://github.com/OpenMW/openmw/pull/1888
2018-08-25 11:53:43 +03:00
Chris Robinson
c2b3ca9638
Update some comments
...
It wasn't actually a bug in OSX like the comment said, but intended behavior.
2018-08-25 01:24:35 -07:00
Chris Robinson
4e3ae85c11
Set the OpenAL source offset after setting the buffer
...
This is to work around a bug in the Rapture3D driver.
2018-08-25 01:24:35 -07:00
Marc Zinnschlag
c2c595407c
Merged pull request #1883
2018-08-25 10:07:56 +02:00
Marc Zinnschlag
f25a9a6fb3
Merged pull request #1885
2018-08-25 10:00:22 +02:00
Marc Zinnschlag
e203159d70
Merged pull request #1889
2018-08-25 09:50:00 +02:00
Marc Zinnschlag
9816643bef
Merged merge request !39
2018-08-25 09:37:21 +02:00
Andrei Kortunov
de08c1cb1b
Make Move and MoveWorld console commands move actors standing on moving object (bug #2274 )
2018-08-25 10:34:33 +04:00
Andrei Kortunov
3d4f5536d2
Check for impact immediately when launch a projectile (bug #3059 )
2018-08-24 15:03:54 +04:00
Bret Curtis
78d9787212
Merge pull request #1880 from Capostrophic/landing
...
Play landing sound manually and ignore land soundgen textkeys (bug #2256 )
2018-08-23 08:40:55 +02:00
Capostrophic
3f76f1d3ed
Fix gold count calculation in pickupObject (bug #4604 )
2018-08-22 22:35:22 +03:00
Capostrophic
f74ebb64af
Correct special case soundgen comparisons
2018-08-22 16:36:15 +03:00
Capostrophic
ae0a6a22b3
Move "land" check earlier
2018-08-22 14:47:06 +03:00
Thunderforge
5a2e9868c1
Fixes #3681
...
This changes the way that the popup works to use [`QtColorDialog::getColor()`](http://doc.qt.io/archives/qt-4.8/qcolordialog.html#getColor ) instead of the problematic open() function. Also makes the button change to create the modal dialog when pushed, rather than being a checkbox of sorts
2018-08-21 22:13:05 -05:00
Capostrophic
2b45fd84ea
Play landing sound manually and ignore land soundgen textkeys (bug #2256 )
2018-08-21 19:03:03 +03:00
Capostrophic
910065f38f
Make some more optimizations to actor processing loops
2018-08-21 17:02:56 +03:00
Capostrophic
b77d733c3e
Fix freeze in getActorsSidingWith
2018-08-21 16:47:29 +03:00
AnyOldName3
25e92481f4
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-08-21 14:00:58 +01:00
Capostrophic
74229490e4
Use the correct skill for creature AI weapon hit chance rating
2018-08-20 21:38:57 +03:00
Bret Curtis
3c827da702
Merge branch 'master' into combat_anims
2018-08-19 10:03:39 +02:00
Bret Curtis
3b2781bf89
Merge pull request #1720 from akortunov/playvfx
...
Rework spell VFX management
2018-08-19 10:00:38 +02:00
Marc Zinnschlag
20c53594de
Merged merge request !36
2018-08-18 12:06:35 +02:00
James Carty
4489838ea3
Fix incorrect function call
2018-08-17 22:35:04 +01:00
James Carty
513e99148e
Fix function with no return value
2018-08-17 20:18:20 +01:00
AnyOldName3
80082308f0
Merge upstream (shadermanager log system revamp)
2018-08-17 18:22:13 +01:00
Andrei Kortunov
d7ca087f59
AiCast: fix aiming
2018-08-17 12:41:13 +04:00
Andrei Kortunov
31f8bea1dd
Rework spell effects management
2018-08-17 12:41:13 +04:00
Andrei Kortunov
8516aee6e0
Implement getHalfExtents() for non-actor objects
2018-08-17 12:40:01 +04:00
Marc Zinnschlag
088463ebe6
Merged pull request #1868
2018-08-17 09:37:49 +02:00
Marc Zinnschlag
ebdb991225
Merged pull request #1875
2018-08-17 09:37:12 +02:00
Marc Zinnschlag
3489951410
Merged pull request #1866
2018-08-17 09:36:44 +02:00
Capostrophic
ce78a34010
Use container ID in Equip command warning
2018-08-17 03:32:33 +03:00
Capostrophic
372697489b
Fix Equip command infinite loop (bug #3072 )
2018-08-17 02:52:18 +03:00
James Carty
43f1c9163c
Fix issue in which murder wouldn't be reported after paying fine
2018-08-16 18:58:51 +01:00
Andrei Kortunov
16edac8c47
Fix incorrect 'preparing' word spelling
2018-08-16 17:47:06 +04:00
Andrei Kortunov
a73d42e711
Do not stop idle animation in spellcasting stance
2018-08-16 16:56:42 +04:00
Andrei Kortunov
b7a448cf42
Update idle animations after reset of mIdleState (bug #4531 )
2018-08-16 16:56:42 +04:00
Andrei Kortunov
3a6c480d41
Do not reset idle animations when turning
2018-08-16 16:56:42 +04:00
Andrei Kortunov
15fa47827b
AiCombat: Avoid jittering when aiming in melee
2018-08-16 16:56:42 +04:00
Andrei Kortunov
e444b9581c
Do not play min attack -> max attack animation when attack strength is 0 (bug #4591 )
2018-08-16 16:56:39 +04:00
Andrei Kortunov
8a48258b1b
Fix attack after shoot
2018-08-16 15:51:11 +04:00
Bret Curtis
dcd381049c
Merge pull request #1872 from akortunov/extended_logging
...
Use new logging system
2018-08-16 11:38:29 +02:00
James Carty
4b0a6074e7
Add comment
2018-08-16 00:29:14 +01:00
James Carty
6889432030
Move code to seperate functions for reusability
2018-08-16 00:26:02 +01:00
Capostrophic
37f9d45182
Remove an outdated checkbox from the advanced page
2018-08-15 16:04:29 +03:00
Andrei Kortunov
5a4d0cec3a
Use new logging system for game itself
2018-08-14 23:05:43 +04:00
Yohaulticetl
640b32da56
Fixed merge conflicts
2018-08-14 19:57:48 +02:00
Yohaulticetl
7e9ce99062
Made the werewolf check optional
2018-08-14 19:56:40 +02:00
Yohaulticetl
18e51e0e98
Added check for werewolves
2018-08-14 19:44:03 +02:00
Yohaulticetl
d19cbdb652
Factored strength into hand-to-hand combat
2018-08-14 19:44:03 +02:00
Andrei Kortunov
c7a5548475
Use new logging system for editor
2018-08-14 20:01:09 +04:00
Capostrophic
22162dcbda
Replace std::find with std::set::find where applicable
2018-08-14 18:14:43 +03:00
Capostrophic
53599290c3
Make search for followers in getEnemiesNearby recursive
2018-08-14 16:14:48 +03:00
Capostrophic
75bd6e1d28
Make search for allies in actorAttacked recursive
2018-08-14 15:41:34 +03:00
Capostrophic
7029ed0e8d
Refactor follower and enemy actor processing
...
Make another exception for wander packages when finding allies (bug #4304 )
2018-08-14 15:36:52 +03:00
Bret Curtis
d25147a930
Merge pull request #1863 from Capostrophic/aiming
...
Use the correct spell projectile speed GMST in AI aiming (bug #3948 )
2018-08-14 10:29:22 +02:00
Bret Curtis
6a32a4aed0
Merge pull request #1810 from akortunov/weaponfix
...
Use fallbacks for missing weapon animations
2018-08-14 10:29:01 +02:00
Bret Curtis
f7715db25f
Merge pull request #1871 from akortunov/extended_logging
...
[Regression] Move cerr initialization out of 'try' block
2018-08-14 10:26:12 +02:00
Andrei Kortunov
9a5b016293
Move crashcatcher initialization to components
2018-08-14 11:17:05 +04:00
Allofich
fd89fa415a
Do modifiers for dynamic stats before attributes
...
(Fixes #4231 )
2018-08-13 21:59:27 +09:00
Allofich
2cc1b52baf
Drain and fortify fixes for dynamicStats
...
(Fixes #3049 )
2018-08-13 21:59:26 +09:00
Bret Curtis
61b34124e2
Merge pull request #1847 from akortunov/extended_logging
...
Improve console logging
2018-08-13 10:19:25 +02:00
Bret Curtis
f7bc862476
Merge pull request #1867 from akortunov/spelldetection
...
Add zero-duration spells effects to effect list (bug #3533 )
2018-08-13 09:38:22 +02:00
Andrei Kortunov
4003fa1296
Keep jailing state for one frame after leaving jail (bug #3788 )
2018-08-13 11:10:01 +04:00
Andrei Kortunov
9dfd775bf2
Implement GetPCTraveling console command
2018-08-13 08:30:50 +04:00
Andrei Kortunov
8de3383612
Add zero-duration spells effects to effect list (bug #3533 )
2018-08-12 17:25:35 +04:00
Andrei Kortunov
307e0103dc
Use fallbacks for missing weapon animations (bug #4470 )
2018-08-12 16:14:24 +04:00
Andrei Kortunov
7d6e3673e0
Implement advanced logging system (feature #4581 )
2018-08-12 13:38:15 +04:00
Bret Curtis
52d4e25314
Merge pull request #1851 from akortunov/launcherfix
...
Init SDL2 before Qt4 to avoid crash on Linux
2018-08-11 18:55:41 +02:00
elsid
f2a63bcf35
Add unit tests for BulletNifLoader
2018-08-11 18:00:52 +03:00
elsid
6afc1dc3a0
Support build with coverage for components and test suite
2018-08-11 17:24:40 +03:00
elsid
ef631a0961
Add dependency for GMock
2018-08-11 16:52:53 +03:00
Capostrophic
3527f3800e
Use the correct spell projectile speed GMST in AI aiming
2018-08-10 21:21:21 +03:00
Marc Zinnschlag
1cfc1f9bdb
Merged pull request #1666
2018-08-10 12:23:17 +02:00
Marc Zinnschlag
0aedb3aada
Merged puil request #1808
2018-08-10 12:22:13 +02:00
Marc Zinnschlag
24212d58e8
Merged pull request #1861
2018-08-10 12:21:05 +02:00
Andrei Kortunov
cde95979d0
Fix combat engagement for creatures
2018-08-10 09:29:01 +04:00
Andrei Kortunov
780648b584
Do not reset idle animations if we do not have ammo
2018-08-09 16:39:46 +04:00
Andrei Kortunov
df577babe9
Increase priority of 1st-person weapon animations to avoid issues with animation blending
2018-08-09 16:39:20 +04:00
Andrei Kortunov
71bcc11ba5
Apply only crossbow reload animation to upper body
2018-08-09 16:37:08 +04:00
Andrei Kortunov
a0d0e5d2db
Give jumping animations higher priority than movement ones
2018-08-09 16:19:03 +04:00
Andrei Kortunov
6a03aa6fdb
Reduce jittering during turning animations for player
2018-08-09 16:19:00 +04:00
Andrei Kortunov
cd92014533
Do not touch GUI modes when taking screenshots (bug #4528 )
2018-08-09 16:19:00 +04:00
Marc Zinnschlag
fe19d8ff35
Merged pull request #1857
2018-08-09 13:52:51 +02:00
Marc Zinnschlag
a2a57cf694
Merged pull request #1858
2018-08-09 13:51:31 +02:00
Marc Zinnschlag
0f510011b3
Merged pull request #1852
2018-08-09 13:49:50 +02:00
Andrei Kortunov
126b2fdd42
Use the isPlayer variable to do not check if the current actor is player every time
2018-08-09 11:16:19 +04:00
AnyOldName3
1e48114492
Use JDGBOLT's indoor 'sun' direction.
2018-08-08 23:30:33 +01:00
AnyOldName3
a2b54714d4
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-08-08 23:28:06 +01:00
AnyOldName3
586ac2d12d
Revert "Prevent accidental culling of first person meshes"
...
This reverts commit c38bf6757a
2018-08-08 22:53:56 +01:00
Andrei Kortunov
51af729305
Do not use headtracking in the 1st-person view (bug #4573 )
2018-08-08 23:29:03 +04:00
Andrei Kortunov
6202b4eca9
Do not touch GUI modes when taking screenshots (bug #4528 )
2018-08-08 22:10:53 +04:00
Capostrophic
e9e9c0dd6b
Fix guild guide fast travelling to exteriors time
2018-08-08 12:46:36 +03:00
Andrei Kortunov
b7859b3fa9
Cap underwater view distance (bug #4565 )
2018-08-08 13:22:40 +04:00
Capostrophic
bcd9cc4baa
Check the actor cell instead of the destination cell in fast travel price logic
2018-08-08 02:07:48 +03:00
Andrei Kortunov
2b90504558
Init SDL2 before Qt4 to avoid crash on Linux (bug #4529 )
2018-08-07 22:57:16 +04:00
Marc Zinnschlag
b75b5d139a
Merged pull request #1845
2018-08-05 12:28:38 +02:00
Marc Zinnschlag
7a93d118d2
Merged pull request #1846
2018-08-05 12:26:56 +02:00
Capostrophic
7087bad580
Use special behavior for all topics with reserved names (bug #4557 )
2018-08-05 12:39:53 +03:00
Andrei Kortunov
1f4dd3b393
Make partial binary search case insensitive, as it supposed to be (bug #4558 )
2018-08-05 13:26:12 +04:00
Andrei Kortunov
b0f2e00e7f
Make forcegreeting a non-op for non-actor objects (bug #4553 )
2018-08-05 09:31:45 +04:00
Marc Zinnschlag
452a706047
Merged pull request #1837
2018-08-04 10:26:44 +02:00
Marc Zinnschlag
b6a919a2d1
Merged pull request #1838
2018-08-04 10:26:18 +02:00
Marc Zinnschlag
99c03d55f0
Merged pull request #1841
2018-08-04 10:25:52 +02:00
Marc Zinnschlag
2a621fedd1
Merged pull request #1842
2018-08-04 10:08:11 +02:00
Capostrophic
d15dcaff68
Don't adjust weapon rating according to weapon condition twice
2018-08-03 19:22:58 +03:00
Andrei Kortunov
e2519226aa
Move boost include
2018-08-03 17:04:07 +04:00
Andrei Kortunov
eeffe2e557
Check if item model exists inside drag and drop functions
2018-08-03 16:42:43 +04:00
Andrei Kortunov
c2a175c2e0
Move crash catcher wrapper to separate file
2018-08-03 15:51:17 +04:00
Capostrophic
725a9323c4
Merge branch 'master' into sound
2018-08-03 14:16:51 +03:00
Capostrophic
4c7f3cf626
Merge branch 'master' into weaponpriority
2018-08-03 14:07:11 +03:00
Marc Zinnschlag
4d280add81
Merged pull request #1843
2018-08-03 12:56:17 +02:00
Marc Zinnschlag
d7718aae9b
Merged pull request #1840
2018-08-03 12:54:56 +02:00
Marc Zinnschlag
eb5f558f6f
Merged pull request #1839
2018-08-03 12:53:55 +02:00
Andrei Kortunov
712c9995db
Rename mIsScripted variable because its name is ambiguous
2018-08-03 12:01:31 +04:00
Andrei Kortunov
c454f1bdad
Use log file for editor (feature #4012 )
2018-08-03 09:05:08 +04:00
AnyOldName3
8f4125134f
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-08-02 15:51:06 +01:00
AnyOldName3
c38bf6757a
Prevent accidental culling of first person meshes
2018-08-02 15:50:43 +01:00
Capostrophic
9d85b7c2d3
Use the actual damage for deducting weapon rating
2018-08-02 15:20:07 +03:00
Capostrophic
73d5496711
Revert addition change
2018-08-02 13:01:23 +03:00
Capostrophic
16af1a6c1c
Replace 0 sound range values separately
2018-08-02 12:40:53 +03:00
Capostrophic
3ac030d75a
Handle explicit calls before handling quotes
2018-08-02 09:49:53 +03:00
Capostrophic
80f3bd9f86
Don't apply iWereWolfFleeMod to creatures
2018-08-02 08:36:15 +03:00
Capostrophic
fa6c205e5d
Make tab autocompletion work with explicit reference calls
2018-08-02 03:24:31 +03:00
Capostrophic
bec47dfb7c
Make ranged weapon bonus a distance-dependent multiplier
2018-08-01 19:57:05 +03:00
Capostrophic
382b68a081
Combat AI: take the actual hit chance in account when rating weapon
2018-08-01 19:27:19 +03:00
Andrei Kortunov
12144de8ed
Initialize missing variables
2018-08-01 20:18:37 +04:00
Andrei Kortunov
c0bed0fde2
Handle case when index < 0
2018-08-01 20:17:59 +04:00
Andrei Kortunov
770d86f9bd
Initialize cubeSize variable for 360 degrees screenshots correctly
2018-08-01 19:36:55 +04:00
Andrei Kortunov
a08048da4e
Avoid dereference after null check
2018-08-01 19:30:30 +04:00
Capostrophic
ab29f9e13f
Add permanent barter disposition change option (feature #3103 )
2018-08-01 17:31:35 +03:00
Marc Zinnschlag
1c13256456
Merged pull request #1829
2018-08-01 16:17:37 +02:00
Marc Zinnschlag
0e75e3816a
Merged pull request #1830
2018-08-01 16:16:30 +02:00
Marc Zinnschlag
0c507b74bc
Merge pull request #1832
2018-08-01 16:13:59 +02:00
Marc Zinnschlag
7c7af1da61
Merged pull request #1834
2018-08-01 15:47:09 +02:00
AnyOldName3
cc23a968d1
Merge upstream/master
2018-08-01 14:13:45 +01:00
Capostrophic
4d48ede6f1
Add two missing gameplay settings to Advanced tab
2018-08-01 13:36:31 +03:00
Capostrophic
be2e7e9e09
Make casting caster-linked on-self effects no-op (bug #4378 )
2018-08-01 02:41:57 +03:00
Andrei Kortunov
5b92910829
Limit difficulty scaling, as mentioned in docs
2018-07-31 21:14:16 +04:00
Marc Zinnschlag
aac580da6b
Merged pull request #1828
2018-07-31 11:10:48 +02:00
Marc Zinnschlag
20d4e27f82
Merged pull request #1821
2018-07-31 10:51:32 +02:00
Andrei Kortunov
c07cc0dc40
Reset animation state after weapon unequipping
2018-07-30 22:24:25 +04:00
Andrei Kortunov
0f2c3ecb17
Rescale player avatar (bug #4539 )
2018-07-30 17:41:43 +04:00
Capostrophic
c79f96d0d2
Implement ranged crits (feature #3703 )
2018-07-29 19:42:44 +03:00
Andrei Kortunov
1d463d129d
Finish AiTarget package, if destination is blocked by other actor
2018-07-29 19:41:31 +04:00
Andrei Kortunov
75835c8326
Prevent NPC from chosing farther pathgrid node
2018-07-29 18:18:05 +04:00
Marc Zinnschlag
9e6cba09a6
Merged pull request #1827
2018-07-29 12:52:51 +02:00
Marc Zinnschlag
84de55fb46
Merged puil request #1824
2018-07-29 12:52:01 +02:00
Marc Zinnschlag
78121c1774
Merged pull request #1823
2018-07-29 12:49:50 +02:00
Marc Zinnschlag
3ba9229f47
Merged pull request #1815
2018-07-29 12:48:20 +02:00
Capostrophic
9c8e284ead
Fix quick key activation delay code (regression #4536 )
2018-07-29 12:52:29 +03:00
Capostrophic
84a871cac7
Actually enable is_pod test
2018-07-28 23:56:42 +03:00
Andrei Kortunov
6d5d0039ec
Make sure we apply OT_Murder only once
2018-07-28 20:45:33 +04:00
Andrei Kortunov
bc82dbbd1b
Do not try to find missing animated collision shape again and again
2018-07-28 16:49:00 +04:00
Andrei Kortunov
2d4ec86b8d
Provide launcher icons
2018-07-28 13:18:38 +04:00
Andrei Kortunov
28a02ac93b
Use file selection dialogue result (bug #4524 )
2018-07-27 21:25:21 +04:00
Marc Zinnschlag
b7c159e5b6
Merged pull request #1816
2018-07-27 12:09:10 +02:00
Marc Zinnschlag
c508938674
Merged pull request #1817
2018-07-27 12:06:51 +02:00
Marc Zinnschlag
bbb22643e8
Merge remote-tracking branch 'capostrophic/warning'
2018-07-27 12:05:26 +02:00
Capostrophic
f7887ab05f
Fix MSVC C4456 warning: declaration of 'stats' hides previous local declaration
2018-07-26 23:24:26 +03:00
Capostrophic
51d369d4da
Add resumeGame method
2018-07-26 20:35:34 +03:00
Andrei Kortunov
23d917df9c
Do not use magic numbers in capacity calculations
2018-07-26 18:06:36 +04:00
Capostrophic
cac2bc768e
Fix NPC "can't teach more" message (bug #4494 )
2018-07-25 12:34:33 +03:00
Marc Zinnschlag
ddd5cbd17c
Initialise lock state of newly opened subviews (fixes issue #4520 )
2018-07-21 17:38:11 +02:00
Andrei Kortunov
8281fd903f
Set movement speed to 0 when unconscious (bug #4519 )
2018-07-19 20:17:32 +04:00
Andrei Kortunov
5c16ce1d36
Sort icons in the DataDisplayDelegate
2018-07-17 22:49:51 +04:00
Marc Zinnschlag
78a2725169
Merged pull request #1806
2018-07-17 12:42:41 +02:00
Marc Zinnschlag
326a3e61f4
Merged pull request #1807
2018-07-17 12:42:12 +02:00
Andrei Kortunov
38fa4e0a8a
Do not play un-equipping animation when we switch to hand-to-hand
2018-07-17 14:10:04 +04:00
Andrei Kortunov
edd5769022
Show magic items count in spells window (feature #4509 )
2018-07-16 14:11:03 +04:00
Andrei Kortunov
30716344f2
Fix possible division by zero in the fatigue calculation (bug #4510 )
2018-07-16 13:24:12 +04:00
Andrei Kortunov
6ddf6eb885
Use editor markers for lights and creatures levelled lists
2018-07-15 17:25:18 +04:00
Andrei Kortunov
3d1daaebab
Rework manual spellcasting (e.g. via scripts)
2018-07-12 16:24:25 +04:00
Bret Curtis
99e4d49e7c
Merge pull request #1787 from akortunov/profilierfont
...
Use the DejaVuLGCSansMono.ttf for profiler output
2018-07-11 16:00:34 +02:00
Andrei Kortunov
70b6d4983d
Use the DejaVuLGCSansMono.ttf in profilier output
2018-07-11 14:41:49 +04:00
Marc Zinnschlag
ee759effce
Merged pull request #1798
2018-07-11 10:06:30 +02:00
Andrei Kortunov
c77c50e92b
Make Equip console command to bypass most of restrictions (bug #4460 )
2018-07-11 00:06:21 +04:00
Capostrophic
5cb9dc9d12
Use SpellTurnLeft/TurnRight animation groups
2018-07-10 22:19:56 +03:00
Bret Curtis
df1576fcf5
Merge branch 'master' into crossbowfix
2018-07-10 19:15:37 +02:00
Bret Curtis
fde46f03b3
Merge pull request #1801 from terabyte25/terabyte25-trainingskill
...
Update trainer skill cap based off modified skill instead of based skill
2018-07-10 16:54:28 +02:00
Andrei Kortunov
1c35e20fcc
Use 1h animations as fallback for crossbows
2018-07-10 17:02:51 +04:00
Andrei Kortunov
75dcbea365
Apply weapon reload animations only for upper body
2018-07-10 17:00:48 +04:00
Andrei Kortunov
27a5da59ba
Fix MSVC warnings C4456
2018-07-10 11:29:39 +04:00
terrabyte25
48296a7452
Update trainingwindow.cpp
2018-07-09 23:13:52 +04:00
Marc Zinnschlag
0bdd8f7d03
Merged merge request !19
2018-07-09 17:43:22 +02:00
Alexander Stillich
725cc94210
Renamed cc_install to something less cryptic (crashCatcherInstall)
2018-07-09 16:25:55 +02:00
Doc West
467989cdd5
Moved crashcatcher to a component and also use it in CS
...
Reworked debugger detection (failed on gdb 7.11), it now uses /proc to detect the debugger
2018-07-09 16:25:55 +02:00
Alexander Stillich
1177e5ac79
Issue a single dataChanged() when the modified column changes
2018-07-09 16:23:50 +02:00
Doc West
d26b5a13ef
Fixed comment
2018-07-09 16:23:50 +02:00
Doc West
01b8ce5f70
Notify views of changes in all columns when updating the ColumnId_Modification column
2018-07-09 16:23:50 +02:00
Doc West
4a6457c346
Changed the way the revert command works: it now clones the changed record and uses the new RecordBase::revert() method to restore the previous value
...
Added Flag_Dialogue_Refresh to var type and var value columns so that sub views update properly
2018-07-09 16:23:50 +02:00
Doc West
143eadb58e
Use setData() instead of emtitting dataChanged() which does not work on CI. Also Fixes the remaining issue with subviews not updating due to only the modified flag emitting a change, which prevented the widget mapper from working for updates.
2018-07-09 16:21:53 +02:00
Doc West
4780f1b2bd
Notify views of changes of all cells in a row to properly update the row after revert
2018-07-09 16:21:53 +02:00
Capostrophic
d09c327b20
Update changelog
2018-07-09 12:36:19 +03:00
Capostrophic
14d3b213a1
Fix double call of addContainerScripts on player in moveObject ( fixes #4490 )
2018-07-08 23:08:57 +03:00
Capostrophic
bded697f07
Make Goodbye block using hyperlinks
2018-07-06 19:38:36 +03:00
Marc Zinnschlag
d9de8ccb5b
Merged pull request #1781
2018-07-06 11:55:45 +02:00
Marc Zinnschlag
dd08194c75
Merged merge request !18
2018-07-06 11:37:15 +02:00
Marc Zinnschlag
7ba512b389
Merged merge request !17
2018-07-06 11:27:35 +02:00
Capostrophic
9abfabb065
Ensure forward-compatibility of death animations in old saves ( fixes #4274 )
2018-07-05 22:49:40 +03:00
Doc West
f9b565a46e
Removed QDebug include, moved updateUndoRedoAction to an anonymous namespace
2018-07-05 17:29:58 +02:00
Doc West
61109d70b1
Removed invalid / unused signal / slot connection
2018-07-05 17:21:32 +02:00
Capostrophic
faf3e9ba5a
Make spellcasting stance transition more smooth ( fixes #4358 )
...
If a movement animation was identical to the previous one that was played, restart it from the point the previous animation ended
2018-07-05 01:57:34 +03:00
Doc West
baf21362e1
Fixed undo / redo actions losing their shortcuts
2018-07-04 21:47:16 +02:00
Doc West
414f626309
Implemented search case sensitivity
2018-07-04 21:03:54 +02:00
Marc Zinnschlag
908af3720f
Merged pull request #1791
2018-07-03 09:37:51 +02:00
Marc Zinnschlag
e50c3657b3
Merged merge request !16
2018-07-03 09:05:59 +02:00
Doc West
e9cc697b60
Sort EnumDelegate values by name
2018-07-03 00:52:23 +02:00
Andrei Kortunov
f4330cf057
Editor: limit FPS in 3D preview windows (feature #3641 )
2018-07-02 12:20:34 +04:00
Thunderforge
7cbc4eeb49
Adding missing override keywords
...
Prevents compiler warnings such as this:
```
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:65:22: warning: 'onOpen' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
virtual void onOpen();
^
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:38:22: note: overridden virtual function is here
virtual void onOpen() {}
^
```
2018-07-01 19:17:50 -05:00
Finbar Crago
5d9035c6b2
[ Fixes #4482 ] Missing HandToHand on key quick key 0 (introduced in MR !11 for issue #4480 )
...
because apparently i can't count to ten...
2018-07-01 13:46:23 +10:00
Marc Zinnschlag
2ea85d0bb6
Merge remote-tracking branch 'gl_finbar-crago/fix_quickkey_segfalt'
2018-06-30 10:17:05 +02:00
Finbar Crago
09c9bd34c3
cleanup more unnecessary struct keywords...
2018-06-30 12:43:50 +10:00
Capostrophic
6e9c08083d
Add missing empty attacker checks
2018-06-29 20:35:45 +03:00
Capostrophic
bccba24c40
Make unarmed creature attacks not affect armor condition ( fixes #2455 )
2018-06-29 20:18:28 +03:00
Finbar Crago
69cd7031e7
Merge branch 'master' into fix_quickkey_segfalt
2018-06-29 23:46:36 +10:00
Finbar Crago
596be205c1
cleanup unnecessary struct keywords...
2018-06-29 23:43:51 +10:00
Finbar Crago
2722ca50fb
fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570]
2018-06-29 23:32:05 +10:00
Finbar Crago
7ae388086b
Merge branch 'master' into fix_quickkey_segfalt
2018-06-29 12:34:53 +10:00
Thunderforge
72f6b1a693
Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface"
2018-06-28 20:13:18 -05:00
Finbar Crago
ed71656ea6
fix updateActivatedQuickKey() crash
...
keyboard numbers don't start at zero...
2018-06-29 01:58:57 +10:00
Finbar Crago
24d5fb09da
fix crash on simultaneous key presses
2018-06-28 22:55:02 +10:00
Bret Curtis
f07d50e5bf
Merge pull request #1785 from akortunov/warnfix
...
Fix some GCC warnings
2018-06-28 10:33:51 +02:00
Finbar Crago
d790a27060
Merge branch 'master' into fix_quickkey_segfalt
2018-06-28 18:16:00 +10:00
Andrei Kortunov
d9a1de0ec7
Do not use deprecated function
2018-06-28 11:13:32 +04:00
Andrei Kortunov
5455490ad2
Avoid fall-through in spell selection
2018-06-28 11:12:48 +04:00
Finbar Crago
80a3f0a0d4
switch mSelectedIndex/mActivatedIndex int to mSelected/mActivated keyData pointers
2018-06-28 17:02:25 +10:00
Finbar Crago
335e2c5897
add keyData struct + general cleanup
2018-06-28 13:27:08 +10:00
Nikolay Kasyanov
5fcb091127
Replace FIXME with a detailed explanation of the issue
2018-06-27 22:40:09 +02:00
Nikolay Kasyanov
9c78364c45
Revert "Merge pull request #1771 from Xenkhan/master"
...
This reverts commit 9667dd051cf52e06fc19
2018-06-27 22:19:09 +02:00
Andrei Kortunov
ec73011617
Clean temporary storage if we assign new AI package (bug #4464 )
2018-06-27 12:52:43 +04:00
Andrei Kortunov
ee45f54b53
Refactor AiTemporaryStorage usage
2018-06-27 12:48:34 +04:00
Andrei Kortunov
3c7ab976c3
Ignore movement from scripted animations (bug #4475 )
2018-06-27 08:22:45 +04:00
Finbar Crago
cac6d59140
Merge branch 'master' into fix_quickkey_segfalt
2018-06-27 12:58:43 +10:00
Finbar Crago
43c9fd4cec
check MWWorld::Ptr != NULL for MWGui ItemPtr tooltips
2018-06-26 13:41:53 +10:00
Finbar Crago
186ec8c50f
rm ContainerStore/refItem
2018-06-26 13:35:04 +10:00
Marc Zinnschlag
705b2dca0e
Merged pull request #1777
2018-06-25 11:58:12 +02:00
Marc Zinnschlag
baeaff2309
Merged pull request #1778
2018-06-25 11:57:45 +02:00
Andrei Kortunov
97d8cc0efe
Check if the local was not found, just for sure
2018-06-25 11:21:00 +04:00
Andrei Kortunov
7dff8d8fe2
Check cell for null
2018-06-25 10:26:58 +04:00
Finbar Crago
46c6abcf54
add string vectors for name/id in QuickKeysMenu for item lookups
2018-06-25 16:02:28 +10:00
Andrei Kortunov
441463327c
Validate map size
2018-06-25 09:57:40 +04:00
Andrei Kortunov
359e748c28
Initialize some missing fields in constructors
2018-06-25 09:35:42 +04:00
Capostrophic
ecafcefae9
Fall back to regular head when getVampireHead fails
2018-06-24 14:39:48 +03:00
Capostrophic
35b0546737
Consider <p> tag when discarding post-EOL tag text (regression #4473 )
2018-06-23 14:27:40 +03:00
Finbar Crago
da4c55d5ad
prevent segfalt in QuickKeysMenu when item has been removed from player inventory
...
added a MWWorld::ContainerStore to hold item copies which are then used to find
real items with findReplacement().
(storing the RefId could be a better solution but would probably leave tooltips broken...)
2018-06-23 17:51:32 +10:00
AnyOldName3
f8e4f3fca5
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-06-22 00:11:29 +01:00
Bret Curtis
a55583a395
Merge branch 'master' into master
2018-06-21 22:22:01 +02:00
Xenkhan
405a0caf29
Remove unneeded whitespace
2018-06-20 13:56:00 -05:00
Xenkhan
5a4817c147
Get rid of reinterpret_cast<>
2018-06-20 13:33:59 -05:00
Marc Zinnschlag
22eb037c18
Merged pull request #1773
2018-06-20 19:08:50 +02:00
Bret Curtis
6655b7e512
Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression
...
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set
2018-06-20 17:19:48 +02:00
Marc Zinnschlag
6315848620
Merged merge request !2
2018-06-20 16:02:54 +02:00
Bret Curtis
b619c0de2d
Merge pull request #1772 from akortunov/deathanim
...
Fast-forward death animation to end if death animation was finished earlier
2018-06-20 13:28:36 +02:00
Andrei Kortunov
c195144b17
Take transformation from first node with given name in file (bug #4469 )
2018-06-20 14:24:32 +04:00
Atahualpa
c0fc615cd6
Adds the option to ignore "Base" records when running the verifier. ( fixes #4466 )
...
Improves previous commit:
1. Initialise mIgnoreBase boolean member with FALSE.
2. Remove isBaseOnly() function and replace with direct use of Record member.
2018-06-20 11:29:38 +02:00
Bret Curtis
664edc5a39
Merge pull request #1757 from akortunov/musicfix
...
Handle exception when try to load non-music file
2018-06-20 11:18:50 +02:00
Andrei Kortunov
c9756cee4c
Fast-forward death animation to end if death animation was finished earlier (regression #4468 )
2018-06-20 12:37:58 +04:00
AnyOldName3
553094669b
Merge upstream/master (& fix merge conflicts)
2018-06-20 00:11:23 +01:00
Atahualpa
9d61d76e92
Adds the option to ignore "Base" records when running the verifier. ( fixes #4466 )
...
Adds a boolean setting to the user preferences. This setting is locally saved to all OpenMW-CS check stages. When a verification is done, the setting is updated on setup for each check stage. If set to true, the boolean value is then used to skip the verification process for every base record - minus some special cases where, e.g., counters are to be set first.
Related issue:
- Fixes #4466 : Editor: Add option to ignore base records when running verifier (https://gitlab.com/OpenMW/openmw/issues/4466 )
Tests:
The changes were successfully tested in OpenMW-CS by creating faulty "Base" and "Modified" records for every record type (if possible) and, then, running the verifier with and without the option respectively.
2018-06-20 00:20:03 +02:00
Xenkhan
24ddb66af9
Retrieve SDL window settings instead of using magic numbers
2018-06-19 15:03:30 -05:00
Capostrophic
6c23caadd7
Fix crash when a target in a different cell is (un)locked
2018-06-19 20:43:18 +03:00
Capostrophic
0c4fa55f16
Make Open spells casted by anything trigger player crime event ( fixes #4461 )
2018-06-19 17:04:38 +03:00
Marc Zinnschlag
7cfb7063c2
Merged pull request #1767
2018-06-19 13:30:10 +02:00
Marc Zinnschlag
7be069fcd2
Merged pull request #1743
2018-06-19 13:29:20 +02:00
Andrei Kortunov
5fd3ec1035
Implement unlockable locks with 'lock 0' console command
2018-06-19 14:17:33 +04:00
Marc Zinnschlag
a8ad530db9
Merged pull request #1749
2018-06-19 11:33:08 +02:00
Marc Zinnschlag
2a52ade219
Merged pull request #1760
2018-06-19 11:26:41 +02:00
Capostrophic
8376c8c68e
Allow partial matches in NotCell condition ( fixes #4459 )
2018-06-18 03:27:31 +03:00
Bret Curtis
e93104a6b3
Merge pull request #1758 from Capostrophic/screenshot
...
Remove screenshot taken message again
2018-06-17 22:26:00 +02:00
Bret Curtis
70dec71c00
Merge pull request #1763 from akortunov/activatedoor
...
Forbid actors to use teleporting doors
2018-06-17 10:13:16 +02:00
Bret Curtis
3cc6da1db2
Update door.cpp
...
typo fix
2018-06-17 10:13:03 +02:00
Bret Curtis
3f2dbdc8a8
Merge branch 'master' into wanderfix
2018-06-17 10:00:38 +02:00
Bret Curtis
ecfc5fcd63
Merge pull request #1764 from akortunov/lightfix
...
Ignore lights without CanCarry flags when NPC selects torch
2018-06-17 08:40:50 +02:00
Andrei Kortunov
f3f7487664
Fix arguments parsing for AiWander console command (bug #4458 )
2018-06-16 22:11:10 +04:00
Andrei Kortunov
e08b0d3070
Ignore lights without CanCarry flags when NPC selects torch (bug #4457 )
2018-06-16 17:34:49 +04:00
Andrei Kortunov
2a65aaf5ab
Forbid actors to use teleporting doors (bug #2562 )
2018-06-16 14:21:28 +04:00
Nikolay Kasyanov
359f87ab9f
Change imageToSurface to return a unique_ptr to avoid manual surface cleanup
2018-06-16 12:12:32 +02:00
Bret Curtis
3f88aa46d0
Merge pull request #1759 from Thunderforge/refactor-launcher-sdl
...
Refactor SDL loading in Launcher to fix macOS errors
2018-06-15 12:58:44 +02:00
Andrei Kortunov
9c3da41130
Add murder bounty when a player follower commits murder (bug #2852 )
2018-06-15 14:31:09 +04:00
Thunderforge
506d615acc
Moving csignal import from main to graphicspage
2018-06-14 22:16:35 -05:00
Thunderforge
7615e78e52
Move SDL initialization from main.cpp to graphicspage.cpp
2018-06-14 19:39:24 -05:00
Capostrophic
1abf749f03
Remove screenshot taken message
2018-06-14 22:08:53 +03:00
Andrei Kortunov
2854f6ca83
Handle exception if we try to play non-music file (bug #4416 )
2018-06-14 21:32:40 +04:00
Miloslav Číž
477e1437d2
Resolve conflicts
2018-06-14 15:30:28 +02:00
Andrei Kortunov
49ba00a3ec
Add NPC validation to esmstore (bug #2772 )
2018-06-14 16:48:16 +04:00
Miloslav Číž
dd00e438fe
Merge branch 'screenshot360' of https://github.com/drummyfish/openmw into screenshot360
2018-06-13 21:35:03 +02:00
Miloslav Číž
7178ee3a6e
Add FIXME comment
2018-06-13 21:34:43 +02:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360
2018-06-13 21:16:28 +02:00
Marc Zinnschlag
2b35c5efd7
Merge remote-tracking branch 'upstream/master'
2018-06-13 18:13:15 +02:00
Marc Zinnschlag
aea481eacb
Merged pull request #1753
2018-06-13 18:12:38 +02:00
Marc Zinnschlag
f62df90960
Merged pull request #1572
2018-06-13 18:11:31 +02:00
Andrei Kortunov
61c968d550
Ignore broken items when search for replacement (bug #4453 )
2018-06-13 18:39:02 +04:00
Marc Zinnschlag
7ca56ccd29
set search status bar to 'no results' message when search yields no results
2018-06-13 15:48:24 +02:00
Andrei Kortunov
81b78a82e8
AI: try to open doors every AI_REACTION_TIME seconds (bug #4454 )
2018-06-13 17:47:32 +04:00
Marc Zinnschlag
7d2394273e
added statusbar to search window ( Fixes #3276 )
2018-06-13 14:55:03 +02:00
Miloslav Číž
dcfbd554bb
Remove try catch block
2018-06-13 11:12:46 +02:00
Bret Curtis
3e4dc31e39
Merge branch 'master' into fatigue
2018-06-13 10:04:32 +02:00
Marc Zinnschlag
1ba0317905
Merged pull request #1670
2018-06-13 09:02:31 +02:00
Marc Zinnschlag
48711bbdde
Merged pull request #1592
2018-06-13 08:58:06 +02:00
Miloslav Číž
c3d7ee5a9e
Resolve merge conflicts
2018-06-13 08:22:37 +02:00
Miloslav Číž
db8aaa74d6
Start cell border debug drawing
2018-06-13 01:48:31 +02:00
Andrei Kortunov
9c45cc7e48
Use player reference instead of pointer
2018-06-12 22:05:00 +04:00
Marc Zinnschlag
a3911f52a0
Merged pull request #1750
2018-06-12 19:15:14 +02:00
Marc Zinnschlag
97773697a9
Merge remote-tracking branch 'florianjw/precise-rotations'
2018-06-12 19:05:52 +02:00
Capostrophic
1c8a20a54a
Set ok button focus in settings window by default ( fixes #4368 )
2018-06-12 19:45:43 +03:00
Andrei Kortunov
f299be8158
Play scripted animations even if SkipAnim is used
2018-06-12 16:07:36 +04:00
Andrei Kortunov
25bb7c1826
Make 'PlayGroup idle' to cancel scripted animations
2018-06-12 14:04:03 +04:00
Andrei Kortunov
0e441d48ac
Give scripted animations highest priority (bug #4286 )
2018-06-12 12:55:28 +04:00
Andrei Kortunov
0c92655250
Avoid code duplication in character manager
2018-06-12 11:51:54 +04:00
Andrei Kortunov
e3812f4075
Check creature stats only for actors
2018-06-12 11:27:18 +04:00
Andrei Kortunov
b0a140e714
Disable actor collision only after end of death animation
2018-06-12 10:00:38 +04:00
Andrei Kortunov
ebaa6fb5a2
Play death scream only once
2018-06-12 09:55:43 +04:00
Andrei Kortunov
427be928d0
Do not update animation state for dead actors
2018-06-11 23:17:54 +04:00
Andrei Kortunov
977a27ecb7
Do not clear corpses until end of death animation (bug #4307 )
2018-06-11 22:29:32 +04:00
Bret Curtis
7310e3c8c2
Merge pull request #1748 from akortunov/bookfix
...
Do not show any book text after last <BR> tag
2018-06-11 17:08:26 +02:00
Andrei Kortunov
a42c663fd7
Do not interrupt scripted animations by death animation (bug #4286 )
2018-06-11 18:53:25 +04:00
Andrei Kortunov
d0619cfb35
Play death animation for non-persisting actors with 0 health (bug #4291 )
2018-06-11 18:52:20 +04:00
Andrei Kortunov
6099735c60
Early out only when scripted animation is playing
2018-06-11 17:52:58 +04:00
Andrei Kortunov
e234dd2a36
Do not interrupt scripted animations
2018-06-11 17:18:51 +04:00
Andrei Kortunov
66a46ff03c
Do not show any book text after last <BR> tag.
2018-06-11 11:22:56 +04:00
Capostrophic
d43766d3c9
Make WakeUpPC interrupt waiting if it was supposed to be ( fixes #3629 )
2018-06-10 18:42:18 +03:00
Andrei Kortunov
acd3cba5fa
Store previous items in the savegame
2018-06-10 16:21:19 +04:00
Andrei Kortunov
9fd2d57b86
Move previous items to player
2018-06-10 16:21:19 +04:00
Andrei Kortunov
f977c6876f
Bound items: store item ID instead of pointer
2018-06-10 16:21:19 +04:00
Andrei Kortunov
4de9d9fa77
Split adjustBoundItem()
2018-06-10 16:21:19 +04:00
Andrei Kortunov
d1b1cb748d
Reequip previous item only if the expired bound item was equipped
2018-06-10 16:21:19 +04:00
Andrei Kortunov
9b72a6ac69
Use the MWWorld::Ptr() instead of string ID
2018-06-10 16:21:19 +04:00
Andrei Kortunov
0375bedab2
Equip previous item after a bound item expires (bug #2326 )
2018-06-10 16:21:19 +04:00
Andrei Kortunov
ae87e0d3fc
Do not reset mUpperBodyState for weapon->weapon switch (regression #4446 )
2018-06-09 15:34:08 +04:00
Andrei Kortunov
4ba361fea6
Unhardcode sunset and sunrise settings (bug #1990 )
2018-06-09 13:09:17 +04:00
Marc Zinnschlag
7d9de93fd3
Merged pull request #1477
2018-06-09 10:52:35 +02:00
Marc Zinnschlag
551a69f1b1
Merged pull request #1559
2018-06-09 10:51:02 +02:00
Marc Zinnschlag
efb4abbb7f
Merged pull request #1623
2018-06-09 10:49:04 +02:00
Marc Zinnschlag
76972bb2f6
Merged pull request #1709
2018-06-09 10:46:02 +02:00
Thunderforge
dfa9968565
Renaming Launcher::DataFilesPage::signalSelectedFilesChanged to signalLoadedCellsChanged
2018-06-08 19:18:23 -05:00
Thunderforge
62c4eb8d6a
Explicitly flagging loaded cells changed as queued
2018-06-08 19:16:24 -05:00
Andrei Kortunov
6ed2773299
Do not stack return packages
2018-06-08 21:53:47 +04:00
Andrei Kortunov
74a2cbe696
AI: return back after pursuit
2018-06-08 21:53:47 +04:00
