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

812 commits

Author SHA1 Message Date
Adam Hogan
ebf80943a9 Added spell buying window 2012-09-08 18:17:03 -04:00
Marc Zinnschlag
e2bf4694cb Merge remote-tracking branch 'scrawl/master' 2012-08-31 09:22:32 +02:00
scrawl
760f05c454 the HUD can be toggled with F12 key; useful for screenshots 2012-08-30 20:47:39 +02:00
greye
a90547bbbe code formatting 2012-08-29 21:35:06 +04:00
scrawl
6ad08dfd33 added settings for crosshair & subtitles 2012-08-29 11:15:17 +02:00
scrawl
1c5055c8ac fix a problem where hovering a marker would render it on top of the fog of war instead of below 2012-08-28 18:49:44 +02:00
scrawl
7eaf5e7f0f changed the markers to look more like morrowind's (hover effect) 2012-08-28 18:40:11 +02:00
scrawl
571d5095d4 removed a cout 2012-08-28 17:32:50 +02:00
scrawl
5834b4baa5 door markers on the local map 2012-08-28 17:30:34 +02:00
Marc Zinnschlag
160b52162b Merge remote-tracking branch 'scrawl/quick_keys' 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2012-08-28 09:06:40 +02:00
scrawl
321f7c3419 fix an infinite recursion regression on several dialogs. 2012-08-27 21:29:04 +02:00
scrawl
5c28a67203 broke something in the last commit. 2012-08-27 20:55:39 +02:00
scrawl
4f19b7fb9b fix leaks. 2012-08-27 20:52:32 +02:00
scrawl
bc36b0e2bd remove the restriction on the last quick key 2012-08-27 20:51:13 +02:00
scrawl
6161f81c24 last bits of the quick key menu. 2012-08-27 20:44:14 +02:00
scrawl
9af0b48ad6 show/hide crosshair correctly 2012-08-27 19:18:55 +02:00
scrawl
c5e55d3cac fix screenshot function 2012-08-27 15:51:01 +02:00
scrawl
c0f27bd5ef magic selection window 2012-08-26 11:37:33 +02:00
scrawl
fab4cfecb1 some unfinished work on quick keys window 2012-08-26 10:52:06 +02:00
scrawl
67577c6192 UI cursor & camera sensitivity sliders 2012-08-13 18:48:50 +02:00
scrawl
c7b8787c32 "reset to defaults" button, invert y axis button 2012-08-13 02:55:22 +02:00
scrawl
bc6e4feedc hotkey window first version 2012-08-13 01:26:15 +02:00
scrawl
97c45455fd fix WindowManager destruction 2012-08-12 21:21:23 +02:00
Marc Zinnschlag
c4bf6214db Merge remote branch 'scrawl/master' 2012-08-12 18:11:36 +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
35a64edf2a Issue #107: removed a template from the window manager 2012-08-12 16:07:04 +02:00
Marc Zinnschlag
484cce12a8 Issue #107: removed redundant getStore function from window manager 2012-08-12 14:36:46 +02:00
Marc Zinnschlag
f37d3cd3c9 Issue #107: added a few todo comments 2012-08-12 14:09:55 +02:00
Marc Zinnschlag
4ca3cb81d4 Issue #107: some include clean up 2012-08-12 14:07:48 +02:00
Marc Zinnschlag
e0ba7cf952 Issue #107: Fixing up the window manager interface 2012-08-12 13:46:14 +02:00
Marc Zinnschlag
020fde70b8 Issue #107: moving function implementations from hpp to cpp file 2012-08-12 11:10:17 +02:00
Marc Zinnschlag
dbac3d2e5f Issue #107: fixing WindowManager::removeDialog 2012-08-12 10:52:29 +02:00
Marc Zinnschlag
a3b27ae756 Issue #107: Moved ClassPoint from window manager to character creation 2012-08-12 10:50:03 +02:00
Marc Zinnschlag
0231533d05 Issue #107: InputManager is accessed only through the interface class from now on 2012-08-11 17:53:39 +02:00
Marc Zinnschlag
b68f9d6a28 Issue #107: MechanicsManager is accessed only through the interface class from now on 2012-08-11 17:30:55 +02:00
scrawl
dcf1e66456 fix main menu placement after resolution changes 2012-08-11 17:26:01 +02:00
scrawl
44ff31b50a removed world exit methods 2012-08-10 16:21:53 +02:00
scrawl
f72956b918 - added a simple main menu (with Return, Options and Exit buttons) 
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
 2012-08-10 15:15:48 +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
