David Cernat
904f804ea2
[General] Modernize packet style for PlayerSpellbook
2019-10-24 19:27:37 +03:00
Bret Curtis
2040ca5637
Merge pull request #2555 from akortunov/encoding
...
Encode ID's in all places to UTF-8
2019-10-24 00:48:12 +02:00
David Cernat
4f9e6b0e3e
[General] Modernize packet style for PlayerCellState
2019-10-23 17:46:21 +03:00
Bret Curtis
afb218fe29
Merge pull request #2564 from Capostrophic/enchant
...
Remove on-strike enchantment support for ranged weapon types (bug #5190 )
2019-10-23 15:11:36 +02:00
David Cernat
96a71c1ced
[General] Modernize packet style for PlayerBook
2019-10-23 02:02:27 +03:00
Bret Curtis
39fd12c065
Merge pull request #2568 from elsid/settings_parser_tests
...
Settings parser tests
2019-10-23 00:30:16 +02:00
David Cernat
d66bca8605
[General] Modernize packet style for PlayerTopic
2019-10-23 01:24:13 +03:00
Nelsson Huotari
c957f0544c
Remove unneeded brackets
2019-10-23 00:34:54 +03:00
Nelsson Huotari
fdc73b87ba
Remove includes that aren't needed any more
2019-10-23 00:07:41 +03:00
Nelsson Huotari
9e5db10288
const ref float -> float
2019-10-23 00:02:24 +03:00
Nelsson Huotari
ac5b356e8d
Always initialize landShapeNew
2019-10-23 00:01:23 +03:00
Nelsson Huotari
6f9f59dd58
declare cellId and cellCoords in smallest possible scope
2019-10-22 21:26:55 +03:00
Nelsson Huotari
fdcc7fa1d7
0 to nullptr
2019-10-22 21:26:55 +03:00
Nelsson Huotari
a13edbdb42
Bump shape calculation to function
2019-10-22 21:26:55 +03:00
Nelsson Huotari
8d3e7f2815
fix normals at cell edges, better coding standards
2019-10-22 21:26:55 +03:00
Nelsson Huotari
0f6ddfe8e6
change include, cleanup
2019-10-22 21:26:55 +03:00
Nelsson Huotari
12349f4e48
cleanup
2019-10-22 21:26:55 +03:00
Nelsson Huotari
c556885d71
remove unused Qt signal
2019-10-22 21:26:55 +03:00
Nelsson Huotari
deb122ffdb
Add optional post-processing (smooth/rough), add/fix tooltips.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
2d34b63b0b
Fix logic of land loading when no cell, land or landdata. Fix also draw.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
71eff60d22
Do in-class init. if possible, mLayoutSliderSize -> layoutSliderSize
2019-10-22 21:26:55 +03:00
Nelsson Huotari
a1348d94f9
add missing final specifiers
2019-10-22 21:26:55 +03:00
Nelsson Huotari
16ba32ffd5
assignments to member initialization list
2019-10-22 21:26:55 +03:00
Nelsson Huotari
c2de645c8c
override, virtual -> final, remove unused variables, public to private.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
6a3070e680
Fix shape brush setting description
2019-10-22 21:26:55 +03:00
Nelsson Huotari
8a9ca0b3ec
Generate new WNAM record based on new land heights, add comments
2019-10-22 21:26:55 +03:00
Nelsson Huotari
96be82a047
Remove terrain vertex selection and brush button when exiting editMode
2019-10-22 21:26:55 +03:00
Nelsson Huotari
8acfa2600f
Terrain shape editing related fixes
2019-10-22 21:26:55 +03:00
Nelsson Huotari
5b9debc554
use enum for mbrushshape initialization
2019-10-22 21:26:55 +03:00
Nelsson Huotari
4f9ec24e41
use enum for brushshape at scenetoolshapebrush
2019-10-22 21:26:55 +03:00
Nelsson Huotari
bae8636ec0
Fix brusshape enum values
2019-10-22 21:26:55 +03:00
Nelsson Huotari
c031543420
use enum for brush shapes
2019-10-22 21:26:55 +03:00
Nelsson Huotari
388edfd8cc
change manual memory management to std::unique_ptr
2019-10-22 21:26:55 +03:00
Nelsson Huotari
da4abcd7c1
std::set to std::unique and erase.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
6a44cae572
white iterator loop to C++11 range-based for loop.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
bccf36fdbc
Convert normals calculations mostly to osg::Vec3f
2019-10-22 21:26:55 +03:00
Nelsson Huotari
45b0f034c3
Split complex if-logic into multiple reasonably named functions
2019-10-22 21:26:55 +03:00
Nelsson Huotari
0ce971c1bb
Revert back to less aggressive component-level changes.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
69083369f8
use std::fill instead of for
2019-10-22 21:26:55 +03:00
Nelsson Huotari
3599e804e1
Fix the default value of mBrushSize
2019-10-22 21:26:55 +03:00
Nelsson Huotari
dc7dc93320
Remove unused functions, improve formatting, handle terrain edit click
2019-10-22 21:26:55 +03:00
Nelsson Huotari
1046d57190
Remove unneeded forward declarations.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
55b3fd4418
Use float calculations for circle brush, keep tool options in memory.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
23e7c71a5a
Tighter corner checking, clean-up, landSize to ESM::Land::LAND_SIZE.
2019-10-22 21:25:10 +03:00
Nelsson Huotari
8f3c22ccc3
Remove TerrainShapeMode::fixEdges
2019-10-22 21:25:10 +03:00
Nelsson Huotari
1a3fc435b9
Fix alterHeight bugs, don't let broken land edit pass.
2019-10-22 21:25:10 +03:00
Nelsson Huotari
ff18595a86
Reduce code duplification, add bool value to limiting
2019-10-22 21:25:10 +03:00
Nelsson Huotari
60c0a25004
Fix smooth tool and flatten tool. Default tool strength to 8.
2019-10-22 21:25:10 +03:00
Nelsson Huotari
54e13954e8
Improve land steepness limiting code
2019-10-22 21:25:10 +03:00
Nelsson Huotari
4a2d8aaf97
Handle mBrushSize 1.
2019-10-22 21:25:10 +03:00
Nelsson Huotari
16138fc896
Transient land shape editing
2019-10-22 21:25:10 +03:00
Bret Curtis
262d87846c
Merge pull request #2047 from akortunov/holstered_shield
...
Shields holstering support
2019-10-22 16:46:12 +02:00
Andrei Kortunov
d3a3b2f1f6
Shields holstering support (feature #5193 )
2019-10-22 09:02:59 +04:00
elsid
862f50346c
Add tests for settings parser
2019-10-21 22:47:24 +02:00
Bret Curtis
36119ec2c4
Merge pull request #2562 from Capostrophic/weather
...
Weather-related fixes (incl. bug #4783 )
2019-10-21 21:56:02 +02:00
David Cernat
0206d1813c
[General] Modernize packet style for PlayerQuickKeys
2019-10-21 16:55:21 +03:00
David Cernat
4f98d67ed4
[General] Modernize packet style for PlayerJournal
2019-10-21 07:01:36 +03:00
Alexei Dobrohotov
678970b01d
Merge pull request #2565 from elsid/update_recastnavigation
...
Update recastnavigation
2019-10-21 02:51:28 +03:00
elsid
045ceeac11
Replace foreach macro by for-loop
2019-10-20 20:08:16 +02:00
elsid
07660b5605
Fix detournavigator tests
2019-10-20 18:59:14 +02:00
Alexei Dobrohotov
5d5ec1cf63
Merge pull request #2550 from elsid/fix_path_rebuild
...
Fix rebuild path for walking actors (Bug #5181 )
2019-10-20 16:05:29 +03:00
Capostrophic
fc7b4d73a8
Remove on-strike enchantment support for ranged weapon types (bug #5190 )
2019-10-20 13:34:42 +03:00
Alexei Dobrohotov
85a5355e5c
Merge pull request #2563 from akortunov/ammofix
...
Fix OnStrike bows charges
2019-10-20 11:25:12 +03:00
Andrei Kortunov
dd781b3da2
Fix OnStrike bows charges (regression #5191 )
2019-10-20 10:21:47 +04:00
elsid
e4d0af6a6d
Use z coordinate for path distance when diff by z is greater then actor height
2019-10-19 22:01:32 +02:00
Capostrophic
43b1b9dfa2
Weather-related fixes (incl. bug #4783 )
...
Simplify some calculations
Fix Blizzard weather direction
Fix sky direction during storm
2019-10-19 22:47:21 +03:00
elsid
81832f8e17
Reuse distance functions
2019-10-19 12:51:37 +02:00
bzzt
1316816148
fix #5176
2019-10-18 13:37:00 +00:00
Alexei Dobrohotov
dec64a7fba
Fix typos in invalid spell effect warnings, clarify them
2019-10-17 23:45:27 +03:00
David Cernat
1ab5916078
[Client] Reorder RecordHelper's overrideRecord() methods alphabetically
2019-10-17 06:58:56 +03:00
David Cernat
520cedb553
[Client] Use overrideRecord name for related functions in RecordHelper
2019-10-16 18:05:52 +03:00
David Cernat
2fc50d7280
[Client] Fix includes for RecordHelper
2019-10-16 15:34:25 +03:00
David Cernat
aa06056d00
[Client] Add createRecord() function to RecordHelper
2019-10-16 13:14:32 +03:00
David Cernat
13deaa88f2
[Client] Fix typo in code used for setting creature base inventories
2019-10-15 08:49:32 +03:00
David Cernat
835ae816a1
[Client] Use a template to combine RecordHelper's existence checks
2019-10-15 08:47:54 +03:00
David Cernat
17020fc13a
[Client] Use a template to combine RecordHelper override functions
2019-10-15 07:21:48 +03:00
Andrei Kortunov
6e6d6d7bda
Use forward declaration
2019-10-14 15:40:35 +04:00
Andrei Kortunov
606b73ee96
Use rain settings from openmw.cfg (bug #4262 )
2019-10-13 22:32:23 +04:00
David Cernat
d113f81237
[Client] Set correct worldspace for cell overrides in RecordHelper
2019-10-13 13:42:03 +03:00
Capostrophic
bc5d54a161
Fix GetEffect result when running on dead actors
2019-10-12 19:06:10 +03:00
Andrei Kortunov
31e78ed41f
Rework 'prevent merchant equipping' feature
2019-10-12 14:17:03 +04:00
David Cernat
02bca3f52d
[Client] Fix if check in ObjectList::setMemberShorts()
2019-10-11 21:53:53 +03:00
David Cernat
19418f4953
[Client] Don't ignore entire Actor packet if one actor can't be found
2019-10-11 21:29:21 +03:00
Capostrophic
ce943b4f9e
Make enchantments affect all actors with an inventory (bug #5186 )
2019-10-11 19:29:12 +03:00
Andrei Kortunov
19e9ece291
Merge pull request #2551 from Capostrophic/onpcequip
...
Set OnPCEquip properly when a race can't equip an item (bug #5182 )
2019-10-11 20:07:35 +04:00
Andrei Kortunov
67bef9a3a1
Merge pull request #2554 from Capostrophic/summon
...
Make sure summoned creatures are removed upon caster death (#5183 )
2019-10-11 20:06:16 +04:00
Alexei Dobrohotov
ccb557edf0
Merge pull request #2552 from akortunov/greeting
...
Split greetings from AiWander
2019-10-11 02:11:46 +03:00
Alexei Dobrohotov
cdbe58c33a
Merge branch 'master' into windspeed
2019-10-11 02:04:30 +03:00
Andrei Kortunov
2fc819cdae
Encode ID's in all places to UTF-8 (bug #3977 )
2019-10-10 20:52:32 +04:00
Capostrophic
e9009f8d10
Make sure summoned creatures are removed upon caster death
2019-10-10 17:57:45 +03:00
Nelsson Huotari
78f2a5181d
Default brush size to 1
2019-10-10 14:27:22 +03:00
Nelsson Huotari
fbb9800e89
Better terrain texture ID handling
2019-10-10 14:27:22 +03:00
Nelsson Huotari
301c05662b
assignment to memb. init. list, publics to private, virtual -> final
2019-10-10 14:27:22 +03:00
Andrei Kortunov
69aceb5c1e
Split greetings from AiWander (bug #4594 )
2019-10-10 09:28:40 +04:00
Alexei Dobrohotov
b7a1e6561b
Merge pull request #2080 from akortunov/recharge
...
Recharge items outside of player inventory
2019-10-09 23:37:10 +03:00
David Cernat
d163f1b6da
[General] Turn WorldKillCount into a Worldstate packet
...
Rename the old WorldKillCount that was a Player packet into PlayerPlaceholder. Rename the unused CellCreate that was a Worldstate packet into WorldKillCount. On the server, move kill count-related script functions from QuestFunctions to WorldstateFunctions.
2019-10-08 11:09:08 +03:00
Capostrophic
c718f89325
Set OnPCEquip properly when a race can't equip an item (bug #5182 )
2019-10-07 23:38:22 +03:00
Andrei Kortunov
c51aba0b13
Recharge items outside of player's inventory (bug #4077 )
2019-10-07 22:59:43 +04:00
elsid
d1d6ba3ed0
Fix rebuild path for walking actors
...
Ignore z coordinate for not swimming nor flying actors to calculate
distance from actor destination to last path point. If walking actor
destination point is floating above the ground then a point on navmesh
may be too far away when z coordinate is included. In this case path
will be rebuild on each AI_REACTION_TIME.
2019-10-07 20:25:07 +02:00
Andrei Kortunov
f75f9cb337
Use localized faction name when using TFH
2019-10-07 12:14:22 +04:00
David Cernat
4a34666c59
Add OpenMW commits up to 7 Oct 2019
...
# Conflicts:
# apps/openmw/mwmechanics/aiactivate.cpp
2019-10-07 08:19:21 +03:00
Andrei Kortunov
f0b73e0a27
Do not store owners for items in container stores (bug #1933 )
2019-10-05 17:29:00 +04:00
Andrei Kortunov
2b2f63c919
Merge pull request #2538 from Capostrophic/animation
...
Use random attack strength if there's no wind up animation (bug #5059 )
2019-10-02 08:23:13 +04:00
Alexei Dobrohotov
6f99747fff
Merge pull request #2507 from elsid/door_stuck
...
Fix actors stuck in closing door (bug #5138 )
2019-10-01 22:39:58 +03:00
elsid
7fbc696d44
Change angle direction by rolling dice to avoid rotating door
2019-09-29 13:44:06 +02:00
elsid
6253d2a7ac
Undo door rotation once
2019-09-29 13:42:51 +02:00
Andrei Kortunov
ca46da8b04
Do not stack initially added scripted items (bug #5136 )
2019-09-29 13:08:52 +04:00
David Cernat
031acffcbe
[General] Implement cell records for RecordDynamic packets, part 1
...
New interior cells can be now be created that are either blank or based on existing interior cells.
2019-09-28 13:12:48 +03:00
David Cernat
18a7ac5940
[Client] Make it possible to override Cell records in ESMStore
2019-09-28 13:10:43 +03:00
David Cernat
0b85829e38
[Client] Make it possible to unload Cells & clear CellStores from World
2019-09-28 13:09:03 +03:00
Alexei Dobrohotov
e744090339
Merge pull request #2535 from akortunov/activate
...
Implement vanilla-style AiActivate
2019-09-26 00:42:43 +03:00
Capostrophic
4d381d0804
Use random attack strength if there's no wind up anim (bug #5059 )
2019-09-24 22:42:04 +03:00
Andrei Kortunov
e5564df8cb
Implement vanilla-style wind speed calculations (bug #4449 )
2019-09-24 10:59:58 +04:00
Andrei Kortunov
48aba76ce9
Implement vanilla-style AiActivate (bug #4456 )
2019-09-24 09:30:39 +04:00
Capostrophic
421a9d2e50
[Regression] Fix pickpocket crashes
2019-09-23 23:56:37 +03:00
David Cernat
339428872e
[Client] Fix infinite loop in CellController
...
Previously, using CellController::getCellStore() to get an unloaded CellStore would make its references get loaded in the process, with the CellStore's loadRefs() then running updateMergedRefs(), which in turn – before getting as far as setting the CellStore's state to State_Loaded – would call CellController::hasLocalAuthority() on its accompanying ESM::Cell, which would then run CellController::isActiveWorldCell(), which would then run CellController::getCellStore() to get the CellStore again, which – still being marked as unloaded – would run the whole loop again... and again.
2019-09-23 21:18:38 +03:00
David Cernat
d4df2948dd
[Client] Use clearer wording for comment in GUIController
2019-09-23 20:30:33 +03:00
David Cernat
219f0cb88e
[Client] Fix typo in 56f084c9c0
by using correct function
2019-09-23 07:55:16 +03:00
Andrei Kortunov
b360deaec3
Store raw data about fog of war instead of RGBA images (bug #5108 )
2019-09-22 19:59:12 +04:00
Alexei Dobrohotov
ac5491b5c2
Merge pull request #2534 from akortunov/toggleview
...
Improve resurrection handling
2019-09-22 02:02:03 +03:00
Andrei Kortunov
eb1245664f
Merge pull request #2533 from Capostrophic/levelledlist
...
Fix chance none logic for nested levelled lists (bug #5169 )
2019-09-21 20:58:13 +04:00
Andrei Kortunov
6450d84473
Improve resurrection handling
2019-09-21 20:22:45 +04:00
Andrei Kortunov
0ff8e83a39
Merge pull request #2532 from Assumeru/undefined
...
Fix undefined behaviour
2019-09-21 18:35:08 +04:00
Evil Eye
3d3ffdfcd8
override eraseStatic for dialogue
2019-09-21 16:24:05 +02:00
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
acc4811d12
Merge branch 'master' into guifixes
2019-09-20 20:03:02 +03:00
okdshin
c15b3377da
[General] Add PicoSHA2 hash generator to extern
2019-09-20 10:25:34 +03: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
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
fb87778493
Merge branch 'master' into organic-locks
2019-09-18 20:36:40 +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
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
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
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