7f435ceeac
Add OpenMW commits up to 1 Nov 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/main.cpp
# apps/openmw/mwclass/container.hpp
# apps/openmw/mwclass/creature.hpp
# apps/openmw/mwclass/npc.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwdialogue/journalimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/dialogue.hpp
# apps/openmw/mwgui/mainmenu.cpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/aiactivate.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/interpretercontext.hpp
# components/CMakeLists.txt
4 years ago
065ed5138e
Use emplace_back instead of push_back
4 years ago
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
4 years ago
72549651e0
Rework container resolution ( #3006 )
...
* Rework container resolution
* add optional argument to getCount
* remove now-redundant changes
* undo worldimp changes
* move save-fixing code to InventoryState
* replace Rng instances with Seeds
4 years ago
038c5b8231
[Client] Rename ObjectList's addObject() into addBaseObject()
5 years ago
296c04af71
[Client] Combine ObjectList's getBaseObject() and getObjectFromPtr()
5 years ago
59a38164ea
[Client] Add generic objects to ObjectList using addObjectGeneric()
5 years ago
989188c171
[Client] Remove ObjectList's confusing addObjectDelete() function
5 years ago
27b9357478
[Client] Send Container packets when buying or selling items at merchant
5 years ago
a378b254f8
[Client] Include necessary headers in ContainerItemModel
5 years ago
8b14c007f3
[Client] Send ObjectDelete for purchased objects removed from world
5 years ago
ee4fa93bd4
Rework prevent merchant equipping setting again
5 years ago
f0b73e0a27
Do not store owners for items in container stores (bug #1933 )
5 years ago
8df8bd3f37
Use C++11-style loops in the GUI instead of iterators
6 years ago
3032b177a1
Remove redundant includes
6 years ago
98b4f9c596
Merge pull request #1549 from akortunov/itemmodels
...
Item models reworking
7 years ago
3694b6ec90
Move onClose() check to item models
7 years ago
ac33ff9482
Move onDropItem() check to item models
7 years ago
3604b73d60
Move onTakeItem() to item models
7 years ago
ea3729790f
Add showsInInventory() check to the ContainerItemModel
7 years ago
1cb7ed5db1
Use owned tooltips for items in containers correctly
7 years ago
42402976e3
Fixes for building in MSVC
8 years ago
90a99991d1
Use empty() instead of !size()
9 years ago
58571f7ac2
Revert "Transfer item ownership to the buyer if item wasn't stolen"
...
Fixes #1953 .
This reverts commit 5d77c5e8ca
10 years ago
5d77c5e8ca
Transfer item ownership to the buyer if item wasn't stolen ( Fixes #1933 )
10 years ago
1e4a854433
Remove static method MWWorld::Class::get(&Ptr)
...
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
11 years ago
eb40032bde
Fix item owner not resetting when dragging an item from a corpse to the player avatar
11 years ago
93b76a603b
Fixes #1100 : Looting a corpse is no longer considered stealing
11 years ago
dde2cd5d5a
Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface.
11 years ago
10abb9d297
Call ContainerStore::remove() to remove items from inventory
...
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).
Enchanting an item now unequips it.
11 years ago
c6d2d1999a
Fix an item duplication glitch
12 years ago
48d2554ac3
Auto-equip when items are added to the inventory
...
We limit that to armor pieces and clothing items.
No auto-equiping for the player nor werewolves.
12 years ago
3a6e54c4f5
Sell owned items in the cell
12 years ago
0c4a963132
Container UI rewrite
12 years ago
David Cernat
Andrei Kortunov
Assumeru
Capostrophic
scrawl
Allofich
scrawl
Emanuel Guevel