1036 commits

Author	SHA1	Message	Date
Marc Zinnschlag	00ac2deefb	Merge remote branch 'pvdk/cmakeogre' into cmakeogre	2012-02-10 14:36:34 +01:00
Marc Zinnschlag	c4e028effe	fixing a faulty include	2012-02-06 10:48:58 +01:00
Marc Zinnschlag	0b0254d30e	spelling fix	2012-02-06 10:48:14 +01:00
Marc Zinnschlag	52a6605f10	Merge remote branch 'mirc/refactor_wm' into refactor_wm ... - changed the way dynamics stats are passed to the character creation object - some more clean up Conflicts: .gitignore apps/openmw/mwgui/window_manager.cpp apps/openmw/mwgui/window_manager.hpp	2012-02-03 11:24:28 +01:00
Cris Mihalache	4bc7051741	Finished refactoring, brought CharacterCreation up to standards	2012-02-02 18:31:28 +02:00
Cris Mihalache	ed5892eb5c	Finished moving the bulk of character creation code	2012-01-30 21:53:17 +02:00
Cris Mihalache	d17ba6ce19	Forgot the CharacterCreation files	2012-01-30 19:27:49 +02:00
Cris Mihalache	4b758376be	Created a class for char gen, and starting moving code to it	2012-01-30 16:38:43 +02:00
Marc Zinnschlag	e19cea3e7b	Merge branch 'refdata' into next	2012-01-30 12:38:35 +01:00
Marc Zinnschlag	a4785ffc4f	minor fix	2012-01-30 12:38:13 +01:00
Marc Zinnschlag	5a70f28f47	removed a warning	2012-01-29 20:29:02 +01:00
Marc Zinnschlag	81d0d58346	Merge remote branch 'mirc/master' into openengine	2012-01-29 20:25:11 +01:00
Cris Mihalache	daa8fb15ce	Removed all physics-related code from Engine	2012-01-29 20:51:20 +02:00
Cris Mihalache	6d4fa9274e	Moved OpenEngine systems into their appropriate classes	2012-01-29 17:31:18 +02:00
Marc Zinnschlag	0d7f39fcb5	Merge branch 'refdata' into next	2012-01-28 11:46:34 +01:00
Pieter van der Kloet	ea241d85ef	Fixed some issues with the CMake files	2012-01-28 01:36:17 +01:00
Marc Zinnschlag	8de6761a79	general cleanup	2012-01-27 15:11:02 +01:00
Marc Zinnschlag	c081160591	replaced container store in ref data with new custom data implementation	2012-01-27 14:55:58 +01:00
Marc Zinnschlag	b0256cea34	replaced movement settings in ref data with new custom data implementation	2012-01-27 13:17:30 +01:00
Marc Zinnschlag	aa87bd4030	replaced creature stats in ref data with new custom data implementation	2012-01-26 11:35:47 +01:00
Marc Zinnschlag	c6761e3470	replaced NPC stats in ref data with new custom data implementation	2012-01-25 16:56:49 +01:00
Marc Zinnschlag	baf9cff21d	added customdata base class (issue #185)	2012-01-24 11:24:05 +01:00
Marc Zinnschlag	4b6cd582a7	removed some redundant (and misplaced) functions	2012-01-24 10:45:40 +01:00
Marc Zinnschlag	26c328e73f	added some more comments to avoid further confusion	2012-01-23 14:55:00 +01:00
Marc Zinnschlag	16bc374921	animation updates were hooked up to the wrong update function	2012-01-23 14:33:06 +01:00
Marc Zinnschlag	7439c83623	Added custom copy-constructor, assignment-operator and destructor for RefData ... Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117.	2012-01-22 11:22:12 +01:00
Marc Zinnschlag	6a88133178	Split refdata.hpp in a hpp and a cpp file ... Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117.	2012-01-22 11:00:40 +01:00
Marc Zinnschlag	0c2de2c00c	Merge branch 'animation2'	2012-01-17 15:37:51 +01:00
Marc Zinnschlag	9b910dda94	clean up	2012-01-17 15:10:53 +01:00
Marc Zinnschlag	e3631003e9	Merge remote branch 'yacoby/detailed_fps'	2012-01-17 14:04:00 +01:00
Marc Zinnschlag	f5a82931b6	some cleanup	2012-01-17 13:53:27 +01:00
Jacob Essex	e73640e720	Improved code, added labels to the counter	2012-01-17 11:58:06 +00:00
gugus	484b8a95f0	removed useless std::cout	2012-01-16 21:58:18 +01:00
Jacob Essex	3b15170d09	Cleaned up and simplified the code relating to the fps display	2012-01-16 18:16:33 +00:00
gugus	eb4dea3d87	Previous/Next button implemented	2012-01-16 17:46:25 +01:00
Jacob Essex	18e4b73a86	Added a more detailed fps counter displaying the triangle and batch count	2012-01-16 15:33:21 +00:00
Jason Hooks	e35aee0f89	Disjointed free part fix	2012-01-13 02:19:28 -05:00
Jason Hooks	41769f202c	Huge Performance Increase	2012-01-13 00:48:52 -05:00
Jason Hooks	d1793bc4bd	Animation files in the correct directory	2012-01-12 20:09:55 -05:00
Jason Hooks	0712bba49b	Changing a few things around with handleshapes	2012-01-12 16:03:07 -05:00
gugus	9031f62962	The journal is now in the center of the screen.	2012-01-11 12:58:39 +01:00
Jason Hooks	5e1cc07ee8	Fixed ancestor ghost crash	2012-01-10 02:00:04 -05:00
Jason Hooks	eab69f18ac	File output switch	2012-01-10 00:34:29 -05:00
Jason Hooks	7fde576dd9	actor physics again	2012-01-07 23:21:19 -05:00
Jason Hooks	a615369189	Warning and different physics	2012-01-06 22:52:15 -05:00
Jason Hooks	295eb27c2d	Better Text Indices; Better file output	2012-01-06 18:23:41 -05:00
Jason Hooks	859ac1153e	Basic Text Indices Working	2012-01-06 02:27:10 -05:00
Jason Hooks	0715f9b6ab	Preparing to use text indices	2012-01-06 00:55:02 -05:00
Jason Hooks	595d0b1192	Cleanup; warnings	2012-01-05 21:45:17 -05:00
Jason Hooks	c2fa82326d	Animation with physics attempt	2012-01-04 23:48:25 -05:00