1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-19 01:09:39 +00:00
Commit graph

13245 commits

Author SHA1 Message Date
Bret Curtis
0ec4e51922
Revert "Store raw data about fog of war instead of RGBA images" 2019-10-30 14:48:44 +01:00
Bret Curtis
36614dba2a
Merge pull request from akortunov/fog_compression
Store raw data about fog of war instead of RGBA images
2019-10-30 13:45:55 +01:00
David Cernat
54301f5f89 Add OpenMW commits up to 29 Oct 2019
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
#	apps/openmw/mwworld/inventorystore.cpp
2019-10-29 23:49:31 +02:00
David Cernat
bde9f7b817 Add OpenMW commits up to 20 Oct 2019
# Conflicts:
#	apps/openmw/mwgui/recharge.cpp
#	apps/openmw/mwrender/globalmap.cpp
#	apps/openmw/mwrender/globalmap.hpp
#	apps/openmw/mwworld/inventorystore.cpp
2019-10-29 22:26:35 +02:00
David Cernat
05b5a7b32d [Client] Trigger crimes when using take all on containers 2019-10-29 21:17:01 +02:00
Capostrophic
c6e431d862 Avoid copying strings in SearchVisitor and readReferenceCollection 2019-10-28 19:28:14 +03:00
Capostrophic
ee4fa93bd4 Rework prevent merchant equipping setting again 2019-10-28 01:58:23 +03:00
Andrei Kortunov
15cd305253 Reset idle animation only when play movement animation (bug ) 2019-10-27 12:33:28 +04:00
David Cernat
adcac2675a [Client] Fix warnings related to destructors for processors 2019-10-26 16:43:08 +03:00
Alexei Dobrohotov
1f616c5613
Merge pull request from akortunov/holstered_shield
Ignore shields sheathing for creatures without sheathing bone
2019-10-26 12:00:07 +03:00
Andrei Kortunov
b27089f7be
Merge pull request from Capostrophic/geteffect
Fix GetEffect result when running on dead actors
2019-10-26 12:47:58 +04:00
Andrei Kortunov
7cd4fa4706 Ignore shields sheathing for creatures without sheathing bone 2019-10-26 12:41:16 +04:00
David Cernat
c9f3ee1819 [Client] Make PlayerResurrect use new resurrection handling from 6450d84473 2019-10-26 09:12:06 +03:00
Koncord
a74bf1baec [Client] Mark derived processor classes as final
(cherry picked from commit 7748e582a8)
2019-10-24 22:16:17 +03:00
David Cernat
0e94eb8b74 [General] Use regular ints for weather states for consistency w/ OpenMW 2019-10-24 20:08:08 +03:00
Bret Curtis
2040ca5637
Merge pull request 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 from Capostrophic/enchant
Remove on-strike enchantment support for ranged weapon types (bug )
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
David Cernat
d66bca8605 [General] Modernize packet style for PlayerTopic 2019-10-23 01:24:13 +03:00
Bret Curtis
262d87846c
Merge pull request from akortunov/holstered_shield
Shields holstering support
2019-10-22 16:46:12 +02:00
Andrei Kortunov
d3a3b2f1f6 Shields holstering support (feature ) 2019-10-22 09:02:59 +04:00
Bret Curtis
36119ec2c4
Merge pull request from Capostrophic/weather
Weather-related fixes (incl. bug )
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
5d5ec1cf63
Merge pull request from elsid/fix_path_rebuild
Fix rebuild path for walking actors (Bug )
2019-10-20 16:05:29 +03:00
Capostrophic
fc7b4d73a8 Remove on-strike enchantment support for ranged weapon types (bug ) 2019-10-20 13:34:42 +03:00
Alexei Dobrohotov
85a5355e5c
Merge pull request from akortunov/ammofix
Fix OnStrike bows charges
2019-10-20 11:25:12 +03:00
Andrei Kortunov
dd781b3da2 Fix OnStrike bows charges (regression ) 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 )
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 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 ) 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 ) 2019-10-11 19:29:12 +03:00
Andrei Kortunov
19e9ece291
Merge pull request from Capostrophic/onpcequip
Set OnPCEquip properly when a race can't equip an item (bug )
2019-10-11 20:07:35 +04:00
Andrei Kortunov
67bef9a3a1
Merge pull request from Capostrophic/summon
Make sure summoned creatures are removed upon caster death ()
2019-10-11 20:06:16 +04:00
Alexei Dobrohotov
ccb557edf0
Merge pull request 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 ) 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
Andrei Kortunov
69aceb5c1e Split greetings from AiWander (bug ) 2019-10-10 09:28:40 +04:00
Alexei Dobrohotov
b7a1e6561b
Merge pull request 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 ) 2019-10-07 23:38:22 +03:00
Andrei Kortunov
c51aba0b13 Recharge items outside of player's inventory (bug ) 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 ) 2019-10-05 17:29:00 +04:00
Andrei Kortunov
2b2f63c919
Merge pull request from Capostrophic/animation
Use random attack strength if there's no wind up animation (bug )
2019-10-02 08:23:13 +04:00
Alexei Dobrohotov
6f99747fff
Merge pull request from elsid/door_stuck
Fix actors stuck in closing door (bug )
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 ) 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 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 ) 2019-09-24 22:42:04 +03:00
Andrei Kortunov
e5564df8cb Implement vanilla-style wind speed calculations (bug ) 2019-09-24 10:59:58 +04:00
Andrei Kortunov
48aba76ce9 Implement vanilla-style AiActivate (bug ) 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 ) 2019-09-22 19:59:12 +04:00
Alexei Dobrohotov
ac5491b5c2
Merge pull request from akortunov/toggleview
Improve resurrection handling
2019-09-22 02:02:03 +03:00
Andrei Kortunov
eb1245664f
Merge pull request from Capostrophic/levelledlist
Fix chance none logic for nested levelled lists (bug )
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 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 ) 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
Alexei Dobrohotov
acc4811d12
Merge branch 'master' into guifixes 2019-09-20 20:03:02 +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 ) 2019-09-20 07:27:27 +04:00
Andrei Kortunov
a4d196f33f Force view change when using Force1stPerson and Force3rdPerson commands (bug ) 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
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 ) 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 ) 2019-09-17 19:09:08 +04:00
Andrei Kortunov
4a6d2cbaff Do not allow player to take items from evidence chests (bug ) 2019-09-17 19:08:33 +04:00