893 commits

Author	SHA1	Message	Date
Jason Hooks	39ff8d6a01	Compile error retry	2012-03-06 18:28:41 -05:00
Jason Hooks	9848b67174	Fixing errors	2012-03-05 17:46:29 -05:00
Jason Hooks	a81ecb5f65	Bug 210 fix	2012-03-03 18:26:11 -05:00
Jason Hooks	36e9322830	a few changes2	2012-02-26 21:43:04 -05:00
Jason Hooks	8d7a5f469b	a few changes	2012-02-26 21:27:54 -05:00
Jason Hooks	08f3ecf935	Slightly better performance on animation2	2012-02-24 01:30:17 -05:00
Jason Hooks	fb51b281b2	Slightly better performance on animation	2012-02-24 01:16:30 -05:00
Marc Zinnschlag	781b16a00e	removed bCollision variable from World	2012-02-20 14:07:16 +01:00
Marc Zinnschlag	7eae24bb45	some fixes	2012-02-20 14:02:24 +01:00
Jason Hooks	7e1e746201	More changes	2012-02-19 17:59:50 -05:00
Jason Hooks	38a0d1d1c5	Merging in master	2012-02-19 15:39:12 -05:00
Jason Hooks	e330c22d68	Removing unneeded files	2012-02-19 02:04:47 -05:00
Jason Hooks	e58f2f5363	Eliminating unnecessary data from skeletons and shape saving	2012-02-19 02:01:15 -05:00
Marc Zinnschlag	1a6a49b9b8	Merge remote branch 'lgro/fix_warnings'	2012-02-13 11:06:41 +01:00
Lukasz Gromanowski	8829d46bda	Clean up compilation warnings. ... Clan up compilation warnings like "variable ... set but not used" introduced in some older and recent commits. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-02-12 15:45:08 +01:00
Marc Zinnschlag	facc36fa34	Merge remote branch 'corristo/osx-packaging' into packaging	2012-02-12 13:35:54 +01:00
Marc Zinnschlag	a0ac6e5150	cells were sometimes not fully loaded	2012-02-12 12:35:29 +01:00
Marc Zinnschlag	bc71fb47e0	minor fix	2012-02-10 21:24:33 +01:00
Pieter van der Kloet	17b1546dc1	Changed the way screenshots are created (Bug #191)	2012-02-10 20:23:59 +01:00
Marc Zinnschlag	bb7730a708	Merge branch 'lightfix'	2012-02-10 14:55:52 +01:00
gugus	597e670eef	corrected the light problem	2012-02-10 14:51:49 +01:00
Marc Zinnschlag	b878c87ba8	Merge branch 'renderingfix'	2012-02-10 14:33:27 +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	784c6fe0ff	some cleanup	2012-02-06 10:41:13 +01:00
Marc Zinnschlag	e1600d9a2a	fixed movable object cleanup for ordinary objects	2012-02-06 10:29:18 +01:00
Marc Zinnschlag	c471aa950f	re-enabled batching for statics; fixed a misplaced assert	2012-02-06 09:42:24 +01:00
Marc Zinnschlag	ee02154805	lights without a mesh were not rendered	2012-02-04 10:48:15 +01:00
Jason Hooks	2d0e83a2cf	Reversing changes	2012-01-30 00:06:29 -05:00
Jason Hooks	d2b3c1dbac	Collision may be working correctly	2012-01-29 18:13:43 -05:00
Jason Hooks	9c73fa6b6d	Physics sort of fixed	2012-01-29 17:50:51 -05:00
Nikolay Kasyanov	a301fc355e	Feature #162 - Need to create app bundle using CMake, not by hand In progress. Still need to handle dynamically loaded libs (Ogre & Qt plugins)	2012-01-29 23:41:27 +04:00
Jason Hooks	1da519a914	Some cleanup	2012-01-29 00:42:55 -05:00
Pieter van der Kloet	ea241d85ef	Fixed some issues with the CMake files	2012-01-28 01:36:17 +01:00
Jason Hooks	6de0847b86	Slightly better performance on animation	2012-01-25 01:21:30 -05: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
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
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