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

13696 Commits

Author SHA1 Message Date
martell 2abca22bf4 Disabled some annoying Level 4 Warnings 2013-11-30 08:27:34 +00:00
martell 5c40fecd5e fix cmake for linux 2013-11-30 08:18:09 +00:00
martell f369606d77 fix cocos2d-x for vs2013 2013-11-30 08:05:39 +00:00
martell 79401a7596 quickly added win32 cmake 2013-11-30 06:09:12 +00:00
signmotion 03d64e0689 - Corrected CC_DISALLOW_COPY_AND_ASSIGN. 2013-11-29 20:34:15 +02:00
signmotion 41daad30fa Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-29 19:44:03 +02:00
Marc Lepage 940b0ffd56 Fix typos 2013-11-29 12:09:38 -05:00
Jason Xu 266e4e1654 rename to with Jni suffex 2013-11-29 19:34:36 +08:00
Jason Xu 27c3a459ed rename android native function names. 2013-11-29 17:17:15 +08:00
boyu0 83f855e2ec issue #2345: delete unnecessary include 2013-11-29 15:31:58 +08:00
boyu0 04c3d95005 issue #2345: namespace cocos2d { -> NS_CC_BEGIN 2013-11-29 15:25:21 +08:00
boyu0 dffc12e648 issue #2345: new/delete -> malloc/free 2013-11-29 15:13:16 +08:00
boyu0 86074c23d8 issue #2345: class Image add tga image format support. 2013-11-29 14:31:42 +08:00
minggo d3076a1415 [ci skip] 2013-11-28 16:09:21 +08:00
minggo ccc236f93c Merge pull request #4405 from boyu0/upgrade_box2d_to_2.3.0 
[ci skip]Upgrade box2d to 2.3.0
 2013-11-28 00:06:34 -08:00
boyu0 0ff2e65467 reset cmakelists.txt 2013-11-28 15:41:23 +08:00
minggo 3268da3a4d Merge pull request #4401 from minggo/thread-helper 
[ci skip]add helper funcion to invoke a function in gl thread
 2013-11-27 22:26:11 -08:00
boyu0 cfe522283c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into upgrade_box2d_to_2.3.0 2013-11-28 12:19:07 +08:00
boyu0 1c55c207bf update project setting 2013-11-28 11:55:18 +08:00
minggo 5923892a92 Merge pull request #4404 from CocosRobot/updategeneratedsubmodule_1385608475 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-27 19:15:22 -08:00
CocosRobot a24af527a3 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-28 03:14:39 +00:00
minggo d9139682ed Merge pull request #4403 from boyu0/iss2771_physical 
[ci skip]Iss2771 physical
 2013-11-27 19:10:25 -08:00
minggo c78ce63f14 use ThreadHelper::runOnGLThread() in AssetsManager 2013-11-28 11:06:08 +08:00
Ricardo Quesada 21afd63d82 Merge branch 'develop' into console 2013-11-27 14:29:27 -08:00
boyu0 4615eae22f issue #2771:remove unneeded include “ccConfig.h” 2013-11-27 18:30:48 +08:00
boyu0 72f2d68edd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-27 17:47:37 +08:00
minggo eded94ef76 don't create a pool, since it doesn't invoke any iOS dependent codes 2013-11-27 17:43:54 +08:00
boyu0 2b43e72e7c issue #2771: fix vs compile errors, change project setting 2013-11-27 17:33:33 +08:00
minggo bcb131262c add helper funcion to invoke a function in gl thread 2013-11-27 16:49:07 +08:00
James Chen 468ba24183 Merge pull request #4397 from CocosRobot/updategeneratedsubmodule_1385533506 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-26 22:32:04 -08:00
James Chen 749fc5d95b Update CHANGELOG [ci skip] 2013-11-27 14:31:05 +08:00
James Chen 1a283ab600 Merge pull request #4396 from dumganhar/iss3289-armature-crash 
closed #3289: [JSB] 'Test Frame Event' of CocoStudioArmatureTest Crashes...
 2013-11-26 22:29:36 -08:00
CocosRobot 4d327b8180 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-27 06:25:08 +00:00
James Chen c63698b488 Update CHANGELOG [ci skip] 2013-11-27 14:23:24 +08:00
James Chen 2bfb6af1d8 Merge pull request #4395 from dumganhar/iss3288-bind-unsigned-long 
closed #3288: Bindings-generator needs to support 'unsigned long'
 2013-11-26 22:21:08 -08:00
James Chen 6dc9183c8a closed #3289: [JSB] 'Test Frame Event' of CocoStudioArmatureTest Crashes! 2013-11-27 14:12:43 +08:00
James Chen 216f8743b0 closed #3288: Updates bindings-generator. 2013-11-27 14:04:53 +08:00
James Chen 4311e7c469 [Script Binding] Bind ‘unsigned long’. 2013-11-27 13:52:41 +08:00
minggo bd5ff294f8 Merge pull request #4391 from minggo/fix-warnings 
[ci skip]use unstripped libcurl lib for armeabi-v7 architecture to fix link warnings
 2013-11-26 19:04:15 -08:00
James Chen 94c41ea51e Update CHANGELOG [ci skip] 2013-11-27 11:03:16 +08:00
James Chen f4610c5272 Merge pull request #4382 from dumganhar/iss3279-xmlhttprequest-bin 
closed #3279: XMLHttpRequest receives wrong binary array.
 2013-11-26 19:02:07 -08:00
Ricardo Quesada 534fd9600e Adds CCConsole. 
it doesn't work... just the skeleton
 2013-11-26 18:58:36 -08:00
minggo 3469f2adf5 closed #2539:use unstripped libcurl lib for armeabi-v7 architecture to fix link warnings 2013-11-27 10:34:05 +08:00
James Chen 6d8b7fb494 Merge pull request #4390 from CocosRobot/updategeneratedsubmodule_1385518720 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-26 18:29:03 -08:00
CocosRobot dda13b7e8a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-27 02:18:42 +00:00
James Chen 6c097fa692 Merge pull request #4389 from minggo/remove-unneeded-codes 
override addChild in Sprite to fix error in binding generator
 2013-11-26 18:14:20 -08:00
minggo 0ac9022201 fix a typo 2013-11-27 10:02:32 +08:00
minggo 85002285c2 override addChild in Sprite to fix error in binding generator 2013-11-27 09:50:47 +08:00
Ricardo Quesada 2f1dffe46b Adds performFunctionInCocos2dThread 
... in Scheduler
 2013-11-26 16:58:14 -08:00
Ricardo Quesada 4a59cc6297 Merge pull request #4387 from ricardoquesada/build_type_conf 
Reports wether the build is DEBUG or RELEASE
 2013-11-26 14:37:33 -08:00