1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-22 00:23:51 +00:00
Commit graph

17824 commits

Author SHA1 Message Date
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
David Cernat
adcac2675a [Client] Fix warnings related to destructors for processors 2019-10-26 16:43:08 +03:00
David Cernat
b97322b4b1 [General] Modernize packet style for PlayerInventory 2019-10-26 14:01:08 +03:00
David Cernat
cbe58b1c24 [General] Modernize packet style for PlayerFaction 2019-10-26 11:42:40 +03: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
David Cernat
904f804ea2 [General] Modernize packet style for PlayerSpellbook 2019-10-24 19:27:37 +03:00
David Cernat
4f9e6b0e3e [General] Modernize packet style for PlayerCellState 2019-10-23 17:46:21 +03: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
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
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
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
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
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
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