Commit Graph

266 Commits (master)

Author SHA1 Message Date
scrawl 944e6d0844 Fix adjustment of inventory preview size when guimode changes (Fixes #2973) 9 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 10 years ago
scrawl 9fad33cd14 Don't reset the item model's sort/filter options in updatePlayer (Fixes #2863) 10 years ago
scrawl 77f1387da8 Include cleanup 10 years ago
scrawl 992b770315 Don't set OnPcEquip for items that failed to equip (Fixes #2776) 10 years ago
Alexander "Ace" Olofsson b1cc74dd9a Explicity instantiate MWMechanics::Stat 10 years ago
Alexander "Ace" Olofsson 3655ef16af Explicitly instantiate ESM::StatState 10 years ago
scrawl 30ab15e605 Fix -Wunused-private-field clang warnings 10 years ago
scrawl e23775e338 Fix -Woverloaded-virtual clang warnings 10 years ago
scrawl da24e298ee Fix -Wreorder warnings 10 years ago
scrawl 22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
10 years ago
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 10 years ago
scrawl c4452afd89 Inventory item picking 10 years ago
scrawl 72c1f37527 Port CharacterPreview 10 years ago
scrawl 3b8b217888 Fix no punishment for stealing when taking an item with the inventory opened 10 years ago
scrawl f0789352c6 Silence error message 10 years ago
scrawl 4e69e7cc0f OpenMW compiles and runs w/o render window 10 years ago
scrawl 48ea6286fd Book/scroll window refactoring 10 years ago
scrawl 37a6d7da76 WindowManager refactoring 10 years ago
dteviot e6cd8484a2 fixing MSVC 2013 warning C4244: & C4305
fixes for mistakes in last commit.
10 years ago
dteviot e197f5318b fixing MSVC 2013 warning C4244: & C4305
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
10 years ago
scrawl 653ddd3f25 Warning fix 10 years ago
scrawl 730138035d Cycle infinite loop fix (Fixes #2421) 10 years ago
scrawl 3ccf4642b4 Implement ToggleScripts 10 years ago
scrawl aa6ebcd75c Change stolen items handling to match MW (Fixes #1443, Fixes #2290) 10 years ago
scrawl 0c6e2170db Include cleanup 10 years ago
scrawl 728b842e72 Use MyGUI::utility in favor of boost lexical_cast 10 years ago
scrawl eecea4131f Reduce MyGUI includes 10 years ago
scrawl 4b704f665f Reduce includes, move DragAndDrop to separate file 10 years ago
scrawl 0dc9401269 Fix GUI crash due to outdated spells list 10 years ago
scrawl ec00c830e5 Fix missing armor rating label update 10 years ago
scrawl c7e1c0b595 Fix weapon cycle getting stuck for same item IDs 10 years ago
scrawl 935cccf974 Implement weapon/spell cycling hotkeys (Fixes #1024) 10 years ago
Thoronador db38108801 fix uninitialized pointer variables in some classes 10 years ago
scrawl 0f99a959eb Update barter offer for all items when another item is added (Fixes #1935) 10 years ago
Marc Zinnschlag ea60c665dd Merge remote-tracking branch 'ragora/bounditemflag' 10 years ago
Marc Zinnschlag 9b7f61b4ba Merge remote-tracking branch 'scrawl/myguiplugin' 10 years ago
Ragora f250e3df4b Replaced old bound item checks that I knew of to use the new ItemStack::Flag_Bound bit 10 years ago
scrawl cfc57d0fe0 Use MyGUI's castType for widget casts 10 years ago
Ragora 69dbd6b30f Added checks for different bound item situations 10 years ago
Ragora 141755b473 Appears to have resolved the issue with unequipping conjured items and all possible error conditions deriving from being able to unequip them 10 years ago
scrawl c775e05d7a Show encumbrance preview when trading (Fixes #1793) 11 years ago
scrawl ddf8c5023e InventoryWindow: don't unnecessarily update preview on opening count dialog 11 years ago
scrawl 084cc857d4 Update magic effects when changing equipment (Fixes #1646) 11 years ago
scrawl 025f50a2df Improve performance of inventory window resize (don't update selection buffer unnecessarily) 11 years ago
scrawl 4a26dcb2ad Avoid calling RenderTarget::update from within loadResource 11 years ago
scrawl 44b517f66d Implement hiding inventory windows by double click on caption (Fixes #1690) 11 years ago
scrawl c6bf9dfbfb Add ManualResourceLoader for character previews (Fixes #1752) 11 years ago
scrawl 4f73e8bb71 Add items to player inventory upon drag start (Fixes #1507) 11 years ago
scrawl 039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
11 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. :)
11 years ago
scrawl 6f03694d50 Fixes #1334: Only unequip item if the sell/drag action is actually successful 11 years ago
scrawl eb40032bde Fix item owner not resetting when dragging an item from a corpse to the player avatar 11 years ago
scrawl 117b812fb1 Fix invisibility not breaking on certain actions 11 years ago
scrawl 6f7fbc867f Fix several leaks 11 years ago
Rohit Nirmal e3a9daf921 Play item sound when trying to sell a bound item, too. 11 years ago
Rohit Nirmal e4c4747a27 Play item sound even if merchant doesn't purchase it. 11 years ago
Sandy Carter 72a3c50eb8 (#1191) Disallow picking up if inventory disabled
Check if window manager has allowed the inventory window
if not, then items should not be possible to pick up
11 years ago
scrawl f608ceeffc Fixes #1158 (Armor rating label issues) 11 years ago
scrawl 7983b07b10 Get bk_treasuryreport script to work properly:
- OnPcEquip needs to be set on *using* any item, not just equipping
 - Handle PcSkipEquip
 - Execute item's script once immediately after setting OnPcEquip
 - Do not set OnPcEquip when an item that has skipped equipping sets pcskipequip back to 0 and gets equipped
11 years ago
scrawl baf55df7a1 Gold fixes (when did this break?) 11 years ago
scrawl 0f5dc59176 Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure. 11 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 11 years ago
scrawl 3c0080d2c1 Implement theft detection 11 years ago
scrawl 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
scrawl 710a1e2f37 Smash case for manual reference IDs as well, consistent with references in data files 11 years ago
scrawl 783c501d70 Some checks to prevent bound item abuse 11 years ago
scrawl 31c1f484ed Slight performance improvement for WindowManager::updateVisible 11 years ago
scrawl f695deb29d Remember window positions 11 years ago
scrawl 2a11618ee7 Make sure the equipped weapon HUD icon is updated properly 11 years ago
scrawl 992a8e9c36 Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore. 11 years ago
Emanuel Guevel baf13483c0 Update actor model only when in the current cell 11 years ago
Emanuel Guevel 4fcf427e1f InventoryWindow: call InventoryStore::unequipItem() when an equipped item is dragged
The unequipped item is also re-stacked if needed.
11 years ago
Emanuel Guevel 2786530430 Edit InventoryStore::equip() to call the new unequipSlot function…
…to unequip previously equipped item.
11 years ago
Chris Robinson 48c07fbd98 Remove some unnecessary fields from Ptr 12 years ago
Chris Robinson 5968165de0 Merge remote-tracking branch 'zini/master' into werewolf
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
12 years ago
Chris Robinson 5fbfce6d1e Don't show WerewolfRobe objects in the inventory
Pretty ugly hard-coding, but this is likely what vanilla does since it
has no option to mark clothes or armor as unplayable like Oblivion does.
12 years ago
Emanuel Guevel b2e5e8dd0d Saner inventory window pinning/hiding
Hide inventory window pin button in container, companion and barter mode.
Restore the pinned inventory window position when exiting these modes.
Allow toggling windows visibility in inventory mode only.
12 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.
12 years ago
Marc Zinnschlag ca94d1a2fb Merge remote-tracking branch 'swick/inventorypos'
Conflicts:
	apps/openmw/mwgui/inventorywindow.cpp
12 years ago
Sebastian Wick 7ed763262f GUI mode dependent position 12 years ago
scrawl 7dc30a01cd Some changes suggested by cppcheck 12 years ago
scrawl c41f119ba6 Added new game button 12 years ago
scrawl 0c4a963132 Container UI rewrite 12 years ago
Britt Mathis 60fadaeaf0 Cleaned up includes in implementation files 12 years ago
Marc Zinnschlag 3f846a50d9 Merge remote-tracking branch 'galdor557/master'
Conflicts:
	apps/openmw/mwgui/travelwindow.cpp
12 years ago
Britt Mathis f7383905b7 Finally eliminated calls to MWBase::WindowManager in constructors 12 years ago
Britt Mathis ce9bc6d9ba MwGui windowManager calls fixed to use MWBase::Environment::get().getWindowManager, filenames in MwGui now comply with naming conventions 12 years ago
scrawl a7de870a44 Fix mercenary not updating its profit when item was dragged onto the player avatar 12 years ago
scrawl 43cdbd033d Display remaining item health / enchantment charge in HUD icons, display remaining enchanment charge in tooltips 12 years ago
scrawl 05a5cb3ae4 Improved responsiveness of the inventory window when resizing. 12 years ago
scrawl b0199c703c Companion UI 12 years ago
scrawl 918cdcffc2 Split up components/esm/loadlocks 12 years ago
scrawl 95e1cdc07d Move getArmorRating to MWWorld::Class. 12 years ago
scrawl 1666bc7740 Armor rating 12 years ago
scrawl 0ee0dbdb97 Added "dispose corpse" button, added stealing (all items visible and no penalty yet) 12 years ago
scrawl d5c6c221c1 Books/scrolls: Fix the take button incorrectly showing 12 years ago
Tom Mason ac112ef972 refactored special variable code 12 years ago
Tom Mason 0f58e03343 Unequipping items will reset OnPCEquip variable 12 years ago
Jordan Milne 857bb42297 Create a separate scenemanager for each CharacterPreview instance 12 years ago
greye 7e0713f6c4 fix string case update 12 years ago
eduard 69d9d22579 comparestring 12 years ago
eduard 8545667bbd string compare and tolower 12 years ago
greye 7606ebafd6 resolving conflicts, minor update 12 years ago
scrawl 2793096b50 Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
12 years ago
scrawl 35f7216f2f fixed some things 12 years ago
scrawl 7c59b83419 performance optimization 12 years ago
scrawl 1f7e044fad removed some debug stuff 12 years ago
scrawl 6ac2a12296 item selection working on the preview 12 years ago
scrawl eef750e6b0 race selection preview 12 years ago
scrawl 5155339cb6 character preview working 12 years ago
scrawl 4f3eb3c34a character preview WIP 12 years ago
scrawl b66c8099eb new system for dynamic sizing of buttons & text boxes 12 years ago
scrawl 35dd49f948 fixed some "using namespace" in headers 12 years ago
Marc Zinnschlag 6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 6bd48d12af Issue #107: SoundManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 78fe6fdce5 Issue #351: Refactoring Action class 13 years ago
scrawl 1a5203749f fix "error in framelistener" when trying to pick up lights that can't be picked up 13 years ago
Marc Zinnschlag cc7c6aa0ad Merge branch 'decouple' 13 years ago
Marc Zinnschlag 4c39fefd1e Issue #107: World is accessed only through the interface class from now on; some include cleanup 13 years ago
scrawl d27863bf8e rename layout files to .layout to get them recognized by layout editor 13 years ago
scrawl dfac5f26c3 fixed some issues:
- probes were not showing up in inventory category "misc"
- lights, probes, lockpicks were not equippable
- weapons could not be picked up
13 years ago
scrawl ea8e3ca1c8 fix item duplication bug when picking up object with the mouse and immediately dropping again 13 years ago
scrawl b8464d4ce5 allow picking up objects from the gameworld with the mouse in inventory mode 13 years ago
scrawl 298ae4f7f8 HUD icons for selected weapon / selected spell / selected enchanted item 13 years ago
scrawl 30461438f6 still left: spell success formula 13 years ago
scrawl c7268233df spell window layout & opening/closing/pinning logic 13 years ago
scrawl f1d3978897 Issue #290: Auto-Close MW-reference related GUI windows 13 years ago
scrawl 6eb15f7680 auto-select the alchemy tools with highest quality 13 years ago
scrawl 92d9e070fb small tweak to getPlayerGold() method 13 years ago
scrawl 2a4c55f1ab use Class::getInventoryStore instead of casting ContainerStore. 13 years ago
scrawl 7ef0ad4e39 show faction & birthsign in the stats window 13 years ago
scrawl db49e2c046 bought/sold items now use a separate ContainerStore, this fixes a stacking issue among other things 13 years ago
scrawl fb47681fbd fix a bug, some cleanup 13 years ago
scrawl 342a244e31 NPC now doesn't buy items of types that he shouldn't accept. 13 years ago
scrawl 50a8eb05d9 transfering items between player and merchant works and shows a red frame for bought/sold items. 13 years ago
scrawl 41efea4c1d in the trade window, don't show items that the merchant has equipped. 13 years ago
scrawl 4213b4370f trade window shows up and shows the vendor's inventory items. 13 years ago
scrawl c5185cf2e4 drop item on avatar from external container bugfix 13 years ago
scrawl 0f1e09d2c1 make Class::use method return an equip action for equippable items, add sound for equipping 13 years ago
scrawl c5d685c780 added an assert 13 years ago
scrawl 2fa7ce0c19 equipping works also when the item wasn't in player inventory before. 13 years ago
scrawl 477f1b42ab fixed another item dropping bug 13 years ago
scrawl 5a43fe3e5f remove debug prints 13 years ago
scrawl 3f4ce32727 implemented player encumbrance bar 13 years ago
scrawl d3a53ae0b8 removed the _freeSlot method which is now unneeded 13 years ago
scrawl 175623bf22 change the drag&drop to not use a seperate containerstore 13 years ago
scrawl ca4fa21d64 removed the attempt to unify activation and use scripts which was incorrect 13 years ago
scrawl 71de10cb7e equipping items works, but only if you have more than one of the item that you're equipping 13 years ago
scrawl 765881a61d equipping items in the inventorywindow (there is no visual indication yet) 13 years ago