d00d40cc3f Issue #107: Journal is accessed only through the interface class from now on 2012-08-09 12:56:03 +02:00
Marc Zinnschlag
923109b260 Issue #107: DialogueManager is accessed only through the interface class from now on 2012-08-09 10:35:53 +02:00
scrawl
15a16aeba1 Fixed DirectX HLSL shaders and re-enabled them in the gui 2012-08-01 04:11:16 +02:00
Marc Zinnschlag
db10baafe1 Merge branch 'scriptconsole' 2012-07-30 12:43:48 +02:00
Marc Zinnschlag
fd6c155118 Issue #352: added --script-run switch 2012-07-30 12:37:46 +02:00
Marc Zinnschlag
23f8595b87 Issue #352: refactored script execution in console 2012-07-30 11:57:19 +02:00
Marc Zinnschlag
90de02b901 Issue #350: console only script instructions 2012-07-30 11:43:28 +02:00
Marc Zinnschlag
78fe6fdce5 Issue #351: Refactoring Action class 2012-07-27 12:00:10 +02:00
Marc Zinnschlag
2d080ce4ef compile fix 2012-07-23 21:47:53 +02:00
Marc Zinnschlag
483a6d8605 Merge remote branch 'scrawl/shadersystem' 2012-07-23 21:46:06 +02:00
scrawl
02a52c0ff1 fixed some more settings bugs 2012-07-23 21:39:22 +02:00
scrawl
3ebc6fd590 fixed a settings window bug 2012-07-23 20:50:56 +02:00
scrawl
a70f93b024 fix "Crash when running openmw with --start="XYZ", remove HLSL for windows 2012-07-23 20:12:42 +02:00
Marc Zinnschlag
2c5d3d8df9 Merge remote branch 'scrawl/shadersystem' into shadersystem 
Attention: We have submodules again. Don't forget to update!

Conflicts:
	components/files/configurationmanager.cpp
 2012-07-23 14:12:21 +02:00
greye
32b1350b63 CreatureStats class 2012-07-22 18:29:54 +04:00
scrawl
f5ffea4d4b new button, water timescale 2012-07-19 23:30:41 +02:00
scrawl
e077814a8c water 2012-07-19 22:23:07 +02:00
scrawl
4434fb640e Merge branch 'master' into shadersystem 2012-07-17 19:12:02 +02:00
Marc Zinnschlag
2c70a93553 Merge branch 'master' into potions 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
 2012-07-17 10:32:18 +02:00
Marc Zinnschlag
0d3a7d482e Merge remote branch 'modred11/master' 2012-07-17 10:21:46 +02:00
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
scrawl
7d5b94709d Merge branch 'master' into shadersystem 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2012-07-14 11:16:35 +02:00
Carl Maxwell
e4d046f69c Prepending m to the name of every member variable. 
I made a bunch of changes in apps/openmw/mwrender/animation.cpp
because the scope brackets didn't line up in a bunch of places
    npcanimations.cpp & creatureanimations.cpp were the same kind of
thing
 2012-07-13 03:51:58 -07:00
