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

10762 Commits

Author SHA1 Message Date
James Chen 6c3878fc45 issue #2404: Fixing a warning in ccTypes.h. 2013-07-25 13:45:41 +08:00
James Chen af3b8a0390 issue #2404: Rename CallFuncND/CallFuncO to CCCallFuncND/CCCallFuncO and mark them as deprecated classes. In v3.0, we could use CallFuncN instead. 2013-07-25 13:45:02 +08:00
James Chen f16a64cf4a issue #2404: Compilation error fixes. 2013-07-25 11:56:09 +08:00
James Chen 306587167d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2404-ext-deprecated 
Conflicts:
	AUTHORS
 2013-07-25 11:28:48 +08:00
James Chen fa3d125c4b issue #2404: Adding CCDeprecated-ext.h to iOS/Mac projects. 2013-07-25 10:45:54 +08:00
James Chen 99a750f7b2 Merge branch 'iss2404-ext-deprecated' of https://github.com/dumganhar/cocos2d-x into iss2404-ext-deprecated 2013-07-25 10:33:51 +08:00
James Chen 477dd6c3c7 issue #2404: cocos-ext include WebSocket.h and SocketIO.h now. WebSocket.h doesn't depend on <libwebsockets.h> now. 2013-07-25 10:33:19 +08:00
minggo a13a46e54f Merge pull request #3243 from azmeuk/emscripten-package 
Use of a single emscripten HTML template file
 2013-07-24 18:36:28 -07:00
minggo a55982cbfe Merge pull request #3245 from ricardoquesada/fixes_warnings 
Fixes some warnings
 2013-07-24 18:25:33 -07:00
Ricardo Quesada 943b805bc8 Fixes some warnings 
... and updates the version to pre-alpha0
 2013-07-24 14:02:36 -07:00
Éloi Rivard 682a1238fa Use of a single emscripten HTML template file. 2013-07-24 17:59:21 +02:00
James Chen e0f9ac82da issue #2404: Updating ExtensionsTest/CocosBuilderTest. 2013-07-24 18:17:20 +08:00
James Chen 762b987ae7 issue #2404: [Extensions] Updating the file for deprecated methods. 2013-07-24 18:00:40 +08:00
James Chen fb1b510557 issue #2404: Deprecated some methods in NodeLoaderLibrary.h/.cpp. 2013-07-24 18:00:02 +08:00
James Chen 00999b464e issue #2404: Reverting callback interface for CCBReader. 2013-07-24 17:59:21 +08:00
James Chen e5c2ad0cb8 issue #2404: Mark Texture2D::setTexParameters(const ccTexParams* texParams) as deprecated. 2013-07-24 17:54:17 +08:00
James Chen d42ff355b6 issue #2404: Mark RenderTexture:: newCCImage as deprecated. 2013-07-24 17:53:34 +08:00
James Chen 7fd0a923e9 issue #2404: Updating CCDeprecated.h, CC_DEPRECATED_ATTRIBUTE typedef Component CCComponent; 2013-07-24 17:52:00 +08:00
James Chen debd1965c9 Merge branch 'deprecation' of https://github.com/azmeuk/cocos2d-x into iss2404-ext-deprecated 
Conflicts:
	cocos2dx/include/CCDeprecated.h
 2013-07-24 16:53:14 +08:00
James Chen 44a338f63c issue #2404: Re-add CallFuncND and CallFuncO and mark them as deprecated class. 2013-07-24 16:45:11 +08:00
minggo ff0cbb9d0b Merge pull request #3232 from samuele3hu/TestSample 
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
 2013-07-23 23:33:28 -07:00
minggo 9b3f4a604b [ci skip] 2013-07-24 12:04:59 +08:00
samuele3hu bf692c8fde issue #2426:Modify tab and spaces 2013-07-24 12:03:54 +08:00
James Chen a2ba2e3f87 Merge pull request #3236 from dumganhar/iss2427-js-parse-plist 
closed 2427: Exposing cc.FileUtils.getInstance().createDictionaryWithContentsOfFile to JS.
 2013-07-23 20:56:30 -07:00
minggo 503f53b7c4 Merge pull request #3219 from metadao/develop 
typo; more Pythonic
 2013-07-23 20:51:56 -07:00
samuele3hu a52bab7a66 issue #2426:Modify coding style 2013-07-24 11:51:24 +08:00
James Chen 4cc3f63507 closed #2427: Exposing cc.FileUtils.getInstance().createDictionaryWithContentsOfFile to JS. 2013-07-24 11:51:12 +08:00
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