Andrei Kortunov
dd6c21ad81
Merge pull request #2511 from Capostrophic/water
...
Water shader cleanup
2019-09-16 12:16:03 +04:00
Andrei Kortunov
b205aae4e1
Merge pull request #2518 from Capostrophic/activation
...
Allow objects to use their ID instead of the name for tooltip/activation checks (bug #5158 )
2019-09-16 10:53:14 +04:00
Andrei Kortunov
649a14dfae
Merge branch 'master' into activation
2019-09-16 10:52:16 +04:00
Andrei Kortunov
a7cfe5853c
Merge pull request #2522 from Capostrophic/extradata
...
Refactor NIF extra data and particle modifier handling
2019-09-16 10:19:49 +04:00
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
elsid
209e33f5ce
Open door when it is on the way to a next path point
2019-09-15 21:16:00 +02:00
elsid
653a391084
Do not open doors when actor has no path
...
When actor is not going anywhere it doesn't require to go through doors
so there is no need to open them.
2019-09-15 21:12:33 +02:00
elsid
d4b7b3e999
Check for AiPackage type before find nearby door
2019-09-15 21:12:29 +02:00
David Cernat
56f084c9c0
[Client] Fix packet spam for repetitive setting of the same global value
2019-09-15 16:10:09 +03:00
David Cernat
ceb16bb6f8
[Client] Reimplement temporary fix from c65d6c1328
...
The real reason for the crash remains to be fixed.
2019-09-14 19:41:34 +03:00
David Cernat
afa704ce95
[Server] Add OnScriptGlobalShort event
2019-09-14 13:09:01 +03:00
David Cernat
e424bd9bc3
[General] Implement ClientScriptSettings packet, part 2
...
The packet can now set which client globals get packets sent about them when their values change on clients.
2019-09-14 09:37:19 +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
Evil Eye
85d52ec183
oops
2019-09-11 22:05:24 +02:00
Alexei Dobrohotov
6128279dbf
Merge pull request #2517 from unelsson/terraintextureselection
...
[Final tests] Editor: Terrain texture selection
2019-09-11 14:09:45 +03:00
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
718dbd3f9a
Use object ID as the substitution for their name (bug #5158 )
2019-09-11 00:06:50 +03:00
Capostrophic
6b74630f6e
Preparation work
...
Phase out canBeActivated() to unify activation checks
Use getName() for the name caption in tooltips
Always use tooltips for non-activator objects
Invert hasTooltip default value
2019-09-10 23:38:16 +03:00
Capostrophic
9788a776b9
Avoid Qt "opening user openmw.cfg twice" warning
2019-09-10 22:56:04 +03:00
Evil Eye
a86a8ecc0e
Allow locking/picking just about everything
2019-09-10 21:53:26 +02:00
Nelsson Huotari
4ccb951126
move check to outermost scope
2019-09-10 12:15:19 +03:00
Nelsson Huotari
0880923189
Consistency for variable and header argument names.
2019-09-10 12:15:19 +03:00
Nelsson Huotari
6dc3d8b44b
More readable code
2019-09-10 12:15:19 +03:00
Nelsson Huotari
780055899d
Don't add empty primitive sets to geometry.
2019-09-10 12:15:19 +03:00
Nelsson Huotari
3becacf6d1
Remove globals, const int& -> int, values to const ref.
2019-09-10 12:15:19 +03:00
Nelsson Huotari
1dcee833a1
Less verbose syntax
2019-09-10 12:15:19 +03:00
Nelsson Huotari
5a143fe99d
Remove extra include
2019-09-10 12:15:19 +03:00
Nelsson Huotari
39ab449431
Only allow selection of cells in view
2019-09-10 12:15:19 +03:00
Nelsson Huotari
dc8de6c6e6
Make less copies
2019-09-10 12:15:19 +03:00
Nelsson Huotari
001ca68cc7
Remove empty lines
2019-09-10 12:15:19 +03:00
Nelsson Huotari
46ee639892
pass by const ref and other fixes
2019-09-10 12:15:19 +03:00
Nelsson Huotari
20ab7df19f
Fixes, cleanup.
2019-09-10 12:15:19 +03:00
Nelsson Huotari
1a08944a8b
Remove unused code, clarifications, optimizations
2019-09-10 12:15:19 +03:00
Nelsson Huotari
d6722c7492
Terrain texture selection, support for vertex selection
2019-09-10 12:15:19 +03:00
Evil Eye
56b6a7ada4
Fix #5155
2019-09-09 22:29:59 +02:00
David Cernat
3acfbad55d
[General] Implement ClientScriptSettings packet, part 1
...
For starters, the new packet can set which client scripts have all of their variables synchronized between players. The previous hardcoded list of IDs for synchronized scripts has been removed.
2019-09-09 10:28:35 +03:00
David Cernat
25e27ccb95
[General] Use placeholder packet ID for unused CellCreate packet
2019-09-09 10:22:20 +03:00
capostrophic
8f2ed884a5
Allow usage of more keywords as string arguments (bug #5087 )
2019-09-06 19:12:08 +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
David Cernat
ca67587b89
Add OpenMW commits up to 5 Sep 2019
...
# Conflicts:
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwworld/worldimp.hpp
2019-09-05 21:41:50 +03: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
