Capostrophic
7c9a9d7de0
Fix chance none logic for nested levelled lists (bug #5169 )
2019-09-21 14:30:38 +03:00
David Cernat
6828d83a42
[Client] Always hash input for password dialogs
...
Additionally, clean up repetitive code in GUIController.
2019-09-21 14:26:02 +03:00
David Cernat
3903ac6526
[Server] Add script functions for getting SHA256 hashes & random strings
2019-09-21 14:22:19 +03:00
Alexei Dobrohotov
2d20905d93
Merge pull request #2531 from akortunov/guifixes
...
Check if related menus are allowed when using cycle hotkeys
2019-09-20 20:04:51 +03:00
Alexei Dobrohotov
acc4811d12
Merge branch 'master' into guifixes
2019-09-20 20:03:02 +03:00
Alexei Dobrohotov
3c49bed393
Merge pull request #2530 from akortunov/toggleview
...
Force view change when using Force1stPerson and Force3rdPerson commands
2019-09-20 18:46:12 +03:00
okdshin
c15b3377da
[General] Add PicoSHA2 hash generator to extern
2019-09-20 10:25:34 +03:00
Andrei Kortunov
1f3f3dd1a5
Merge pull request #2526 from Capostrophic/config
...
openmw.cfg-related fixes (incl. bug 2976)
2019-09-20 09:09:38 +04:00
Andrei Kortunov
e6b79d100a
Merge pull request #2503 from Capostrophic/keyword
...
Allow usage of more keywords as string arguments (bug #5087 )
2019-09-20 07:38:57 +04:00
Andrei Kortunov
7cb6a9c1e9
Do not allow to use quick keys during chargen
2019-09-20 07:27:34 +04:00
Andrei Kortunov
1bddbbcfa0
Check if related menus are allowed when using cycle hotkeys (bug #5167 )
2019-09-20 07:27:27 +04:00
Andrei Kortunov
a4d196f33f
Force view change when using Force1stPerson and Force3rdPerson commands (bug #5168 )
2019-09-19 21:48:43 +04:00
David Cernat
7caa6cd8fe
[Client] Prevent ActorAI spam from actors starting combat in scripts
2019-09-19 13:58:01 +03:00
David Cernat
ca21bc35c2
[Server] Add script functions that read & send ScriptGlobalShort packets
2019-09-19 08:46:54 +03:00
David Cernat
0d51eb5b23
[General] Use unsigned ints for refNums & mpNums in packets
2019-09-19 08:44:33 +03:00
David Cernat
cc25612b8d
Add OpenMW commits up to 18 Sep 2019
...
# Conflicts:
# apps/openmw/mwclass/container.cpp
# apps/openmw/mwclass/door.cpp
# apps/openmw/mwmechanics/security.cpp
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/miscextensions.cpp
2019-09-18 23:46:08 +03:00
Alexei Dobrohotov
13a0b3bf5a
Merge pull request #2515 from Assumeru/organic-locks
...
Fix #5155
2019-09-18 20:39:52 +03:00
Alexei Dobrohotov
fb87778493
Merge branch 'master' into organic-locks
2019-09-18 20:36:40 +03:00
Alexei Dobrohotov
6f2aaf156e
Merge pull request #2527 from akortunov/resurrect
...
Continue scripts execution after player's death
2019-09-17 21:49:08 +03:00
Andrei Kortunov
94a281370f
Continue scripts execution after player's death (bug #5166 )
2019-09-17 22:40:51 +04:00
Evil Eye
32de86d114
merge master
2019-09-17 20:31:53 +02:00
Evil Eye
7c8b82f45c
move locking behaviour to cellref
2019-09-17 20:30:37 +02:00
Capostrophic
3a912485ca
openmw.cfg-related fixes
...
Make sure the defaults exist in local openmw.cfg too
Make sure constant attenuation settings are defined now that they are implemented
Fix config file loading order once and for all (bug #2976 )
2019-09-17 21:26:06 +03:00
Alexei Dobrohotov
d3284c0331
Merge pull request #2525 from akortunov/factionowner
...
Improve faction items handling
2019-09-17 18:14:37 +03:00
Andrei Kortunov
85bb4a76f6
Improve faction items handling (bug #5164 )
2019-09-17 19:09:08 +04:00
Andrei Kortunov
4a6d2cbaff
Do not allow player to take items from evidence chests (bug #3609 )
2019-09-17 19:08:33 +04:00
Andrei Kortunov
271d8e6d74
Merge pull request #2521 from Capostrophic/material
...
Support target color in NiMaterialColorController (bug #5159 )
2019-09-17 19:04:56 +04:00
Capostrophic
83f61d1636
Support target color in NiMaterialColorController (bug #5159 )
2019-09-16 22:31:18 +03:00
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
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
