krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
3132 commits 35 branches 0 tags 65 MiB
Commit graph

375 commits

Author SHA1 Message Date
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
Marc Zinnschlag
37095b62c6 removed another include 2012-05-10 12:51:40 +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
scrawl
8a9e05a96b display text on the book window 2012-05-10 11:03:27 +02:00
scrawl
e5e8663bb4 parse <div> <font> and <p> 2012-05-09 02:11:44 +02:00
scrawl
8e7ab09a25 scroll window image tags working 2012-05-09 01:34:32 +02:00
gugus
e9134717d6 the GUI part of drag and drop is working 2012-05-08 12:59:47 +02:00
scrawl
cd351ba3af simple scroll text parsing (tags are ignored until now) 2012-05-08 00:39:52 +02:00
scrawl
3c69d26571 journal close sound 2012-05-07 19:42:04 +02:00
gugus
60ad6f01d4 another step towards drand and drop. 2012-05-06 11:04:07 +02:00
scrawl
d91129ed49 Merge branch 'master' into gui 2012-05-04 23:54:37 +02:00
scrawl
499dd26398 dialogue window topic list word-wrapping 2012-05-04 23:53:50 +02:00
scrawl
a4d6d1baff added a utility for creating texture atlas at runtime 2012-05-04 18:09:45 +02:00
scrawl
4ddd24fdfc Merge branch 'master' into tooltips 2012-05-04 07:38:27 +02:00
scrawl
ad5753ba91 Merge branch 'master' of https://github.com/zinnschlag/openmw into gui 2012-05-04 07:34:38 +02:00
scrawl
5028a83d11 fix stats window layout resizing 2012-05-03 07:03:04 +02:00
scrawl
9fc1138a87 opening, closing and taking books/scrolls works 2012-05-03 05:26:05 +02:00
scrawl
0e6b82284f book & scroll windows 2012-05-03 03:33:33 +02:00
scrawl
c0e12d0e56 class dialog fix 2012-05-03 01:11:49 +02:00
Chris Robinson
144d52cf49 Add voices to the chargen class questions 2012-05-01 20:30:31 -07:00
scrawl
bd132074af some formatting tweaks 2012-04-30 22:37:23 +02:00
scrawl
48e3c43823 added the bloodmoon/tribunal spells 2012-04-30 21:36:45 +02:00
scrawl
6d21fe3115 fixed mygui leaking some stuff resulting in lower fps after looking at tooltips and low-quality text 2012-04-30 21:07:25 +02:00
scrawl
cc365c5bcb Merge branch 'master' into tooltips 2012-04-30 18:23:27 +02:00
scrawl
fc06dc72c9 small fix 2012-04-30 18:20:44 +02:00
scrawl
ea275a8aa8 extended the list of spells with no magnitude / no duration 2012-04-30 18:11:34 +02:00
gugus
5f8c08b18b some work for dropping objects. 2012-04-30 13:01:18 +02:00
Marc Zinnschlag
53e77d4196 Merge remote branch 'scrawl/tooltips' into next 2012-04-30 10:21:21 +02:00
scrawl
2f0a69160c small fix 2012-04-30 02:10:55 +02:00
scrawl
22f524f8d5 potion effects in tooltip 2012-04-30 01:53:22 +02:00
scrawl
b82c39c8be renamed Widgets::MWEnchantment to Widgets::MWEffectList so it can be 
reused for potion effects
 2012-04-30 01:08:10 +02:00
scrawl
f733382f74 tooltip now contains info about item enchantment 2012-04-30 00:57:41 +02:00
scrawl
eca18f3e1d dialogue topic and choice sorting independent of case 2012-04-29 18:13:03 +02:00
gugus
5603cb312c Objects can now be selected and follow mouse movements. 2012-04-27 20:54:39 +02:00
gugus
a6419c3596 Clicking on an item is now detected. 
Trying to have items follow the mouse position, but it doesn't work yet.
 2012-04-26 19:35:45 +02:00
scrawl
1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp
 2012-04-24 02:02:03 +02:00
Marc Zinnschlag
9f1199ee7e removing a using directive from a header file 2012-04-23 15:29:15 +02:00
Marc Zinnschlag
35f478071e Issue #255: deleted the old environment class and using the new one instead 2012-04-23 15:27:03 +02:00
scrawl
1b02b503a2 gcc compile fix 2012-04-22 21:06:08 +02:00
gugus
25432d97d2 trying to get selected item. Doesn't work. 2012-04-21 20:35:45 +02:00