1808 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nikolay Kasyanov	cb95c82af2	Merge remote-tracking branch 'upstream/master'	2012-01-29 23:39:36 +04: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
Jason Hooks	1da519a914	Some cleanup	2012-01-29 00:42:55 -05:00
Marc Zinnschlag	61dd1922b0	more specific cmake source file GLOBing	2012-01-28 14:16:25 +01:00
Marc Zinnschlag	0d7f39fcb5	Merge branch 'refdata' into next	2012-01-28 11:46:34 +01:00
Marc Zinnschlag	f2972b1ca0	turned ContainerStore from a template into a simple struct	2012-01-28 11:45:55 +01:00
Marc Zinnschlag	a17c193f56	Merge remote branch 'pvdk/cmake' into cmake	2012-01-28 09:47:38 +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	6ada405af0	removing last bits of old D code	2012-01-25 16:08:55 +01:00
Jason Hooks	6de0847b86	Slightly better performance on animation	2012-01-25 01:21:30 -05:00
Yacoby	46b8d3a83e	Merge pull request #1 from corristo/terrain	2012-01-24 05:41:24 -08:00
Jacob Essex	5e3e6f9165	Fixed some minor bugs, a cells terrain can now be rendered as 4 Ogre::Terrain objects, possibly giving a speed increase	2012-01-24 13:29:31 +00:00
Nikolay Kasyanov	ec6243dd77	fixed compilation problem with llvm clang: constant type explicitly set to float	2012-01-24 16:01:29 +04:00
Marc Zinnschlag	baf9cff21d	added customdata base class (issue #185)	2012-01-24 11:24:05 +01:00
Marc Zinnschlag	f14dc90b34	Merge branch 'animationfix'	2012-01-24 10:46:15 +01:00
Marc Zinnschlag	4b6cd582a7	removed some redundant (and misplaced) functions	2012-01-24 10:45:40 +01:00
Marc Zinnschlag	258ab0218a	submodule update (issue #131)	2012-01-23 23:32:00 +01:00
Jacob Essex	cd0df082df	Textures are now blended between cells and the texture blending functions are now more abstract	2012-01-23 17:19:54 +00: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
Nikolay Kasyanov	1b1ce48502	Now terrain manager donesn't try to load terrain for interiors	2012-01-22 20:20:12 +04: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
Jacob Essex	637302fc87	Added blended textures to the terrain	2012-01-21 17:59:12 +00:00
Jacob Essex	18108c02a7	Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered	2012-01-21 16:59:08 +00:00
Jason Hooks	bcf3e45ff6	Proper buffer designation	2012-01-18 22:00:03 -05: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
gugus	edbf4f7bdc	forgot to update core.xml	2012-01-16 19:35:35 +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	ba2fc27c2d	oups forgot Cmake stuff	2012-01-16 18:10:16 +01: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