2167 commits

Author	SHA1	Message	Date
Marc Zinnschlag	da916cecfb	fixed a bug in a cmake script that resulted in some files being compiled twice	2012-07-15 19:29:09 +02:00
Marc Zinnschlag	f11bf49a90	cmake fix; silenced some warnings	2012-07-10 13:23:41 +02:00
gugus	164a5c8fe4	rotation now also work with the physic representation	2012-07-10 12:10:50 +02:00
gugus	70c74ede05	changed rotation order	2012-07-10 11:53:12 +02:00
gugus	410b693555	setAngle improvement	2012-07-10 11:15:46 +02:00
gugus	557e114992	clean-up + getScale/Angle script instructions	2012-07-09 19:28:44 +02:00
gugus	0a67f60a6e	Clean-up	2012-07-09 18:47:59 +02:00
gugus	e6716c25c3	little correction.	2012-07-09 15:41:19 +02:00
gugus	feec67094f	Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwworld/physicssystem.cpp	2012-07-09 15:23:26 +02:00
gugus	03f7740474	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/worldimp.hpp	2012-07-09 10:39:57 +02:00
Jason Hooks	b5edad790d	merge	2012-07-07 15:27:04 -04: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
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	205ed0ce5b	post merge fix	2012-07-03 15:53:42 +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	035c1c4b6e	added World interface class; cleanup of World interface	2012-07-03 01:06:38 +02:00
Marc Zinnschlag	efb95e2f83	Issue #317: check if spell actually exist in AddSpell	2012-07-02 14:25:46 +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
Marc Zinnschlag	89ac0fa232	Issue #312: Implemented ID-search caching to speed up some badly written scripts	2012-06-21 11:43:18 +02:00
Jason Hooks	5c51674070	update	2012-06-20 13:14:27 -04:00
Jason Hooks	86d8a07fc7	Switching back to old scaling	2012-06-19 13:28:06 -04:00
Marc Zinnschlag	1f0efa9f7d	Merge remote branch 'scrawl/guifixes'	2012-06-19 19:06:18 +02:00
scrawl	15e959868c	make some of the gui mode changes a bit safer	2012-06-19 17:07:00 +02:00
Marc Zinnschlag	590dfe8d63	fixed the container fill problem on cell load	2012-06-19 16:42:10 +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	9a6f012578	Merge branch 'script'	2012-06-19 11:07:47 +02:00
Jason Hooks	4d55ecfdbe	Deleting scaled shapes; scaleObject()	2012-06-18 13:03:00 -04:00
Marc Zinnschlag	09057daac5	Merge remote branch 'scrawl/containerunlocking'	2012-06-18 09:57:22 +02:00
Jason Hooks	33fe80723c	btScaledBvhTriangleMeshShapes	2012-06-17 20:56:10 -04:00
scrawl	de3daf3dc1	allow the 'lock' and 'unlock' script commands to work on containers, like in morrowind	2012-06-18 00:21:55 +02:00
Marc Zinnschlag	3c42a71dae	removed some cout spam	2012-06-16 16:42:35 +02:00
Marc Zinnschlag	e2a77037eb	fixed a type in a script instruction	2012-06-16 16:38:54 +02:00
Marc Zinnschlag	8283f5f135	added setHello/Fight/Flee/Alarm instructions	2012-06-16 16:31:32 +02:00