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

11467 Commits

Author SHA1 Message Date
James Chen f429996719 Merge pull request #3233 from CocosRobot/updategeneratedsubmodule_1374635193 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-23 20:08:21 -07:00
CocosRobot 88211a401a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-24 03:06:37 +00:00
minggo a5ea0fe8a7 Update AUTHORS 2013-07-24 11:04:35 +08:00
minggo aac1a4c78a Merge pull request #3214 from bmanGH/develop 
修复CCTexturePVR创建GLTexture时没有使用GLStateCache
 2013-07-23 20:02:56 -07:00
James Chen fc6bdc29cc Merge pull request #3231 from dumganhar/more_best_practices_fixes 
Resolved compilation errors in PR https://github.com/cocos2d/cocos2d-x/pull/3216
 2013-07-23 20:00:31 -07:00
James Chen 35dec5d71e More CCLog --> log. 2013-07-24 10:46:13 +08:00
samuele3hu 45cc09c6cc issue #2426:Modify tab and spaces 2013-07-24 10:32:59 +08:00
James Chen e5b0bc1fc7 Put the deprecated method 'CCLog' to 'CCDeprecated.h'. 2013-07-24 10:26:36 +08:00
samuele3hu 4f1a46136a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample 2013-07-24 10:15:39 +08:00
samuele3hu e9df175e9a issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample 2013-07-24 10:15:16 +08:00
James Chen 7bc6abfac7 Compilation error fixes, since CCLog has been renamed to 'log', all platforms should implement it. 2013-07-24 10:14:42 +08:00
Ricardo Quesada 1f37d4d00a More best practices fixes and other bug fixes 
- Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end
- Removes more Hungarian notations in samples
- s/sprite/scene: fix from previous commit
- `CCLog` -> `log`
- `getLayerNamed` -> `getLayer`
- `getPropertyNamed` -> `getProperty`
- and other small fixes
 2013-07-23 15:20:22 -07:00
Ricardo Quesada 2013f841ad Merge branch 'develop' into more_best_practices_fixes 2013-07-23 13:36:22 -07:00
James Chen aef9d1f4ea Merge pull request #3221 from natural-law/develop 
Add ProtocolSocial for social SDKs in plugin
 2013-07-23 07:44:12 -07:00
James Chen 796b75afde Merge pull request #3229 from CocosRobot/updategeneratedsubmodule_1374589966 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-23 07:35:26 -07:00
CocosRobot 18248b0e85 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-23 14:32:59 +00:00
James Chen 9e0a55512f Merge pull request #3228 from dumganhar/iss2378-remove-CC_PROPERTY 
issue 2378: Removing CC_PROPERTY_XXX macros in engine.
 2013-07-23 07:09:05 -07:00
James Chen c7cf577b1a issue #2378: Deprecating some getters. Getter function needs to have 'get' prefix. 2013-07-23 22:07:33 +08:00
James Chen 8ad6fbd415 issue #2378: Mark getStoringCharacters as deprecated function. 2013-07-23 21:56:01 +08:00
James Chen baed1c5b48 issue #2378: More override functions. 2013-07-23 21:51:19 +08:00
James Chen a88d173d68 issue #2378: Compilation error fixes. 2013-07-23 21:37:30 +08:00
James Chen ab7d57feb7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2378-remove-CC_PROPERTY 2013-07-23 20:47:39 +08:00
James Chen 12bb640307 issue #2378: ParticleTest: _emitter->getOpacityModifyRGB --> _emitter->isOpacityModifyRGB 2013-07-23 20:47:19 +08:00
James Chen 9c859d5f9d issue #2378: Mark ParticleSystem::getOpacityModifyRGB as deprecated. 2013-07-23 20:44:42 +08:00
James Chen d942de1ae1 issue #2378: Variables to protected for Texture2D. 2013-07-23 20:42:43 +08:00
James Chen a0851cb5e0 issue #2378: Minor fix in CCParticleSystem. 2013-07-23 20:39:54 +08:00
James Chen a6b880a124 issue #2378: Reverting CCPlatformMacros.h 2013-07-23 20:38:35 +08:00
James Chen 4110b95e96 issue #2378: inline function are in header files now. 2013-07-23 20:36:41 +08:00
James Chen a1c4c73c1c issue #2378: More setter/Getter, removing CC_PROPERTY_XXX macros. 2013-07-23 18:26:26 +08:00
James Chen ed5bd2309e issue #2378: Setter/Getter for AtlasNode, removing CC_PROPERTY_XXX macros. 2013-07-23 15:19:49 +08:00
James Chen 50ba072bac issue #2378: Setter/Getter for Director, removing CC_PROPERTY_XXX macros. 2013-07-23 15:19:26 +08:00
Éloi Rivard da23893821 Updated AUTHORS 2013-07-23 08:59:03 +02:00
Éloi Rivard 2875284882 emscripten bugfix 2013-07-23 08:58:43 +02:00
Éloi Rivard 2545f75b5f CCCallFuncN deprecation 2013-07-23 08:58:43 +02:00
Éloi Rivard 36065400bc Created CCDeprecated-ext 2013-07-23 08:58:43 +02:00
zhangbin a4ed92ddaa Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-23 14:29:36 +08:00
zhangbin 9edc1dff80 closed #2416, Add social plugin : SocialNd91 & add sample code for social plugins. 2013-07-23 14:29:11 +08:00
zhangbin e35d06ae26 issue #2416, Add ProtocolSocial for iOS platform. 2013-07-23 14:26:11 +08:00
James Chen d6f15bc79f issue #2378: Setter/Getter for TextureAtlas, removing CC_PROPERTY_XXX macros. 2013-07-23 14:18:35 +08:00
minggo 8af95adbdf Merge pull request #3220 from minggo/develop 
closed #2393:fix a bug caused by marking functions as deprecated
 2013-07-22 23:17:03 -07:00
minggo b416511e6b closed #2393:fix a bug caused by marking functions as deprecated 2013-07-23 14:13:44 +08:00
James Chen 75a0cb6a29 issue #2378: Setter/Getter for CCTexture2D, removing CC_PROPERTY_XXX macros. 2013-07-23 14:05:05 +08:00
zhangbin b9bee5103f issue #2416, Add ProtocolSocial for android platform. 2013-07-23 13:45:23 +08:00
minggo a1743d06c9 Merge pull request #3218 from minggo/iss2412-refactor_platform 
remove some files
 2013-07-22 22:38:24 -07:00
Jerry Zhang 749e8f96eb typo; more Pythonic 2013-07-23 13:37:17 +08:00
minggo f840564c05 issue #2412:remove platform.h/.cpp from vs project 2013-07-23 11:45:20 +08:00
minggo f6cfe3007f issue #2412:fix merging conflict 2013-07-23 10:41:11 +08:00
James Chen 8ead893e72 Update AUTHORS [ci skip] 2013-07-23 10:08:15 +08:00
James Chen 31c734f386 Merge pull request #3212 from azmeuk/emscripten-script 
closed 2419: Updated emscripten-build.sh
 2013-07-22 19:05:51 -07:00
Ricardo Quesada c158cd5be6 More best practices fixes 
- Removes Hungarian notation from the CPP test (there are still some Hungarian to remove)
- Label and MotionStreak: Uses the CL() entry for the tests (lambda functions)
 2013-07-22 17:25:44 -07:00