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

13529 Commits

Author SHA1 Message Date
rablwupei 96462eb81f fix bug: cccolor to jsval function has error in jsb 2013-11-14 12:03:44 +08:00
minggo 063bc6b833 [ci skip] 2013-11-14 11:54:54 +08:00
minggo 13756b7558 [ci skip] 2013-11-14 11:52:52 +08:00
minggo 996be7502a Merge pull request #4129 from michaelcontento/color-convenience 
[ci skip]Colors are now compare- and explicit convertible
 2013-11-13 19:50:31 -08:00
minggo 5c58a8224c Merge pull request #4168 from xhcnb/fix_ccb_nodeloader 
[ci skip]Fix a bug:we can use 'Custom Class' in CocosBuilder, and assign custom p...
 2013-11-13 19:46:08 -08:00
CaiWenzhi 611ba9e9f5 Modify code criterion 2013-11-14 11:37:46 +08:00
minggo a2bfc31ea0 [ci skip] 2013-11-14 11:27:26 +08:00
minggo 4b9215708c [ci skip] 2013-11-14 11:25:39 +08:00
minggo f56cf9b8bf Merge pull request #4222 from HoGarfield/Scale9SpriteLoader 
[ci skip]To set anchor point to 0,0 when created by loader
 2013-11-13 19:23:49 -08:00
minggo 0f3cb95f58 Merge pull request #4028 from lite3/develop 
[ci skip]add options for android_mk_generator
 2013-11-13 19:21:58 -08:00
minggo 95effc0207 Merge pull request #4234 from xhcnb/dev_fix_ccuserdefalut 
[ci skip]Fix: UserDefault::createXMLFile with correct XML definition.
 2013-11-13 19:16:34 -08:00
minggo 6b07ee4d08 [ci skip] 2013-11-14 11:15:02 +08:00
Jason Xu f4425f5db2 C++11: NULL -> nullptr 2013-11-14 11:08:50 +08:00
minggo c1ccfc5cea [ci skip] 2013-11-14 10:41:09 +08:00
Jason Xu dee3bffcdc Fix: UserDefault::createXMLFile with correct XML definition. 2013-11-14 10:40:06 +08:00
minggo 23b2bdb6eb Merge pull request #4137 from HoGarfield/AssetsManager.uncompress 
[ci skip]Adding test whether the file directory exists when uncompressing file entry,if does not exist then create directory
 2013-11-13 18:39:42 -08:00
minggo ed83a0b374 Merge pull request #4205 from bmanGH/fix_touch_retain 
[ci skip]fix direct delete touch object without use release crash bug;
 2013-11-13 18:30:21 -08:00
minggo e6653e133b Merge pull request #4193 from ricardoquesada/doxygen_markdown 
[ci skip]Adds markdown comments in the doxstrings
 2013-11-13 18:15:59 -08:00
minggo c51f0965aa [ci skip] 2013-11-14 10:12:25 +08:00
minggo 9b2da3b09f [ci skip] 2013-11-14 10:11:18 +08:00
minggo 97063dfe7d Merge pull request #4208 from bmanGH/feature/add_functions_to_glprogram 
[ci skip]add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed into GLProgram class
 2013-11-13 18:10:10 -08:00
minggo 71ca09d041 [ci skip] 2013-11-14 10:09:32 +08:00
minggo a34011c682 Merge pull request #4229 from dabingnn/develop_fix_zFighting_TransitionScenePageTurn 
[ci skip]Fix bug: Z fighting on TransitionScenePageTurn
 2013-11-13 18:08:25 -08:00
Huabing.Xu b4b4e99522 Fix bug: rename const with under line seperator 2013-11-14 10:00:59 +08:00
minggo 84689e0121 Merge pull request #4206 from boyu0/iss2770_fix_warnings 
[ci skip]issue #2770: fix warnings
 2013-11-13 17:57:25 -08:00
minggo 7b61a34d71 Merge pull request #4230 from CocosRobot/updategeneratedsubmodule_1384393975 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-13 17:55:15 -08:00
CocosRobot dff9c6a5b5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-14 01:52:57 +00:00
minggo 87fd45a6a4 Merge pull request #4226 from nutty898/develop_nutty_addfunctiontoguireader_3 
[ci skip]Develop nutty addfunctiontoguireader 3
 2013-11-13 17:51:35 -08:00
minggo 408ab94eba Merge pull request #4215 from liamcindy/develop 
[ci skip]fixed ui animation play error
 2013-11-13 17:47:39 -08:00
Ricardo Quesada 0189f91480 More tests working 
[x]: Texture2D test working OK
 2013-11-13 17:47:26 -08:00
minggo 4abf5b50dd Merge pull request #4214 from samuele3hu/developCCS 
[ci skip]issue #2868:Add CocoStudio UI lua binding and some releated test samples
 2013-11-13 17:45:34 -08:00
Huabing.Xu ccbbff3c22 Fix bug: Z fighting on TransitionScenePageTurn 2013-11-14 09:44:35 +08:00
Ricardo Quesada 2ce2eaf4b3 More tests converted 2013-11-13 17:36:33 -08:00
Ricardo Quesada d590986e73 Constructors are protected 2013-11-13 15:55:36 -08:00
CaiWenzhi 9c1bd673ff Merge branch 'develop' into develop_nutty_optimizeguireader_3 2013-11-13 20:43:57 +08:00
CaiWenzhi 3ac054edbd Fixed bugs 2013-11-13 20:38:18 +08:00
CaiWenzhi 5f68e028b5 Modify reader and fixed bugs 2013-11-13 20:01:57 +08:00
samuele3 17f74eeb17 issue #2868:Modify armature test samples and add more armature test samples 2013-11-13 18:18:29 +08:00
minggo 39ec684ac8 [ci skip] 2013-11-13 15:32:22 +08:00
minggo 42e7106b99 [ci skip] 2013-11-13 14:57:24 +08:00
minggo 304b09527b Merge pull request #4207 from bmanGH/feature/configuration_VAO_runtime 
[ci skip]Configuration of VAO in runtime
 2013-11-12 22:55:29 -08:00
bmanGH 2687ee8915 put '{' in a new line to follow cocos2d-x coding style 2013-11-13 14:52:16 +08:00
garfield_ho fbb4d02251 When anchor point is 0,0 , CocosBuilder will not output anchor point param setting request.Although the Scale9Sprite`s anchor point is default to 0, 0, but when calling function "initWithBatchNode", the anchor point will be set to 0.5, 0.5. 2013-11-13 14:38:01 +08:00
bmanGH 2a08c3b876 remove conflicts files; 2013-11-13 14:28:23 +08:00
boyu0 ca4c289fd8 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings 2013-11-13 11:24:19 +08:00
boyu0 fb04c9e574 issue #2770: fix some warning 2013-11-13 11:22:34 +08:00
CaiWenzhi 0665d6c9bc Merge branch 'develop' into develop_nutty_optimizeguireader_3 2013-11-13 10:19:09 +08:00
CaiWenzhi 03b3d583e8 Modify scenereader 2013-11-13 10:16:16 +08:00
samuele3 26c3266711 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-13 10:15:24 +08:00
samuele3 062fb85943 issue #2868:Modify cocos2dx_studio.ini to add more auto-binding class 2013-11-13 10:12:44 +08:00