1684 commits

Author	SHA1	Message	Date
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
gugus	489261a6ae	Close button works.	2012-04-15 21:02:54 +02:00
gugus	58d05fa503	more clean-up. Container window shows up! But there is no working close button.	2012-04-15 20:56:45 +02:00
gugus	78c8a22cd1	more clean up. The container GUI shows up now	2012-04-15 19:32:41 +02:00
gugus	a38db39e88	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI ... Conflicts: apps/openmw/CMakeLists.txt	2012-04-15 17:54:13 +02:00
gugus	b309d245c5	cleaning up hircine work	2012-04-15 17:52:39 +02:00
Marc Zinnschlag	b5d12d0723	fixed ForceGreeting	2012-04-15 17:08:22 +02:00
Marc Zinnschlag	585ba41557	Merge remote branch 'gus/Factions2'	2012-04-15 17:05:38 +02:00
gugus	c24a85848f	forceGreeting script instruction	2012-04-15 15:56:36 +02:00
gugus	f68248e0d0	corrected a bug in getPCRank	2012-04-15 14:20:08 +02:00
gugus	45a5877b23	implement getPCRank. Does not work yet.	2012-04-15 12:05:46 +02:00
scrawl	4b0099fb5b	npc visibility flags fix	2012-04-14 16:10:47 +02:00
scrawl	fa5a1432c9	map lighting tweak, default settings tweak	2012-04-14 15:58:58 +02:00
scrawl	e05faa184f	Merge branch 'terrainshader' into graphics	2012-04-14 15:10:35 +02:00
scrawl	e04d127f30	terrain shader fixes	2012-04-14 15:10:26 +02:00
scrawl	d861b8e45e	Merge branch 'master' into graphics	2012-04-13 16:16:09 +02:00
Alexander "Ace" Olofsson	0c6862e3e6	Undefining some windows defines	2012-04-13 15:09:38 +02:00
Marc Zinnschlag	3442ef17a8	fixed ModDisposition	2012-04-13 14:54:13 +02:00
Marc Zinnschlag	73df51695c	Merge remote branch 'gus/Factions2' ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwscript/statsextensions.cpp	2012-04-13 14:49:37 +02:00
scrawl	a33ae35e94	some fixes	2012-04-13 13:28:31 +02:00
Marc Zinnschlag	e16daeed23	added GetSpell script function	2012-04-13 13:17:57 +02:00
scrawl	e3486931ae	F10 hotkey toggle FPS	2012-04-13 13:17:50 +02:00
Marc Zinnschlag	37f478b69a	Merge branch 'spells' ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwmechanics/npcstats.hpp	2012-04-13 11:32:33 +02:00
Marc Zinnschlag	b099e1baf5	added addspell and removespell script instructions	2012-04-13 11:12:53 +02:00
Marc Zinnschlag	52c7ee3b6a	moved selected spell from NpcStats to Spells	2012-04-13 10:49:45 +02:00
Marc Zinnschlag	1e56acc3de	Merge remote branch 'scrawl/graphics'	2012-04-13 10:12:07 +02:00
scrawl	fb78e853d4	removed 2 unneeded lines	2012-04-12 19:18:38 +02:00
Marc Zinnschlag	a4fb71a0fc	Merge remote branch 'scrawl/graphics'	2012-04-12 18:46:02 +02:00
scrawl	e2ec889d10	fixed a warning "implicit cast to float3"	2012-04-12 17:40:26 +02:00
gugus	7edc5c733c	corrected a bug about rank.	2012-04-12 17:29:05 +02:00
gugus	03d6d1fb82	NPC rank is correctly loaded now. Also corrected a potential bug (i think).	2012-04-12 17:08:57 +02:00
scrawl	a96ad7fb82	restored toggleWater	2012-04-12 16:46:56 +02:00
scrawl	800df7376c	use the cursors from morrowind.bsa and remove mwpointer.png	2012-04-12 14:26:21 +02:00
scrawl	a727bcd4a4	override nif transparency settings (part 1)	2012-04-11 20:13:15 +02:00
Marc Zinnschlag	26a529111c	removed old known spell list from NpcStats	2012-04-11 19:45:56 +02:00
Marc Zinnschlag	77065390d7	simplifying Spells class	2012-04-11 19:40:42 +02:00
Marc Zinnschlag	e04ccfced0	replaced old abilities container in CreatureStats with a Spells object	2012-04-11 19:03:36 +02:00
Marc Zinnschlag	750d79eaf0	added spell container class	2012-04-11 19:03:06 +02:00
scrawl	2a4fcf42a3	basic shadows	2012-04-11 18:53:13 +02:00
gugus	0553227ee1	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2 ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/player.cpp apps/openmw/mwworld/player.hpp	2012-04-09 14:43:35 +02:00
gugus	dd9a88cee2	clean up	2012-04-09 14:32:07 +02:00
gugus	6ca212b9e9	script instruction: PCJoinFaction	2012-04-09 14:30:42 +02:00
gugus	aa8418634f	add PCLowerRank script instruction	2012-04-09 14:26:53 +02:00
gugus	45d11eaf14	fixed a bug in the dialogue manager.	2012-04-09 14:23:12 +02:00
gugus	e5b1e27fa6	pcRaiseRank works. Player can now join factions.	2012-04-09 13:24:19 +02:00
Marc Zinnschlag	62908c9ef5	Merge remote branch 'scrawl/settingsfixes'	2012-04-09 10:47:13 +02:00
scrawl	1df7be7fee	- fixes to texture filtering setting ... - add a sensible warning to settings-default.cfg, since there have been some confusions with it	2012-04-09 00:10:42 +02:00
Marc Zinnschlag	0aecb0ed5c	cmake fix	2012-04-08 23:44:40 +02:00
Marc Zinnschlag	5e9d209b21	Merge remote branch 'minty3/testbranch'	2012-04-08 23:40:48 +02:00