mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:19:56 +00:00
Code Issues Releases Wiki Activity
12236 commits 38 branches 54 tags 122 MiB
Commit graph

133 commits

Author SHA1 Message Date
scrawl
0c4a963132 Container UI rewrite 2013-05-11 18:38:27 +02:00
Britt Mathis
60fadaeaf0 Cleaned up includes in implementation files 2013-04-16 20:16:22 -04:00
Marc Zinnschlag
3f846a50d9 Merge remote-tracking branch 'galdor557/master' 
Conflicts:
	apps/openmw/mwgui/travelwindow.cpp
 2013-04-11 10:15:42 +02:00
Britt Mathis
f7383905b7 Finally eliminated calls to MWBase::WindowManager in constructors 2013-04-10 14:46:21 -04:00
Britt Mathis
ce9bc6d9ba MwGui windowManager calls fixed to use MWBase::Environment::get().getWindowManager, filenames in MwGui now comply with naming conventions 2013-04-10 00:32:05 -04:00
scrawl
a7de870a44 Fix mercenary not updating its profit when item was dragged onto the player avatar 2013-04-08 16:21:18 +02:00
scrawl
43cdbd033d Display remaining item health / enchantment charge in HUD icons, display remaining enchanment charge in tooltips 2013-04-03 21:17:31 +02:00
scrawl
05a5cb3ae4 Improved responsiveness of the inventory window when resizing. 2013-04-03 00:27:29 +02:00
scrawl
b0199c703c Companion UI 2013-03-31 13:13:46 +02:00
scrawl
918cdcffc2 Split up components/esm/loadlocks 2013-03-22 05:50:54 +01:00
scrawl
95e1cdc07d Move getArmorRating to MWWorld::Class. 2013-03-17 22:29:12 +01:00
scrawl
1666bc7740 Armor rating 2013-03-16 22:53:33 +01:00
scrawl
0ee0dbdb97 Added "dispose corpse" button, added stealing (all items visible and no penalty yet) 2013-03-07 14:00:13 +01:00
scrawl
d5c6c221c1 Books/scrolls: Fix the take button incorrectly showing 2013-03-04 17:28:01 +01:00
Tom Mason
ac112ef972 refactored special variable code 2013-02-03 13:27:27 +00:00
Tom Mason
0f58e03343 Unequipping items will reset OnPCEquip variable 2013-01-31 19:04:39 +00:00
Jordan Milne
857bb42297 Create a separate scenemanager for each CharacterPreview instance 2013-01-09 01:44:15 -04:00
greye
7e0713f6c4 fix string case update 2012-12-31 11:22:40 +04:00
eduard
69d9d22579 comparestring 2012-12-30 19:56:38 +01:00
eduard
8545667bbd string compare and tolower 2012-12-28 17:54:56 +01:00
greye
7606ebafd6 resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
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
 2012-09-15 00:57:29 +02:00
scrawl
35f7216f2f fixed some things 2012-09-14 17:25:32 +02:00
scrawl
7c59b83419 performance optimization 2012-09-14 17:10:10 +02:00
scrawl
1f7e044fad removed some debug stuff 2012-09-14 14:41:19 +02:00
scrawl
6ac2a12296 item selection working on the preview 2012-09-14 14:34:18 +02:00
scrawl
eef750e6b0 race selection preview 2012-09-13 19:03:31 +02:00
scrawl
5155339cb6 character preview working 2012-09-13 14:56:50 +02:00
scrawl
4f3eb3c34a character preview WIP 2012-09-13 00:54:32 +02:00
scrawl
b66c8099eb new system for dynamic sizing of buttons & text boxes 2012-09-10 11:20:27 +02:00
scrawl
35dd49f948 fixed some "using namespace" in headers 2012-09-10 09:10:50 +02:00
Marc Zinnschlag
6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
Marc Zinnschlag
6bd48d12af Issue #107: SoundManager is accessed only through the interface class from now on 2012-08-09 14:33:21 +02:00
Marc Zinnschlag
78fe6fdce5 Issue #351: Refactoring Action class 2012-07-27 12:00:10 +02:00
scrawl
1a5203749f fix "error in framelistener" when trying to pick up lights that can't be picked up 2012-07-05 17:13:23 +02:00
Marc Zinnschlag
cc7c6aa0ad Merge branch 'decouple' 2012-07-03 15:47:57 +02:00
Marc Zinnschlag
4c39fefd1e Issue #107: World is accessed only through the interface class from now on; some include cleanup 2012-07-03 12:30:50 +02:00
scrawl
d27863bf8e rename layout files to .layout to get them recognized by layout editor 2012-07-03 11:34:20 +02:00
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
 2012-06-04 21:48:20 +02:00
