12 Commits

Author	SHA1	Message	Date
Tamito Kajiyama	a42ba82f63	Merged changes in the trunk up to revision 50829. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/render/intern/source/convertblender.c source/blender/render/intern/source/pipeline.c Also addressed code inconsistency due to changes in the trunk revision 50628 (color management with OCIO) and 50806 (UV project material). OCIO-related changes are marked OCIO_TODO as in some other files modified in revision 50628.	2012-09-23 18:50:56 +00:00
Campbell Barton	81d8f17843	style cleanup: pep8, indentation	2012-03-24 07:36:32 +00:00
Campbell Barton	4a04f72069	remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n	2011-10-23 17:52:20 +00:00
Nathan Letwory	344caea0b3	doxygen: gameengine/GameLogic tagged.	2011-02-25 13:32:11 +00:00
Nathan Letwory	5b607701a7	doxygen: prevent GPL license block from being parsed as doxygen comment.	2011-02-23 10:52:22 +00:00
Campbell Barton	081c1205a3	correct fsf address	2010-02-12 13:34:04 +00:00
Chris Want	5d0a207ecb	Patch from GSR that a) fixes a whole bunch of GPL/BL license ... blocks that were previously missed; and b) greatly increase my ohloh stats!	2008-04-16 22:40:48 +00:00
Kent Mein	f13bff1588	The non scons specific stuff for bug tracker bug #2131 ... Basically removed #include <iostream.h> from some files that didn't need it (and I'm assuming it caused problems) I'll leave the scons stuff for someone else to look at since I don't really use it. Kent	2005-01-18 14:17:44 +00:00
Nathan Letwory	333f0a29db	Added #include <assert.h> so it compiles where assert() was used.	2004-10-16 18:13:00 +00:00
Kester Maddock	7b2567924b	Switch fixed time system. Logic updates should now happen at 30Hz, physics at 60Hz. (By default, use Python to set.) Some actuators still run at framerate (IPO, Action) for nice smooth animation, and an excuse to buy high end hardware. ... Keyboard sensors can now hook escape key. Ctrl-Break can be used from within blender if you've forgotten an end game actuator. Fixed a stupid bug preventing some actuators working (like TrackTo).	2004-10-16 11:41:50 +00:00
Kent Mein	209a2ede2c	Last of the config.h mods... ... #ifdef HAVE_CONFIG_H #include <config.h> #endif added to these files. Kent -- mein@cs.umn.edu	2002-11-25 15:29:57 +00:00
Hans Lambermont	12315f4d0e	Initial revision	2002-10-12 11:37:38 +00:00