Andrei Kortunov
a7cfe5853c
Merge pull request #2522 from Capostrophic/extradata
...
Refactor NIF extra data and particle modifier handling
2019-09-16 10:19:49 +04:00
Andrei Kortunov
a54ba4c9a2
Merge pull request #2524 from Capostrophic/knockdown
...
Use Open action as fallback for companion activation (bug #5161 )
2019-09-16 09:35:03 +04:00
Capostrophic
480000da07
Use Open action as fallback for companion activation (bug #5161 )
2019-09-15 23:17:36 +03:00
Capostrophic
790531671a
Fix tests
2019-09-13 21:29:49 +03:00
Capostrophic
8baddefdbd
Refactor extra data and particle modifier handling
...
Objects no longer inherit from extra data class
"Controlled" harmful abstraction no longer exists
Introduced NiParticleModifier/NiParticleCollider abstractions
Extra data size reading moved into the base read() method
2019-09-13 20:26:22 +03:00
Alexei Dobrohotov
6128279dbf
Merge pull request #2517 from unelsson/terraintextureselection
...
[Final tests] Editor: Terrain texture selection
2019-09-11 14:09:45 +03:00
Andrei Kortunov
6c006c9c87
Merge pull request #2516 from Capostrophic/launcher
...
Launcher: Avoid Qt "opening user openmw.cfg twice" warning
2019-09-11 10:29:52 +04:00
Capostrophic
9788a776b9
Avoid Qt "opening user openmw.cfg twice" warning
2019-09-10 22:56:04 +03:00
Nelsson Huotari
4ccb951126
move check to outermost scope
2019-09-10 12:15:19 +03:00
Nelsson Huotari
0880923189
Consistency for variable and header argument names.
2019-09-10 12:15:19 +03:00
Nelsson Huotari
6dc3d8b44b
More readable code
2019-09-10 12:15:19 +03:00
Nelsson Huotari
780055899d
Don't add empty primitive sets to geometry.
2019-09-10 12:15:19 +03:00
Nelsson Huotari
3becacf6d1
Remove globals, const int& -> int, values to const ref.
2019-09-10 12:15:19 +03:00
Nelsson Huotari
1dcee833a1
Less verbose syntax
2019-09-10 12:15:19 +03:00
Nelsson Huotari
5a143fe99d
Remove extra include
2019-09-10 12:15:19 +03:00
Nelsson Huotari
39ab449431
Only allow selection of cells in view
2019-09-10 12:15:19 +03:00
Nelsson Huotari
dc8de6c6e6
Make less copies
2019-09-10 12:15:19 +03:00
Nelsson Huotari
001ca68cc7
Remove empty lines
2019-09-10 12:15:19 +03:00
Nelsson Huotari
46ee639892
pass by const ref and other fixes
2019-09-10 12:15:19 +03:00
Nelsson Huotari
20ab7df19f
Fixes, cleanup.
2019-09-10 12:15:19 +03:00
Nelsson Huotari
1a08944a8b
Remove unused code, clarifications, optimizations
2019-09-10 12:15:19 +03:00
Nelsson Huotari
d6722c7492
Terrain texture selection, support for vertex selection
2019-09-10 12:15:19 +03:00
Alexei Dobrohotov
2e05e0e829
Merge pull request #2514 from akortunov/guifixes
...
Generate sCrimeMessageReport only once per frame
2019-09-06 16:20:42 +03:00
Andrei Kortunov
d58f93f388
Use sayDone() only for scripting backward compatibility
2019-09-06 09:19:41 +04:00
Andrei Kortunov
c9deb1b325
Generate sCrimeMessageReport only once per frame (bug #5012 )
2019-09-05 20:16:03 +04:00
Andrei Kortunov
58be8dc976
Merge pull request #2513 from Capostrophic/crime
...
Make sure failed pick/trap attempts are a crime (bug #5149 )
2019-09-05 18:51:16 +04:00
Capostrophic
c89c14bb68
Rename objectOpened() to make its role more clear
2019-09-05 17:36:49 +03:00
Capostrophic
8317dc0709
Make sure failed pick/trap attempts are a crime (bug #5149 )
2019-09-05 17:29:49 +03:00
Alexei Dobrohotov
9ce556832e
Merge branch 'CancelDoorShutSoundWhenDoorBlocked' into 'master'
...
Bug #4270 : Cancel door sound if collision is detected and the sound is playing
See merge request OpenMW/openmw!147
2019-09-05 07:49:53 +00:00
James Stephens
bafbc0a055
Cancel door sound if collision is detected and the sound is playing
2019-09-05 07:49:53 +00:00
Alexei Dobrohotov
2daecc633e
Revert Vampirism behavior upon death to 0.45.0-like state
...
Until we figure out the better way to handle vampire stuff tangled together with post-death animation magic effect reset.
2019-09-04 16:42:34 +03:00
Andrei Kortunov
0caf192212
Merge branch 'ShowSpellMagickaCostInSpellBuyingWindow' into 'master'
...
Adds requested feature #5147 : Show spell magicka cost in spell buying window
See merge request OpenMW/openmw!144
2019-09-02 17:18:56 +00:00
James Stephens
7d3f6e1cd9
Altered process so that cost only appears on spell purchase window.
...
Added myself to authors
2019-09-02 17:18:56 +00:00
Andrei Kortunov
08614f6a87
Merge branch 'AlchemyQuestionMarkNotCentered' into 'master'
...
Fixes the offset question mark in the alchemy tooltip when the effect is not known
See merge request OpenMW/openmw!143
2019-09-02 17:13:56 +00:00
James Stephens
b33429001c
Fixes the offset question mark in the alchemy tooltip when the effect is not known
2019-09-02 17:13:56 +00:00
Andrei Kortunov
626e943c43
Merge branch 'FocusLostESCSaveConfirmationDialog' into 'master'
...
Fixes bug #4650 : Focus is lost after pressing ESC in confirmation dialog inside savegame dialog
See merge request OpenMW/openmw!145
2019-09-02 17:11:24 +00:00
James Stephens
1cd1bfca74
Fixes bug #4650
2019-09-02 16:49:29 +02:00
Alexei Dobrohotov
a8f5fe3eff
Merge pull request #2508 from akortunov/counter
...
Handle death event manually if needed before disposing a corpse
2019-08-28 13:51:38 +03:00
Roman Siromakha
3b47e9039c
Merge pull request #2509 from OpenMW/revert-2494-ai_open_door
...
Revert "[WIP] Open door when it is on the way to a next path point (bug #5073 )"
2019-08-27 20:55:33 +02:00
Roman Siromakha
41ad23ebdc
Revert "[WIP] Open door when it is on the way to a next path point (bug #5073 )"
2019-08-27 20:55:03 +02:00
Roman Siromakha
ea04fcbd09
Merge pull request #2494 from elsid/ai_open_door
...
[WIP] Open door when it is on the way to a next path point (fix bug #5073 )
2019-08-27 20:54:58 +02:00
elsid
b4ec444057
Open door when it is on the way to a next path point
2019-08-27 20:49:35 +02:00
elsid
97cd9d434a
Do not open doors when actor has no path
...
When actor is not going anywhere it doesn't require to go through doors
so there is no need to open them.
2019-08-27 20:49:35 +02:00
elsid
389f5dfb9b
Check for AiPackage type before find nearby door
2019-08-27 20:49:35 +02:00
elsid
cb0a609d59
Merge branch 'master' into HEAD
2019-08-27 20:49:12 +02:00
elsid
69b4fe8545
Revert "Open door when it is on the way to a next path point"
...
This reverts commit c32872fb16
.
2019-08-27 20:49:07 +02:00
Andrei Kortunov
b6044d231a
Handle death event manually before disposing a corpse if a death animation was not finished yet (feature #5146 )
2019-08-27 22:42:41 +04:00
Andrei Kortunov
84b3aaedaa
Merge pull request #2506 from akortunov/refactor
...
Rename getWeaponPart() function
2019-08-27 10:05:44 +04:00
Andrei Kortunov
c059bf04cc
Rename getWeaponPart() function
2019-08-27 09:55:02 +04:00
Alexei Dobrohotov
ceff1defb4
Merge pull request #2504 from elsid/door_state_enum
...
Add enum type for door state
2019-08-27 02:05:17 +03:00