David Cernat
a3f304107b
Add OpenMW commits up to 2 May 2021
...
# Conflicts:
# components/CMakeLists.txt
2021-05-02 20:55:49 +02:00
Andrei Kortunov
33b8233887
Validate GUI scaling and place it to the launcher
2021-04-15 15:18:32 +04:00
David Cernat
cedf70f367
Add OpenMW commits up to 13 Apr 2021
...
# Conflicts:
# .travis.yml
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/summoning.cpp
# apps/openmw/mwphysics/mtphysics.hpp
2021-04-13 23:52:37 +02:00
Andrei Kortunov
903b89a0ff
Add bound for UI scale factor, as it specified in docs
2021-04-10 11:21:53 +04:00
David Cernat
68837aaf4a
Add OpenMW commits up to 15 Oct 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/mwgui/containeritemmodel.cpp
# apps/openmw/mwgui/tradewindow.cpp
# apps/openmw/mwphysics/actor.cpp
# apps/openmw/mwworld/actionteleport.cpp
# apps/openmw/mwworld/containerstore.cpp
2020-10-15 19:51:39 +02:00
Alexei Dobrohotov
39678c74bf
Add many more godmode checks to harmful magic (bug #5633 )
2020-10-09 20:36:51 +03:00
David Cernat
a20f8e77dc
Add OpenMW commits up to 25 Apr 2020
...
# Conflicts:
# .travis.yml
# apps/openmw/mwclass/container.cpp
# apps/openmw/mwclass/door.cpp
2020-04-25 09:52:58 +03:00
Capostrophic
dab09180ae
Make sure non-carriable light sources can't be picked up
2020-04-20 22:13:37 +03:00
David Cernat
25a632c650
Add OpenMW commits up to 13 Apr 2020
...
# Conflicts:
# CMakeLists.txt
# README.md
# apps/openmw/engine.cpp
# apps/openmw/mwclass/creaturelevlist.cpp
# apps/openmw/mwgui/quickkeysmenu.cpp
2020-04-13 19:53:42 +03:00
Capostrophic
96a447ee3a
Show the soulgem soul in count dialog (feature #5362 )
2020-04-12 11:55:00 +03:00
David Cernat
43e7df6df8
Add OpenMW commits up to 11 Mar 2020
2020-03-11 22:17:17 +02:00
Capostrophic
54334932d9
Move user string assignment to layout files
2020-03-02 02:36:16 +03:00
Capostrophic
4b17d5da43
Make search fields behave more consistently
2020-02-25 18:26:25 +03:00
Alexei Dobrohotov
3f64d98305
Merge branch 'inventorysearch' into 'master'
...
Item search in inventory redux
See merge request OpenMW/openmw!158
2020-02-24 18:14:40 +00:00
Frederic Chardon
78d58a344d
Item search in inventory (feature #4831 )
2020-02-24 18:14:40 +00:00
Capostrophic
cfa877b109
Make PCSkipEquip and OnPCEquip behavior vanilla-like (bug #4141 )
2020-02-21 21:18:54 +03:00
David Cernat
59a38164ea
[Client] Add generic objects to ObjectList using addObjectGeneric()
2020-01-23 09:03:40 +02:00
David Cernat
989188c171
[Client] Remove ObjectList's confusing addObjectDelete() function
2020-01-22 14:35:51 +02:00
David Cernat
56c3ef71ae
[Client] Send ObjectDelete packets when picking up items once again
...
When fixing problems with ObjectActivate in 49fa35a516
, I mistakenly made it so the picking up of items no longer also sent ObjectDelete packets. That is now fixed.
2019-11-30 08:13:22 +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
Capostrophic
c718f89325
Set OnPCEquip properly when a race can't equip an item (bug #5182 )
2019-10-07 23:38:22 +03:00
David Cernat
b57c0bcafe
Add OpenMW commits up to 6 June 2019
...
# Conflicts:
# apps/openmw/mwgui/hud.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/waitdialog.cpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwworld/worldimp.hpp
2019-08-22 11:42:02 +03:00
David Cernat
fba07194cf
Add OpenMW commits up to 29 Oct 2018
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
2019-08-20 13:15:00 +03:00
David Cernat
889bcec7f8
Add OpenMW commits up to 1 Sep 2018
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwclass/creature.cpp
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/difficultyscaling.cpp
# apps/openmw/mwscript/transformationextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
2019-08-20 11:31:51 +03:00
David Cernat
84cab59057
Add OpenMW commits up to 19 Aug 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/main.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/misc/debugging.hpp
2019-08-20 10:06:15 +03:00
David Cernat
49fa35a516
[Client] Use ObjectActivate packets when picking up items from inventory
2019-06-09 01:00:01 +03:00
Andrei Kortunov
c5ac580e74
Allow to maximize windows via Shift + Double Click (feature #3999 )
2019-05-01 20:15:11 +04:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
David Cernat
3bd8aa82fe
[General] Reduce inventory-sending hooks to just 2 in ContainerStore
...
Whenever an item is added to or removed from the player's ContainerStore, that player sends a PlayerInventory packet with just that addition or removal.
This eliminates all the unnecessary packet spam related to oversized PlayerInventory packets that had existed in one form or another since the initial implementation of inventory sync in 1b259e2d33
Additionally, move booleans from BasePlayer to LocalPlayer when they are only needed on the client, and make the usage of the isReceivingQuickKeys boolean consistent with the new isReceivingInventory boolean by having them both in the processors of their associated packets.
2018-08-28 05:01:52 +03:00
Andrei Kortunov
8fa6c6f726
Update pinned windows in-game (bug #4560 )
2018-08-27 09:44:04 +04:00
Capostrophic
3f76f1d3ed
Fix gold count calculation in pickupObject (bug #4604 )
2018-08-22 22:35:22 +03:00
David Cernat
03832f933b
[Client] Send only individual items in PlayerInventory packets
...
For a long time, whenever a PlayerInventory packet was sent, it contained all the items in the player's inventory, because that's how Koncord originally implemented it and I always had too many other priorities to go back and rework it.
From now on, clients only send PlayerInventory packet with the one item added or removed, with the single exception being trading with merchants, where the entire inventory is still sent for the time being.
2018-08-21 10:10:06 +03:00
David Cernat
a083439139
Merge pull request #469 from davidcernat/master while resolving conflicts
...
# Conflicts:
# apps/openmw/main.cpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
2018-08-20 14:08:44 +03:00
Capostrophic
372697489b
Fix Equip command infinite loop (bug #3072 )
2018-08-17 02:52:18 +03:00
David Cernat
8df08c7d10
[General] Implement PlayerItemUse packet
...
Players can no longer unilaterally use items on themselves in their inventory. When they try to use an item, they send a PlayerItemUse packet to the server with the item's details. A serverside script can then check the item and either send the packet back to make the item use go through or drop it.
2018-08-09 18:25:20 +03:00
Andrei Kortunov
0f2c3ecb17
Rescale player avatar (bug #4539 )
2018-07-30 17:41:43 +04:00
David Cernat
36ac2d9de4
[Client] Set packetOrigin for all ObjectList packets sent
2018-07-23 01:39:43 +03:00
David Cernat
6cb5ac6e63
Merge pull request #457 from OpenMW/master while resolving conflicts
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
2018-07-14 03:57:05 +03:00
Andrei Kortunov
c77c50e92b
Make Equip console command to bypass most of restrictions (bug #4460 )
2018-07-11 00:06:21 +04:00
David Cernat
78234f9071
[General] Rename Event into ObjectList & WorldObject into BaseObject
2018-05-13 00:42:24 +03:00
David Cernat
17678ee60f
Merge pull request #407 from OpenMW/master
...
Add OpenMW commits up to 17 Apr 2018
2018-04-17 15:25:28 +03:00
Andrei Kortunov
174b3d2249
Reset an inventory filter after reload or a new game start (bug #4392 )
2018-04-13 09:19:49 +04:00
David Cernat
9e10eb9c84
Merge pull request #389 from OpenMW/master
...
Add OpenMW commits up to 24 Feb 2018
2018-02-25 22:05:32 +02:00
Capostrophic
089666dd68
Round up displayed encumbrance
2018-02-24 15:13:14 +03:00
David Cernat
f2a6957e16
Merge pull request #331 from OpenMW/master while resolving conflicts
2017-11-10 08:43:50 +02:00
scrawl
e6303c578c
Merge pull request #1530 from rexelion/curseitemfix
...
Trigger OnActivate when item is picked up through the inventory (Issue #3726 )
2017-11-05 15:35:39 +00:00
rexelion
8c2cc0f42f
break invisibility first
2017-11-04 00:44:16 +00:00
rexelion
bcbfa5fe1e
prevent activation, leave the rest to the script
2017-11-04 00:38:33 +00:00
rexelion
a9e5e19482
OnActivate is triggered when the item is picked up
2017-10-31 22:33:26 +00:00
David Cernat
a31d43965f
Merge pull request #328 from OpenMW/master
...
Add OpenMW commits up to 31 Oct 2017
2017-10-31 06:22:57 +02:00