1044 commits

Author	SHA1	Message	Date
Marc Zinnschlag	d9c1ed3d5e	Merge remote branch 'corristo/osx-packaging' into config	2012-02-15 10:32:16 +01:00
Nikolay Kasyanov	2020d916ec	added missing comment	2012-02-15 11:30:35 +04:00
Nikolay Kasyanov	57a4b19880	Feature #162 - Need to create app bundle using CMake, not by hand. Almost complete	2012-02-15 11:27:51 +04:00
Marc Zinnschlag	9af08ff18d	store screenshots in user directory instead of local directory	2012-02-13 18:34:21 +01:00
Marc Zinnschlag	77201d05bc	post-merge fix	2012-02-13 16:42:01 +01:00
Marc Zinnschlag	27caee664e	Merge remote branch 'lgro/config' into config ... Conflicts: components/files/path.hpp	2012-02-13 16:36:57 +01:00
Marc Zinnschlag	10d4771550	Merge remote branch 'corristo/osx-packaging'	2012-02-13 16:35:13 +01:00
Marc Zinnschlag	1a6a49b9b8	Merge remote branch 'lgro/fix_warnings'	2012-02-13 11:06:41 +01:00
Nikolay Kasyanov	5a42c6c6f5	Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher	2012-02-13 10:31:43 +04: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
Lukasz Gromanowski	bcc4d7a7c9	Issue #133 Handle resources across multiple data directories ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-02-12 14:21:07 +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
Pieter van der Kloet	eea8773be1	Changed the order of preference for the configuration files	2012-02-10 21:45:46 +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
Nikolay Kasyanov	472d88e2c5	Feature #162 - Need to create app bundle using CMake, not by hand WIP	2012-02-01 20:48:13 +04: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
Lukasz Gromanowski	b004e2479c	Issue #133 Handle resources across multiple data directories - WIP ... Work In Progress - added support for multiple paths in SoundManager. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-01-29 20:27:03 +01:00
Pieter van der Kloet	ea241d85ef	Fixed some issues with the CMake files	2012-01-28 01:36:17 +01:00
Lukasz Gromanowski	1d96b99532	Issue #168 - Configuration cleanup ... Added tokens processing, modified getInstallPath for linux so we could use ~/.wine/dosdevices symlinks. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-01-25 23:55:43 +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
Lukasz Gromanowski	406897aa64	Issue #168 - Configuration cleanup - WIP ... Sources update. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-01-21 17:58:49 +01:00
Lukasz Gromanowski	7c24ae9ac7	Issue #168 - Configuration cleanup - WIP ... This is "work in progress" commit, it shall not be merged alone, without succeeding commits (it's not fully functional). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-01-21 01:31:20 +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