Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,497 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

2259 Commits

Author SHA1 Message Date
James Chen c6b2b86fe5 closed #4106: Object which isn't in Vector would also be released when invoking Vector::eraseObject. 
Also refactored 'Vector::eraseObject':
1) Removed 'toRelease' parameter, Vector class should manage reference count.
2) Added 'removeAll' parameter to decide wether to remove all elements with the same value or just the first occurrence .
3) Added relevant UnitTest for 'Vector::eraseObject'.
 2014-02-21 11:24:37 +08:00
James Chen 2eb1c1bb73 issue #4106: Ref class's constructor should be protected. 2014-02-21 11:21:08 +08:00
James Chen 0e154a2bec Merge pull request #5425 from dumganhar/develop 
closed #2535: TouchScriptHandlerEntry will release twice lua reference
 2014-02-20 21:59:33 +08:00
James Chen 68eaa746ea closed #2535: TouchScriptHandlerEntry will release twice lua reference 2014-02-20 21:58:20 +08:00
James Chen 7277046ba8 Merge pull request #5423 from dumganhar/develop 
closed #4104: Crash if invoking Array::initWithObjects()
 2014-02-20 21:45:51 +08:00
James Chen 23082c0d6c closed #4104: Crash if invoking Array::initWithObjects() 2014-02-20 21:44:40 +08:00
James Chen 30d100296a Merge pull request #5422 from dumganhar/develop 
Added virtual and override keywords to Scene::init() method
 2014-02-20 21:37:46 +08:00
James Chen 0b6858bdde Added virtual and override keywords to Scene::init() method 2014-02-20 21:37:01 +08:00
CocosRobot 6f2f35ab7a [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-20 13:11:20 +00:00
James Chen 0658355772 Merge pull request #4415 from HoGarfield/WsThreadHelper 
closed #4103: Potential crash when websocket connection closes
 2014-02-20 20:44:55 +08:00
James Chen 95143da782 Merge pull request #4990 from daltomi/debug 
closed #4102: Uses 'cbegin/cend', 'const std::string' where it's reasonable.
 2014-02-20 20:29:56 +08:00
James Chen e9fa65b6f4 closed #4101: No callback is invoked when websocket connection fails 2014-02-20 19:29:53 +08:00
James Chen dc6839d692 Merge commit 'refs/pull/5232/head' of git://github.com/cocos2d/cocos2d-x into merge5232 2014-02-20 19:27:17 +08:00
James Chen 787dade5b0 Merge pull request #5408 from dumganhar/iss4097-disable-script 
closed #4097: Adds a macro to disable inserting script binding relevant codes.
 2014-02-20 17:57:46 +08:00
CocosRobot 9e061b751a [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-20 09:52:15 +00:00
James Chen 7970e37bf5 closed #4097: Adds missing include. 2014-02-20 17:23:22 +08:00
samuele3hu e2596bce8b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 
Conflicts:
	tools/tojs/cocos2dx.ini
	tools/tolua/cocos2dx.ini
 2014-02-20 17:20:51 +08:00
James Chen b1e44a7ed6 issue #4097: Enables script bindings by default. 2014-02-20 17:02:20 +08:00
James Chen a218369ecd issue #4097: fix linking error of missing functions. 2014-02-20 17:01:13 +08:00
James Chen 0d8846d876 closed #4097: Adds a macro to disable inserting script binding relevant codes. 2014-02-20 16:40:46 +08:00
James Chen 62e0deaf35 Merge pull request #5384 from wefiends/s3tc_nomipmaps 
closed #4096: s3tc compressed textures with no mipmaps fail to be loaded.
 2014-02-20 15:58:13 +08:00
James Chen dd74add195 Merge pull request #5386 from heliclei/console-command 
add more console commands: resume, pause, stopanimation and startanimation
 2014-02-20 15:46:59 +08:00
CocosRobot 01bd61839b [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-20 07:38:05 +00:00
James Chen e2cb0e3ba5 Reverts auto-generated submodule. 2014-02-20 15:14:55 +08:00
James Chen 0af0ce9032 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1 
Conflicts:
	cocos/scripting/auto-generated
 2014-02-20 15:13:40 +08:00
James Chen 4cf4e15ba6 issue #4058: Adds CCStdC.h. 2014-02-20 15:12:35 +08:00
samuele3hu 7b85ffcb82 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 2014-02-20 15:11:56 +08:00
samuele3hu 514112921f close #4094:Add deprected support for EGLView and EGLViewProtocol on the lua binding 2014-02-20 15:10:34 +08:00
minggo 196ab2caff Merge pull request #5401 from natural-law/issue3540 
Solve the bug: Sometimes RenderTexture not drawn after a background/foreground
 2014-02-20 14:46:26 +08:00
zhangbin 9b2c5f71af closed #3540, Solve the bug: Sometimes RenderTexture not drawn after a background/foreground. 2014-02-20 14:43:07 +08:00
James Chen e3d14608df issue #4058: Uses 'void*' instead of 'Ref*' as target of Scheduler. Any class could response scheduler callback now. 2014-02-20 14:11:47 +08:00
Nick Barrios d9cbc5625c CCImage.cpp: If dds header reports 0 mipmaps, force _numberOfMipmaps to 1 to enable software decoding. Set _renderFormat just once for both hardware and software decoding (moved out of "load mipmaps" loop). 2014-02-20 00:48:09 -05:00
James Chen f7c8eb8de2 Merge pull request #5394 from samuele3hu/developEventTrigger 
issue #3229:The second param of glGetProgramiv which was called in the tolua_Cocos2d_glGetUniformfv00 was wrong
 2014-02-20 12:44:53 +08:00
James Chen 2c5f791e03 issue #4058: Scheduler:: scheduleUpdateForTarget is a template function now. And it works perfect. 2014-02-20 11:57:04 +08:00
CocosRobot 66906c3f66 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-20 03:38:12 +00:00
heliclei d5bef1ca35 merge pause, resume, stopanimation, startanimation into director command 2014-02-20 11:15:29 +08:00
Nick Barrios 45d751caa7 CCImage.cpp: initWithS3TCData() - When there is s3tc hardware support, set PixelFormat before loading mipmaps, to allow for textures with no mipmaps. 2014-02-19 22:13:12 -05:00
James Chen 9436173039 issue #4058: typedef Ref Object; and deprecate it. 2014-02-20 10:58:37 +08:00
James Chen 0ea27d8543 issue #4058: CCObject.cpp -> CCRef.cpp for all platform projects. 2014-02-20 10:56:25 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
Dhilan007 fd528b389d fix warning 2014-02-20 10:24:35 +08:00
Dhilan007 ddd02b463c optimize label: 
1.remove unnecessary API
2.reduces object-creation and function calls.
 2014-02-19 20:26:14 +08:00
Dhilan007 f086f39319 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-02-19 17:00:26 +08:00
samuele3hu e1387f40eb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 2014-02-19 16:57:18 +08:00
CocosRobot 1f45dd4349 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-19 08:27:37 +00:00
samuele3hu d7b0efd6d7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 2014-02-19 16:27:08 +08:00
samuele3hu ce1656fa8d fix: The lua binding of getPropertiesForGID would lead to compile error 2014-02-19 15:47:45 +08:00
samuele3hu 52a0b906da Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 2014-02-19 13:58:15 +08:00
CocosRobot 4ecd7ba58d [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-19 05:58:15 +00:00
samuele3hu d28e8485ec issue #3229:Lua version of GLGetUniformTest raise error on iOS when calling glGetUniformfv 2014-02-19 13:56:06 +08:00