axmol

Commit Graph

Author	SHA1	Message	Date
James Chen	b135d512d2	Update copyright to 2016. (#16311 )	2016-08-05 09:42:15 +08:00
Steve Tranby	24fd25e143	Iterator erase pattern	2016-04-01 18:29:21 -06:00
tjunxin	561350c2bc	comment line 83 As known, _glProgramStates is a cocos2d::Map container,it will call object->retain() when insert, and call position->second->release() when erase, so the statement of line 83 is redundant. If i don't comment line 83, the application will crash when GLProgramStateCache::removeUnusedGLProgramState() is called.	2014-12-18 13:49:54 +08:00
Ricardo Quesada	3dda35b4ef	Adds `std::nothrow` to `new` Since cocos2d-x doesn't support exceptions, it is important to add `std::nothrow` to all the `new` statements	2014-08-27 16:31:57 -07:00
Ricardo Quesada	0f67247325	Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 `511295e` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory	2014-05-16 14:36:00 -07:00
Ricardo Quesada	605fe8e4f3	fixes double free crash on GLProgramStateCache	2014-05-09 21:06:02 -07:00
Ricardo Quesada	77c03fcf11	ShaderCache -> GLProgramCache	2014-05-09 18:39:25 -07:00
yangxiao	95e036dd1b	GLProgramStateCache	2014-05-08 21:54:49 -07:00

8 Commits