Commit Graph

75 Commits (6cb5ac6e63fb9bf6b27e827a227161f6dbc82f0a)

Author SHA1 Message Date
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
6 years ago
Andrei Kortunov c77c50e92b Make Equip console command to bypass most of restrictions (bug #4460) 6 years ago
David Cernat 73e7aa838d Merge pull request #296 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwgui/container.cpp
7 years ago
Andrei Kortunov 4580024d76 Unequip all items from dead corpse when take all items (bug #4095) 7 years ago
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
7 years ago
Bret Curtis c781d1f8ed purge unnecessary imports
add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back
7 years ago
Bret Curtis d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 7 years ago
David Cernat a82646a130 [Client] Delineate tes3mp-only code more clearly, part 2 7 years ago
David Cernat 11a9e3bdb1 Merge pull request #197 from OpenMW/master
Add OpenMW commits up to 14 Apr 2017
7 years ago
Allofich 6e405aed8c Adjustments to RemoveItem behavior
(Fixes #3796)
7 years ago
David Cernat a2ef39c655 Merge pull request #178 from OpenMW/master
Add OpenMW commits up to 2 Mar 2017
7 years ago
Rafael Moura 6c2ce2b2a1 Porting more ContainerStoreIterator usage to const version #4
removed const_cast revision
7 years ago
David Cernat a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 7 years ago
Rafael Moura 9963601484 Porting code to ConstContainerStoreIterator #1 7 years ago
David Cernat cdd796aba1 [Client] Send ID_PLAYER_INVENTORY from two more locations 7 years ago
Marc Zinnschlag 03a35c38df add missing item when executing the Equip instruction 8 years ago
scrawl ba3f4f122a Account for the stack count in HasSoulGem (Bug #3340) 8 years ago
Alexander "Ace" Olofsson 7d4125d97f Fixes for building with unity build 9 years ago
scrawl 5aa33fde43 Include cleanup 9 years ago
scrawl fd48c1d6f4 Make the Equip script function "use" items (drink potion, use alchemy, etc) 9 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 9 years ago
scrawl 67bd6cd708 Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
9 years ago
Koncord 6c3c85f0d4 Fix indent
Remove misc.hpp in containerstore.cpp
9 years ago
Koncord 7a86c8d8b6 Fix OpAddItem, OpGetItemCount and OpRemoveItem. 9 years ago
scrawl 3879ce6ac1 Get rid of "player" string checks (Fixes #2216) 9 years ago
Alexander "Ace" Olofsson fce404acc5 Remove some including of mwbase/world.hpp
Since ref.hpp is rather well used in OpenMW-CS this should help compile times there
9 years ago
Alexander "Ace" Olofsson d3128a12b6 Remove a large include form mwbase/windowmanager.hpp 9 years ago
scrawl 579f5d232f Move interactive messageBox to separate function 9 years ago
scrawl 8097d9801d Fix HasSoulgem function to return number of soulgems 10 years ago
scrawl 039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
10 years ago
Emanuel Guevel 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. :)
10 years ago
scrawl c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 10 years ago
Marc Zinnschlag 367919200f moved CellRefList into a separate file 10 years ago
Emanuel Guevel 8824af30b4 Allow to display message box outside of dialogue window 10 years ago
scrawl 589fbbd871 Issue #777: Create InventoryStore for creatures with weapons/shields 10 years ago
scrawl c04a8afc8b Make sure onPcEquip is also set for Equip script instruction 10 years ago
scrawl b8583124e0 Correction for RemoveSoulgem instruction 10 years ago
scrawl 372cd437d1 Add a utility function for counting items in a container 10 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 10 years ago
scrawl b490e56ba1 Remove redundant setLocals (already done by ContainerStore::add) 11 years ago
scrawl bab657fe2b Add a utility function to add items to a ContainerStore by RefID 11 years ago
scrawl 00af6b5617 Use an inventory store listener for animation parts and VFX update instead of updating them directly. Slightly more flexible, reduces InventoryStore dependencies and solves a crash during character creation due to the preview doll's animation not being registered in World. 11 years ago
Emanuel Guevel aefa54d72d Pass item count to ManualRef constructor
This remove the need to call setCount in multiple places.
11 years ago
Emanuel Guevel 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
Chris Robinson 2bac4566c0 Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/statsextensions.cpp
11 years ago
Emanuel Guevel 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.
11 years ago
Alex de1f423bd7 initial move of script opcodes and registerExtensions functions to components/compiler 11 years ago
kpp 24d619d6b4 Changes the logic of WindowManager::messageBox()
Fixes removeItem
Fixes addItem
11 years ago
scrawl e7af718b55 Remove unnecessary WindowManager::messageBox arguments 11 years ago
scrawl 52d0f0b750 Fixed OpAddItem, OpRemoveItem 11 years ago