Alexei Dobrohotov
133b99bf18
Merge pull request #2622 from akortunov/testcells
...
Implement TestCells and TestInteriorCells console commands
2019-12-29 14:27:48 +03:00
Andrei Kortunov
d57253c5e2
Do not use the QStringList::fromSet, which is deprecated since Qt 5.14
2019-12-28 21:38:49 +04:00
Alexei Dobrohotov
2693598d82
Merge pull request #2642 from akortunov/warnfix2
...
Add safety checks for door state
2019-12-23 21:22:56 +03:00
Alexei Dobrohotov
dfcc6d8b5a
Merge pull request #2640 from akortunov/save
...
Do not store gold-specific value for everything
2019-12-23 21:22:26 +03:00
Andrei Kortunov
24044b08e0
Do not store gold-specific value for everything
2019-12-23 19:34:57 +04:00
Andrei Kortunov
88a695f251
Add safety checks for door state
2019-12-23 19:29:12 +04:00
Andrei Kortunov
1f91c56472
Merge pull request #2645 from akortunov/master
...
Make R&D patch more noticable
2019-12-23 10:54:56 +04:00
Andrei Kortunov
fd17a5acf4
Make R&D patch more noticable
2019-12-23 10:51:25 +04:00
Andrei Kortunov
24ce242941
Implement TestCells (feature #5219 )
2019-12-22 11:13:42 +04:00
Andrei Kortunov
31c5c6d993
Merge pull request #2644 from akortunov/master
...
Initialize variables to avoid GCC warnings
2019-12-22 10:46:02 +04:00
Andrei Kortunov
cd81f81fb6
Initialize variables to avoid GCC warnings
2019-12-22 10:44:14 +04:00
Andrei Kortunov
c308498621
Merge pull request #2643 from akortunov/master
...
[Regression] Fix build on Qt4
2019-12-22 10:33:58 +04:00
Andrei Kortunov
089548cdc4
Fix build on Qt4
2019-12-22 10:31:32 +04:00
Andrei Kortunov
82308dacbb
Merge pull request #2641 from akortunov/cmake
...
Attempt to fix MacOS CI
2019-12-21 13:18:39 +04:00
Andrei Kortunov
ed31b8c467
Attempt to fix MacOS CI
2019-12-21 12:27:56 +04:00
David Cernat
ca9cd90a4d
Add OpenMW commits up to 20 Dec 2019
...
# Conflicts:
# apps/openmw/mwworld/scene.cpp
2019-12-20 15:43:50 +02:00
Andrei Kortunov
30a18c2a66
Merge pull request #2625 from Capostrophic/sneaking
...
[Regression] Attempt to fix idle state reset again
2019-12-20 14:32:22 +04:00
Andrei Kortunov
2f133000e0
Merge pull request #2639 from akortunov/warnfix2
...
Make dtMeshTile POD
2019-12-20 14:27:28 +04:00
Andrei Kortunov
e1958b671e
Make dtMeshTile POD
2019-12-20 14:16:39 +04:00
Andrei Kortunov
545922f613
Merge pull request #2612 from akortunov/warnfix2
...
Fix most of deprecated API usage
2019-12-20 14:06:06 +04:00
Andrei Kortunov
78450312bf
Fix the last warning about deprecated Qt functions
2019-12-20 13:36:32 +04:00
Andrei Kortunov
47a13f1ed2
Do not use deprecated Qt API in the launcher
2019-12-20 12:59:56 +04:00
Andrei Kortunov
e44021b369
Fix most of deprecated API usage in the editor
2019-12-20 12:59:56 +04:00
David Cernat
32c7406eda
[General] Implement OnObjectHit packet, part 3
...
Include damage, block states and knockdown states in ObjectHit packets about successful hits. Add serverside script functions for reading that information.
2019-12-19 13:53:18 +02:00
David Cernat
c18aab5357
[General] Use default values of 0 for Attack floats in BaseStructs
2019-12-19 13:51:10 +02:00
David Cernat
868ad2b78f
[General] Use default value of false for Attack booleans in BaseStructs
2019-12-19 13:38:05 +02:00
Andrei Kortunov
cca69f54e7
Merge pull request #2638 from akortunov/master
...
Fix ESMTool build
2019-12-19 15:23:34 +04:00
Andrei Kortunov
5220177ebc
Fix ESMTool build
2019-12-19 15:21:49 +04:00
Assumeru
737aa1e4e8
Remove FactionID editing from OpenCS ( #2636 )
...
* Remove FactionID editing
* remove useless comments
* rename FactionID to Unknown
2019-12-18 20:42:54 +03:00
Assumeru
dfbe0021a5
Change rescaling to be more inline with vanilla ( fixes #5214 ) ( #2635 )
...
* move rescaling to loadData
* clamp on save
2019-12-18 19:37:45 +03:00
Alexei Dobrohotov
f3e8fbfded
Merge branch 'range-safety' into 'master'
...
Make script literal lookup functions safer
See merge request OpenMW/openmw!113
2019-12-18 15:27:49 +00:00
Alexei Dobrohotov
c3073f3225
Merge pull request #2634 from akortunov/textures
...
Make TextureProperty warnings more informative
2019-12-15 16:28:10 +03:00
Alexei Dobrohotov
9dc8fecdb3
Merge pull request #2633 from akortunov/equip
...
Improve equipment logic
2019-12-15 16:27:09 +03:00
Andrei Kortunov
c41562fa27
Make TextureProperty warnings more informative
2019-12-15 13:56:20 +04:00
David Cernat
2249450b0e
[Client] Fix inability for actors to talk to players caused by 4118b20608
2019-12-15 11:50:15 +02:00
David Cernat
9763f6f9c5
[Client] Fix infinite activation loops caused by 48aba76ce9
2019-12-15 07:23:37 +02:00
Andrei Kortunov
d712d6b8ce
Merge pull request #2632 from Capostrophic/controllers
...
Avoid working with empty controller data (bug #5229 )
2019-12-14 22:51:22 +04:00
Andrei Kortunov
97ee4bc349
Improve equipment logic (bug #5223 )
2019-12-14 22:30:27 +04:00
Capostrophic
909c8ef0ea
Avoid working with empty controller data (bug #5229 )
2019-12-14 20:35:23 +03:00
David Cernat
bc093c8596
[General] Implement OnObjectHit packet, part 2
...
ObjectHit is now also sent when local actors succeed or fail in hitting other actors with melee attacks, with the packet including the success state of their attack.
It is also sent when creatures hit a non-actor object.
2019-12-13 14:00:51 +02:00
David Cernat
96049befe9
[Client] Add and use getObjectFromPtr() method in ObjectList
2019-12-13 13:07:21 +02:00
Andrei Kortunov
abe7d25844
Merge pull request #2631 from Capostrophic/falldamage
...
Disallow resting if the fall height hasn't been reset (bug #4802 )
2019-12-12 21:53:02 +04:00
Capostrophic
483b37bb3f
Disallow resting if the fall height hasn't been reset (bug #4802 )
2019-12-12 15:26:02 +03:00
Alexei Dobrohotov
0a32850441
Merge pull request #2630 from akortunov/reputation
...
Cap reputation values
2019-12-11 14:58:20 +03:00
Andrei Kortunov
3d9c42e8ee
Cap reputation values (bug #5226 )
2019-12-11 08:47:46 +04:00
Alexei Dobrohotov
150a1e735f
Merge pull request #2629 from akortunov/shapes
...
Handle NiKeyframeController for NiTriShape
2019-12-10 16:17:01 +03:00
Andrei Kortunov
5b5c52d92e
Handle NiKeyframeController for NiTriShape (feature #5224 )
2019-12-10 16:20:27 +04:00
Andrei Kortunov
1e62115800
Merge pull request #2628 from Capostrophic/launcher
...
Launcher: improve first run and missing game data dialogues (bug #4009 )
2019-12-09 10:43:06 +04:00
David Cernat
e98e57c797
[General] Reorder enums alphabetically in RECORD_TYPE
2019-12-08 17:23:14 +02:00
David Cernat
2973cc4f4d
[General] Implement OnObjectHit packet, part 1
...
ObjectHit is now sent when an NPC hits a non-actor object.
2019-12-08 16:14:01 +02:00