2726 Commits

Author	SHA1	Message	Date
Marc Zinnschlag	3f6afb13f1	Merge remote-tracking branch 'scrawl/alchemy'	2012-10-19 20:09:45 +02:00
scrawl	8d7514e341	corrected chance	2012-10-19 19:48:54 +02:00
scrawl	d76522e7a4	searchPtrViaHandle	2012-10-19 19:48:02 +02:00
Marc Zinnschlag	3f833af46a	Issue #407: Fortyfy attribute effects were ignored for the last 3 attributes	2012-10-19 10:07:27 +02:00
scrawl	28cc480ce1	fix some alchemy issues and make the gui use the new implementation	2012-10-18 22:21:39 +02:00
Marc Zinnschlag	18686614db	Merge remote-tracking branch 'scrawl/splashscreen_dirlisting' ... Conflicts: apps/openmw/mwgui/loadingscreen.cpp	2012-10-18 15:46:43 +02:00
Marc Zinnschlag	1864dbe031	Issue #61: potion creation	2012-10-18 15:33:27 +02:00
Marc Zinnschlag	f5caf227b2	Issue #61: remove ingredients on potion creation	2012-10-18 14:47:23 +02:00
Marc Zinnschlag	3c71378fad	Issue 61: improved ingredients handling in alchemy and documenation	2012-10-18 14:41:57 +02:00
Marc Zinnschlag	3fe0a73cf2	Issue #61: increase alchemy skill on successful potion creation	2012-10-18 14:38:38 +02:00
Marc Zinnschlag	510674aa5e	Merge branch 'master' into alchemy ... Conflicts: components/esm/loadmgef.hpp	2012-10-18 14:37:05 +02:00
Marc Zinnschlag	5fbca239dd	Issue #61: potion creation (1st part; still missing some implementations)	2012-10-18 14:02:06 +02:00
scrawl	e80394c0b5	fix training limit	2012-10-17 18:48:29 +02:00
scrawl	125315ebe7	remove a cout	2012-10-17 18:21:24 +02:00
scrawl	c64eb96952	Merge branch 'Travel_Dialogue' into training_travel ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwgui/dialogue.cpp apps/openmw/mwrender/globalmap.cpp files/mygui/CMakeLists.txt	2012-10-17 18:17:53 +02:00
scrawl	1a2034b4dd	training window	2012-10-17 18:03:02 +02:00
scrawl	6be092e268	substr check	2012-10-17 12:41:24 +02:00
scrawl	84a4fd56c3	consider all files in Splash directory	2012-10-17 12:39:45 +02:00
scrawl	6acbea822b	splash screen directory listing	2012-10-16 23:59:03 +02:00
scrawl	7d1e659960	fading, greying out destinations you cant afford, warning fix	2012-10-16 20:25:50 +02:00
gugus	9583a1b8e9	FadeOut/In, that's for you scrawl!	2012-10-16 19:59:53 +02:00
gugus	c9afe222be	traveling now takes time	2012-10-16 19:34:29 +02:00
Marc Zinnschlag	e05e683da3	Merge remote-tracking branch 'scrawl/spellcreation'	2012-10-12 17:19:30 +02:00
scrawl	f154031e54	last bits of the gui	2012-10-11 18:26:29 +02:00
Marc Zinnschlag	35d099a638	disabling gcc extensions	2012-10-09 17:10:25 +02:00
gugus	27a3487d78	right prices	2012-10-08 15:51:36 +02:00
gugus	5a611b66d7	traveling.	2012-10-08 11:14:22 +02:00
gugus	85d9357e3a	Travel GUI	2012-10-06 17:52:46 +02:00
scrawl	025e820703	abstracted code and use it in enchanting window as well	2012-10-03 15:36:10 +02:00
scrawl	1c0dd3ccc5	some editing code	2012-10-03 15:06:54 +02:00
Marc Zinnschlag	332039da10	Issue #61: replaced 4 ingredient member variables with vector in alchemy GUI	2012-10-02 10:29:47 +02:00
Marc Zinnschlag	14833a4c3a	Issue #61: More robust tools handling in alchemy window	2012-10-02 10:20:49 +02:00
Marc Zinnschlag	1cc2c2055f	Issue #61: Implemented basic ingredient handling in Alchemy class	2012-10-02 10:20:26 +02:00
Marc Zinnschlag	6469933ce8	Merge branch 'master' into alchemy ... Conflicts: apps/openmw/mwgui/alchemywindow.cpp	2012-10-02 09:30:49 +02:00
scrawl	21493c2dbd	added magic effect flags from Research wiki page	2012-10-01 23:33:07 +02:00
scrawl	63fd8172d8	Merge branch 'master' of https://github.com/zinnschlag/openmw into spellcreation	2012-10-01 23:09:03 +02:00
scrawl	fa358ab196	change the inventory preview to "inventoryhandtohand" animation pose	2012-10-01 18:04:21 +02:00
scrawl	ff2c2d2b96	Merge branch 'master' into spellcreation ... Conflicts: apps/openmw/mwbase/windowmanager.hpp	2012-10-01 17:54:45 +02:00
Marc Zinnschlag	d1c4559abe	fixed GMST string handling in GUI	2012-10-01 10:03:49 +02:00
Marc Zinnschlag	35d7b5e5b0	Merge remote-tracking branch 'greye/record_saving'	2012-10-01 09:50:20 +02:00
Marc Zinnschlag	29633bd02f	Merge remote-tracking branch 'greye/master'	2012-10-01 09:46:20 +02:00
greye	f907a6a86f	updateListener() every frame	2012-10-01 11:24:44 +04:00
Chris Robinson	6c5c9ce46e	Avoid console spam when a sound can't play	2012-09-30 17:38:55 -07:00
Chris Robinson	6942fa97da	Specify a proper up vector for the listener	2012-09-30 17:23:05 -07:00
Chris Robinson	991f942fba	Merge remote-tracking branch 'zini/master' into sound ... Conflicts: apps/openmw/mwsound/soundmanagerimp.cpp apps/openmw/mwsound/soundmanagerimp.hpp	2012-09-30 16:57:54 -07:00
greye	2fa4ac177a	initial resolving	2012-10-01 00:23:49 +04:00
greye	721324c1db	rm record inheritance, rework esmtool accordingly	2012-09-30 23:34:53 +04:00
Marc Zinnschlag	10c8360e07	Issue #61: Replaced apparatus handling in alchemy GUI with new implementation in Alchemy class	2012-09-30 19:05:45 +02:00
Marc Zinnschlag	42f02f3ccd	Issue #61: Re-implemented tool selection in Alchemy class	2012-09-30 18:54:20 +02:00
Marc Zinnschlag	20a263738a	Merge remote-tracking branch 'chris/animation'	2012-09-29 12:39:56 +02:00