scrawl
ea8e3ca1c8 fix item duplication bug when picking up object with the mouse and immediately dropping again 2012-06-04 21:09:51 +02:00
scrawl
b8464d4ce5 allow picking up objects from the gameworld with the mouse in inventory mode 2012-06-02 14:19:02 +02:00
scrawl
298ae4f7f8 HUD icons for selected weapon / selected spell / selected enchanted item 2012-05-29 18:33:01 +02:00
scrawl
30461438f6 still left: spell success formula 2012-05-29 12:35:03 +02:00
scrawl
c7268233df spell window layout & opening/closing/pinning logic 2012-05-29 09:02:22 +02:00
scrawl
f1d3978897 Issue #290: Auto-Close MW-reference related GUI windows 2012-05-27 01:14:33 +02:00
scrawl
6eb15f7680 auto-select the alchemy tools with highest quality 2012-05-25 15:24:33 +02:00
scrawl
92d9e070fb small tweak to getPlayerGold() method 2012-05-19 16:10:13 +02:00
scrawl
2a4c55f1ab use Class::getInventoryStore instead of casting ContainerStore. 2012-05-19 16:04:34 +02:00
scrawl
7ef0ad4e39 show faction & birthsign in the stats window 2012-05-19 14:55:09 +02:00
scrawl
db49e2c046 bought/sold items now use a separate ContainerStore, this fixes a stacking issue among other things 2012-05-18 20:53:24 +02:00
scrawl
fb47681fbd fix a bug, some cleanup 2012-05-18 17:58:33 +02:00
scrawl
342a244e31 NPC now doesn't buy items of types that he shouldn't accept. 2012-05-18 17:36:20 +02:00
scrawl
50a8eb05d9 transfering items between player and merchant works and shows a red frame for bought/sold items. 2012-05-18 17:27:55 +02:00
scrawl
41efea4c1d in the trade window, don't show items that the merchant has equipped. 2012-05-17 21:56:16 +02:00
scrawl
4213b4370f trade window shows up and shows the vendor's inventory items. 2012-05-17 19:53:04 +02:00
scrawl
c5185cf2e4 drop item on avatar from external container bugfix 2012-05-17 12:09:53 +02:00
scrawl
0f1e09d2c1 make Class::use method return an equip action for equippable items, add sound for equipping 2012-05-16 16:08:55 +02:00
scrawl
c5d685c780 added an assert 2012-05-16 14:28:57 +02:00
scrawl
2fa7ce0c19 equipping works also when the item wasn't in player inventory before. 2012-05-16 00:02:05 +02:00
scrawl
477f1b42ab fixed another item dropping bug 2012-05-15 23:28:04 +02:00
scrawl
5a43fe3e5f remove debug prints 2012-05-15 22:48:14 +02:00
scrawl
3f4ce32727 implemented player encumbrance bar 2012-05-15 22:45:46 +02:00
scrawl
d3a53ae0b8 removed the _freeSlot method which is now unneeded 2012-05-15 22:01:09 +02:00
scrawl
175623bf22 change the drag&drop to not use a seperate containerstore 2012-05-15 21:44:57 +02:00
scrawl
ca4fa21d64 removed the attempt to unify activation and use scripts which was incorrect 2012-05-15 20:51:19 +02:00
scrawl
71de10cb7e equipping items works, but only if you have more than one of the item that you're equipping 2012-05-15 20:33:34 +02:00
scrawl
765881a61d equipping items in the inventorywindow (there is no visual indication yet) 2012-05-15 18:20:32 +02:00
scrawl
ab6336b745 using items via the inventory is now possible by dragging them on the avatar (only implemented for books right now) 2012-05-15 18:05:53 +02:00
scrawl
a47d29c184 fix the inventory window overlapping with over windows in default layout 2012-05-13 16:41:00 +02:00
scrawl
3a93df8db4 dynamic inventory layout like morrowind 2012-05-13 11:25:35 +02:00
scrawl
78b06d0ebf inventory window pinning 2012-05-12 22:44:12 +02:00
scrawl
822e5fbe1e add indication which filter is selected 2012-05-12 22:00:15 +02:00
scrawl
902309a554 working filters 2012-05-12 21:44:33 +02:00
scrawl
0114bf948c revised filters 2012-05-12 21:28:04 +02:00
scrawl
1abf70692c added a scrollbar to the item container, dynamic positioning of items, fixed the item count display bug 2012-05-12 18:24:47 +02:00
scrawl
ed6ff0a94a cleanup 3 2012-05-12 13:12:37 +02:00
scrawl
2d3cc014c9 Merge branch 'inventoryGUI' of https://github.com/gugus/openmw into inventoryGUI 
Conflicts:
	apps/openmw/mwgui/container.cpp
	apps/openmw/mwgui/container.hpp
 2012-05-11 16:27:24 +02:00
gugus
9dd65dce30 Finished merging. 2012-05-11 11:52:07 +02:00
gugus
5f8c08b18b some work for dropping objects. 2012-04-30 13:01:18 +02:00
gugus
5603cb312c Objects can now be selected and follow mouse movements. 2012-04-27 20:54:39 +02:00
scrawl
1b02b503a2 gcc compile fix 2012-04-22 21:06:08 +02:00
gugus
33654535c1 The inventory window now display the inventory of the player 2012-04-21 11:05:30 +02:00
gugus
1e8d894e1c Starting inventory window 2012-04-21 10:51:01 +02:00