scrawl
e0a99f104b settings tab "shadows" 2012-07-11 04:28:45 +02:00
scrawl
485adc8bdc shader mode button in settingswindow 2012-07-11 03:19:51 +02:00
Marc Zinnschlag
6277e39216 Merge branch 'master' into skillgain 2012-07-07 20:27:56 +02:00
Alexander "Ace" Olofsson
113457d934 Fixed some windows issues and got rid of a few tiny warnings while at it. 2012-07-07 01:14:18 +02:00
Marc Zinnschlag
d30ba14a17 Issue #324: Finished turning NpcStats into a proper class 2012-07-06 18:23:48 +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
scrawl
78efc31641 different default coordinates for container window to prevent it from going invsible when changing resolution (bug #308), fixed some windows not centering when resolution change 2012-07-03 16:51:29 +02:00
scrawl
085891879c fixed another resolution change bug introduced recently 2012-07-03 16:44:20 +02:00
Marc Zinnschlag
cc7c6aa0ad Merge branch 'decouple' 2012-07-03 15:47:57 +02:00
Marc Zinnschlag
c85aaafac2 more include cleanup (most removing Ogre.h) 2012-07-03 15:32:38 +02:00
Marc Zinnschlag
87667ab57e Issue #107: Ptr related include cleanup 2012-07-03 13:55:53 +02:00
Marc Zinnschlag
5a7b95bf7a Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp 2012-07-03 13:15:20 +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
Marc Zinnschlag
7fcd41c69d Issue #107: Detemplateised CellStore; some include cleanup 2012-06-29 18:54:23 +02:00
Marc Zinnschlag
76174098c7 Issue #107: CellStore moved from ESMS to MWWorld 2012-06-29 16:48:50 +02:00
Marc Zinnschlag
70ac1c818d Merge remote branch 'scrawl/settingswindow' 2012-06-27 09:02:29 +02:00
scrawl
232fe0be8c fix for the directx crash 2012-06-26 18:03:52 +02:00
scrawl
30e86e1b9d settings window resolution sorting, aspect ratio 2012-06-26 15:41:13 +02:00
scrawl
797c2c538d fix some settings bugs 2012-06-23 12:25:28 +02:00
Marc Zinnschlag
2b68e4d489 Merge remote branch 'scrawl/trianglebatchcount' 2012-06-22 14:30:00 +02:00
scrawl
63ce143a04 fix triangle / batch counts with compositors 2012-06-22 12:56:04 +02:00
scrawl
98f13ebcc0 Merge branch 'misc' of github.com:scrawl/openmw into misc 2012-06-21 12:15:43 +02:00
Marc Zinnschlag
ad251065f4 removed more cout spam 2012-06-21 12:00:56 +02:00
scrawl
15e959868c make some of the gui mode changes a bit safer 2012-06-19 17:07:00 +02:00
scrawl
ff278ab4ec chargen generate class: fix result not being shown in review dialog 2012-06-19 15:25:04 +02:00
scrawl
0aa01b93e2 don't put blue color on actions that are in the topic list, but are not topics (e.g. Barter) 2012-06-19 15:24:52 +02:00
Marc Zinnschlag
3c42a71dae removed some cout spam 2012-06-16 16:42:35 +02:00
scrawl
584ae30213 don't show diseases and curses in the spell list 2012-06-15 10:09:46 +02:00
Marc Zinnschlag
0f71439991 Merge remote branch 'garvek/master' 2012-06-15 08:22:56 +02:00
Sylvain THESNIERES
fc3a3fc173 MSVC build compliance: 
- static const float member is not ISO
- callback do not match DLL signature
 2012-06-08 19:55:39 +02:00
scrawl
c85c794c86 fixed some cppcheck issues 2012-06-06 20:29:30 +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
1ecc6f97ed alchemy effect fix 2012-06-04 20:56:13 +02:00
scrawl
d56defd4f4 set input focus to console after selecting objects in console mode 2012-06-03 21:19:48 +02:00
scrawl
8e96871acd remove something unused 2012-06-03 18:40:10 +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
b886aea298 change console skin to MW_Window and set the selected object refID as window title 2012-06-02 12:31:23 +02:00
scrawl
0ba0b2122e set the implicit object for script excution by clicking on it 2012-06-02 12:25:24 +02:00
scrawl
72bb7a2d2c fix a typo 2012-05-30 08:04:07 +02:00
scrawl
c5a685d11f addition to last commit: show the selected weapon/spell names as inventory/spell window caption 2012-05-29 18:59:11 +02:00
scrawl
298ae4f7f8 HUD icons for selected weapon / selected spell / selected enchanted item 2012-05-29 18:33:01 +02:00
scrawl
8b7baa808e fixed the hud icon positioning issues 2012-05-29 15:36:48 +02:00
scrawl
48ba293e88 added the success formula, and spell deleting (shift+click) 2012-05-29 15:13:44 +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
69e6bc6588 add water settings to settings window 2012-05-29 06:45:44 +02:00
scrawl
5d03e86613 added field of view and texture filtering to settings window 2012-05-29 04:54:54 +02:00
scrawl
6945afe95b alchemy window layout 2012-05-29 02:57:19 +02:00
scrawl
f75266e4ba fixed race dialog bug 2012-05-29 01:47:49 +02:00
scrawl
0a17d6d710 more resolution switching fixes 2012-05-28 12:34:29 +02:00
scrawl
e1ee45a6d6 Issue #297: Make the stats review dialog show correct values for attributes/skills/health/magicka/fatigue 2012-05-28 10:50:00 +02:00
scrawl
6014a90002 added tooltip delay option 2012-05-28 09:46:05 +02:00
scrawl
14f4f09f83 proper resolution switching (reposition GUI & adjust mouse clipping region) 2012-05-28 09:19:25 +02:00
scrawl
10cfe0f5bc Issue #295: Class creation dialogs tooltips; plus tons of other improvements 2012-05-27 06:39:10 +02:00
scrawl
f1d3978897 Issue #290: Auto-Close MW-reference related GUI windows 2012-05-27 01:14:33 +02:00
scrawl
63213b36bf Show a label on the HUD with the cell name when it changes (visible for a few seconds) - like Morrowind 2012-05-26 23:06:15 +02:00
scrawl
313a8e55b7 - Issue #296: Clicking on HUD elements shows/hides the respective window 
- Slightly redesigned the map window and minimap, the player arrow now isn't cut off at cell borders anymore
 2012-05-26 21:09:21 +02:00
scrawl
3cba884f59 Issue #294: show/hide HUD elements based on allowed windows 2012-05-26 05:46:46 +02:00
scrawl
c7010623fb Issue #294: disallowed inventory prevents Talk, Open and Take actions 2012-05-25 18:45:17 +02:00
scrawl
750259973e potion creating works, most of the values are bogus 2012-05-25 18:00:13 +02:00
scrawl
63b3b82657 don't allow more than 4 potion effects 2012-05-25 16:23:49 +02:00
scrawl
1df1b521a4 show the list of potion effects 2012-05-25 16:20:57 +02:00
scrawl
6eb15f7680 auto-select the alchemy tools with highest quality 2012-05-25 15:24:33 +02:00
scrawl
3ba24aee0d Merge branch 'alchemy' into next 2012-05-25 13:37:40 +02:00
scrawl
9b623a79ff Merge branch 'master' into alchemy 2012-05-25 13:14:27 +02:00
scrawl
09c870ad68 first alchemy window layout (not pretty) 2012-05-25 12:58:28 +02:00
scrawl
51b8a76a68 merged by branches together, starting with alchemy window 
Merge branch 'guimode_stacking' into next

Conflicts:
	apps/openmw/mwgui/mode.hpp
 2012-05-24 15:57:23 +02:00
scrawl
c2b818373e adjust tooltip skin, now is never transparent 2012-05-24 15:11:45 +02:00
scrawl
a3a22e9096 ingredient tooltip shows possible effects 2012-05-24 14:47:57 +02:00
scrawl
57d834b14b fixed an issue with interactive messagebox 2012-05-24 12:05:43 +02:00
scrawl
6ea7bdb224 vsync & fps buttons, sound volume apply fix 2012-05-24 11:50:48 +02:00
scrawl
9b94edd561 audio tab with volume sliders 2012-05-24 04:34:53 +02:00
scrawl
cb35f4d208 some unrelated gui cleanup 2012-05-24 03:50:02 +02:00
scrawl
a1907e7b88 cleaning up mwgui/widgets part 1 2012-05-24 03:48:02 +02:00
scrawl
7ebbc099b3 allow stacking gui modes 2012-05-23 12:23:35 +02:00
scrawl
689cf7ce05 ConfirmationDialog 2012-05-23 05:28:25 +02:00
scrawl
656a8f1be9 working menu transparency slider 2012-05-23 01:32:36 +02:00
scrawl
313294c522 settings window (hotkey F2) which does nothing. Yay! 2012-05-22 21:40:42 +02:00
scrawl
5f6e8224f4 skill progress 2012-05-21 10:48:25 +02:00
scrawl
40c52c5d09 max faction rank crashfix 2012-05-21 05:19:20 +02:00
scrawl
1079bb2677 finished tooltips for everything in the stats window, some gui refactoring 2012-05-21 05:14:07 +02:00
scrawl
4a009fc2bb faction tooltip (doesn't handle player having max. rank) 2012-05-21 02:58:06 +02:00
scrawl
8ce4727424 skill tooltips 2012-05-21 01:58:11 +02:00
scrawl
6518eb7794 some cleanup 2012-05-20 22:55:14 +02:00
scrawl
1c7110fbf5 birthsign tooltip 2012-05-20 22:45:30 +02:00
scrawl
8d52ee27dc attribute tooltips now use a new system that allows complex tooltips to be defined entirely through layout files 2012-05-20 22:06:54 +02:00
scrawl
876b369ca5 minor tooltip fix 2012-05-19 16:28:10 +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
4fb30544d4 more gui files cleanup 2012-05-19 16:00:00 +02:00
scrawl
7a4de0ed1d changed more gui stuff to use the new tag system 2012-05-19 15:32:32 +02:00
scrawl
7ef0ad4e39 show faction & birthsign in the stats window 2012-05-19 14:55:09 +02:00
scrawl
24ce88de2a working mygui tag replacement system for GMST strings 2012-05-19 14:19:21 +02:00
scrawl
1006411c02 small fix for mygui log being spammed with errors 2012-05-19 00:06:11 +02:00
scrawl
41466fc5fc gold label fix, and don't allow selling gold 2012-05-18 23:00:31 +02:00
scrawl
656b08f620 removed the workaround for the ContainerStore bug. 2012-05-18 22:32:06 +02:00
scrawl
8a0c859c16 Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI 2012-05-18 22:27:48 +02:00
scrawl
f28f36f262 added sounds to trade window 2012-05-18 22:27:27 +02:00
scrawl
c30b9e4bb9 add/remove gold from the player at the end of the transaction. 2012-05-18 22:21:44 +02:00
scrawl
c004f5d570 adjust the "total cost"/"total sold" value when trading items, added some checks with respective user notifications 2012-05-18 22:06:25 +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
e2400ca7b2 only show items in the trade window that the NPC actually trades (services enum) 2012-05-18 15:51:33 +02:00
scrawl
adf0550292 fixed a wrong label. 2012-05-18 00:14:31 +02:00
scrawl
52e5e14654 use GMST sDefaultCellname for the map window when cell has no region or name. 2012-05-17 23:42:09 +02:00
scrawl
9a3fd96a0c display the merchant gold. 2012-05-17 22:24:47 +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
6ae642aa06 complete trade window layout 2012-05-17 21:15:48 +02:00
scrawl
4213b4370f trade window shows up and shows the vendor's inventory items. 2012-05-17 19:53:04 +02:00
scrawl
1f85475536 Merge branch 'master' into inventoryGUI 2012-05-17 19:03:41 +02:00
scrawl
0afda15ce9 fix for cells that have no region. 2012-05-17 18:14:33 +02:00
scrawl
5da4da820e beginnings of trade window layout. 2012-05-17 17:15:44 +02:00
scrawl
0dc5e5919b show the Barter entry in the dialogue gui for npcs/creatures that buy/sell stuff. doesn't work for the Creeper for some reason, but Mudcrab Merchant works. 2012-05-17 14:54:03 +02:00
scrawl
66abfd17ab check the container's "Organic" flag before trying to place items inside. 2012-05-17 14:13:35 +02:00
scrawl
0c1d06d9f7 added some trade window stuff, which does nothing yet. 2012-05-17 13:36:25 +02:00
scrawl
630241c8e2 load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum. 2012-05-17 13:12:38 +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
9c4243782e sorting items 2012-05-16 15:17:55 +02:00
scrawl
9a01e18b29 fix some MessageBox code that was using deleted pointers sometimes 2012-05-16 15:00:20 +02:00
scrawl
398a7dc65c crash fix (hopefully) 2012-05-16 14:32:48 +02:00
scrawl
6a0cb32b7e removed unnecessary code 2012-05-16 14:30:02 +02:00
scrawl
c5d685c780 added an assert 2012-05-16 14:28:57 +02:00
scrawl
f8c20ef77f don't allow putting items into a container if the weight is exceeded. 2012-05-16 00:20:24 +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
0f811edb47 fixed a bug with dropping items on the ground 2012-05-15 22:54:28 +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
b18ee198b4 use a raycast to determine where to place object, if distance is too far 
drop it on the ground
 2012-05-15 16:47:23 +02:00
scrawl
7fbee0d488 use MyGUI::InputManager instead of MWInputManager to detect ctrl/shift 2012-05-15 13:00:26 +02:00
scrawl
24a0fecd37 implemented item count selection dialog 2012-05-15 12:51:51 +02:00
scrawl
320cc7d020 implemented ctrl and shift-keys for item drag&drop (take all, take 1) 2012-05-15 11:02:50 +02:00
scrawl
933a40de14 better floating object label positioning. 2012-05-14 21:37:43 +02:00
scrawl
d3e162ec83 dropping items works 2012-05-14 17:41:17 +02:00
scrawl
6c9f75b322 some unfinished work for dropping objects into the gameworld 2012-05-13 18:35:56 +02:00
scrawl
967fb13fca remove the old inventory code, split HUD, map and mainmenu into seperate implementation files 2012-05-13 18:14:03 +02:00
scrawl
f300a5621c Merge branch 'master' into inventoryGUI 2012-05-13 17:45:57 +02:00
scrawl
a47d29c184 fix the inventory window overlapping with over windows in default layout 2012-05-13 16:41:00 +02:00
scrawl
8c458fc5ce Merge branch 'master' into gui 2012-05-13 16:20:35 +02:00
scrawl
e9a1ef4269 Merge branch 'master' into inventoryGUI 2012-05-13 16:16:54 +02:00
scrawl
3a93df8db4 dynamic inventory layout like morrowind 2012-05-13 11:25:35 +02:00
scrawl
d266b4fe87 hide the cursor during drag&drop and don't allow hotkeys that change guimode 2012-05-13 10:18:17 +02:00
scrawl
f31853d30b mouse wheel works when mouse is over an item 2012-05-13 01:27:17 +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
8e6c943400 "take all"-button sound (first item) 2012-05-12 20:39:21 +02:00
scrawl
fd18c95c5f implemented filters (no gui yet) 2012-05-12 20:35:50 +02:00
scrawl
24e54a81bd don't show icons in the inventory tooltips, exactly like MW does 2012-05-12 20:28:12 +02:00
scrawl
e6e50f4ad4 fix items getting cut off 2012-05-12 20:14:19 +02:00
scrawl
f3c88adc0b items can now also be dropped on another item (and will be placed in 
container)
 2012-05-12 20:06:44 +02:00
scrawl
54c23c7422 show the background texture for enchanted items in inventory/container 2012-05-12 19:48:01 +02:00
scrawl
19e8e84f9a more cleanup, removed the redundant ItemWidget and use widget userdata 2012-05-12 18:50:19 +02:00
scrawl
e714b77df8 small fix 2012-05-12 18:28:14 +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
a31a9e51d3 add the sound for item drag&drop 2012-05-12 14:29:49 +02:00
scrawl
722af60337 implemented the "Take all" button 2012-05-12 14:01:59 +02:00
scrawl
d64fccec6f display the item count in the tooltip 2012-05-12 13:46:03 +02:00
scrawl
7723044df0 added the item tooltips 2012-05-12 13:30:34 +02:00
scrawl
ed6ff0a94a cleanup 3 2012-05-12 13:12:37 +02:00
scrawl
3a6fde5039 cleanup 2 2012-05-11 16:58:07 +02:00
scrawl
a1b86acc38 Merge branch 'master' into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	files/mygui/core.xml
 2012-05-11 16:41:27 +02:00
scrawl
007a202deb cleanup 1 2012-05-11 16:34:36 +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
cfb7aa4343 Drag and drop works. There is a bug with item count when doing d&d. Clean-up time :p 2012-05-11 12:50:30 +02:00
gugus
9dd65dce30 Finished merging. 2012-05-11 11:52:07 +02:00
gugus
8e8f80807e Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/armor.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/clothing.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwclass/lockpick.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/probe.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwclass/weapon.cpp
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	apps/openmw/mwworld/class.cpp
 2012-05-11 10:40:40 +02:00
scrawl
83e434e2e9 small fix 2012-05-11 09:35:18 +02:00
scrawl
1f1edea6af make it possible to use scroll wheel when mouse is over a skill in the stats window; set the correct track size for the scrollbar 2012-05-11 08:45:03 +02:00
scrawl
65ccfba191 resize both the left and the right pane of the stats window 2012-05-11 08:15:22 +02:00
scrawl
c4aae96d94 implemented "goodbye" script function that force-cancels dialogue 2012-05-11 07:18:41 +02:00
Marc Zinnschlag
37095b62c6 removed another include 2012-05-10 12:51:40 +02:00
scrawl
60affb5288 removed include 2 2012-05-10 12:47:15 +02:00
scrawl
3d9e89c837 removed unnecessary include 2012-05-10 12:44:01 +02:00
scrawl
4ce50c503b a few tweaks 2012-05-10 11:29:28 +02:00
scrawl
de995e3a69 adjust topic list on window resize 2012-05-10 11:19:22 +02:00