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

8349 Commits

Author SHA1 Message Date
minggo ea5d7bc5ad Merge pull request #2361 from tiantian20007/dictStuff 
Implement CCDictionary::writeToFile();
 2013-05-06 23:17:11 -07:00
James Chen ff610eea2f Update AUTHORS 2013-05-07 14:08:13 +08:00
James Chen eaad4f52af Merge pull request #2495 from ptekchand/master 
fixed #2116: Support negative node scales of CCScrollView.
 2013-05-06 23:06:54 -07:00
James Chen 47cff27ecd Merge pull request #2519 from dumganhar/iss2106-js-bytecode 
fixed #2106: Fixing wrong display of non-ascii characters. The compiler needs to setUTF8 for compile option.
 2013-05-06 22:09:27 -07:00
James Chen 800952a17a fixed #2106: Fixing wrong display of non-ascii characters. The compiler needs to setUTF8 for compile option. 2013-05-07 13:07:40 +08:00
minggo 923234a095 Merge pull request #2399 from gelldur/linking_errors_linux_lub_curl 
Fixing linking errors for TestCPP with libcurl
 2013-05-06 20:52:58 -07:00
minggo 877e6032dc Update AUTHORS 2013-05-07 11:08:53 +08:00
minggo 80dfd4d493 Merge pull request #2407 from sergey-shambir/attribute_format 
Added __attribute__(__format__()) for CCLog and CCString
 2013-05-06 20:06:52 -07:00
James Chen dc4673a8b3 Update AUTHORS 2013-05-07 11:04:08 +08:00
James Chen b902fa1428 Merge pull request #2518 from dumganhar/iss2106-js-bytecode 
fixed #2106: Addig support for javascript bytecode.
 2013-05-06 20:02:15 -07:00
James Chen 9a7c849ce4 fixed #2106: Fixing a bug on android when only jsc files exist. 2013-05-07 10:50:09 +08:00
James Chen bf6bbba6ee Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-07 09:43:24 +08:00
sunzhuoshi fa39c41136 Fixed bad commit 2013-05-06 19:06:16 +08:00
James Chen 9a63b39974 Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-06 18:13:26 +08:00
sunzhuoshi 3da5a7d5cd Removed redundant code 2013-05-06 18:06:18 +08:00
minggo e6afc9a180 Update AUTHORS 2013-05-06 18:03:35 +08:00
minggo d395d26e1d Merge pull request #2417 from sergey-shambir/disable_copy 
Added CC_DISABLE_COPY macro
 2013-05-06 03:02:48 -07:00
sunzhuoshi cbb7824941 Modified jsbcc to use "-p" option to turn on pipe mode 2013-05-06 16:20:13 +08:00
sunzhuoshi 6e70884853 Removed redundant code 2013-05-06 15:43:33 +08:00
minggo 265168dac2 Update AUTHORS 2013-05-06 14:57:51 +08:00
minggo bbf0f9d1bd Merge pull request #2513 from savdalion/const-methods 
Added const methods for classes - purer code!
 2013-05-05 23:55:37 -07:00
minggo 2c9c5a02e5 Update AUTHORS 2013-05-06 14:54:12 +08:00
minggo 73dba9ef2c Merge pull request #2514 from savdalion/extend-tests 
Added example for russian language in TestCpp / LabelTest / BMFontUnicode
 2013-05-05 23:52:30 -07:00
minggo 9c1dfa12c8 Update AUTHORS 2013-05-06 14:46:22 +08:00
minggo 6f1eefea31 Merge pull request #2483 from Weeds/fix-HttpClient 
Fixed crash in HttpClient request on 64Bit
 2013-05-05 23:44:34 -07:00
James Chen f86a843c8b Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-06 12:55:44 +08:00
sunzhuoshi d4c4170368 Removed bad comment 2013-05-06 12:02:17 +08:00
James Chen 4657ef716c Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-06 11:43:40 +08:00
sunzhuoshi de27f1137a Changed byte code file ext to ".jsc" 
Modified loading logic to load js file first
 2013-05-06 11:32:23 +08:00
James Chen 0718e6cf70 Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-06 11:15:19 +08:00
James Chen 0868a18751 Update AUTHORS 2013-05-06 11:04:42 +08:00
James Chen 407998619a Merge pull request #2517 from dumganhar/iss2105-travis 
fixed #2105: Adding Travis build support for linux and NaCl.
 2013-05-05 19:58:47 -07:00
James Chen fead37eab3 fixed #2105: Adding Travis build support for linux and NaCl. 2013-05-06 10:55:39 +08:00
James Chen f12d118cb9 Merge branch 'travis' of https://github.com/sbc100/cocos2d-x into sbc100-travis 2013-05-06 10:24:28 +08:00
minggo 26081961c4 Update AUTHORS 2013-05-06 10:20:20 +08:00
minggo cc3f75c789 Merge pull request #2516 from rtissera/ios43_jpeg_fix 
Fix iOS 4.3 JPEG loading (darken picture, alpha issue)
 2013-05-05 19:18:50 -07:00
Romain Tisserand d2690d8942 Fix iOS 4.3 JPEG loading (darken picture, alpha issue) 2013-05-04 19:14:23 +02:00
minggo 587dfb8e9f Update AUTHORS 2013-05-04 23:56:29 +08:00
minggo 1a0db3749e Merge pull request #2496 from mchinen/mchinensedit 
Fix missing protocol method warning for iOS 6.0 addition
 2013-05-04 08:55:07 -07:00
minggo 8b627aee8c Merge pull request #2511 from ricardoquesada/xcode_warnings 
updates Xcode project to detect more warnings
 2013-05-04 08:29:52 -07:00
savdalion bade1f086d Added example for russian language in TestCpp / LabelTest / BMFontUnicode. 2013-05-04 15:28:24 +03:00
savdalion 5f549dd011 Added const modifier for classes CCArray, CCObject - fine code! 2013-05-04 15:05:06 +03:00
Ricardo Quesada ea30d21799 updates Xcode project to detect more warnings 2013-05-03 11:59:44 -07:00
Michael Chinen d47759cc32 EAGLView.mm: fix indent 2013-05-03 19:46:58 +09:00
minggo f7053d0f9d Update AUTHORS 2013-05-02 09:20:52 +08:00
minggo c1992a5abc Merge pull request #2500 from DarraghCoy/add_ccdirector_poptoscenestacklevel 
Add CCDirector::popToSceneStackLevel(int level)
 2013-05-01 18:17:38 -07:00
minggo cd6d74f8b1 Update AUTHORS 2013-05-02 09:07:01 +08:00
minggo df242a15a9 Merge pull request #2503 from minggo/evalString 
fixed #2099:fixed a bug in ScriptingCore::evalString not setting the out...
 2013-05-01 18:04:21 -07:00
minggo 0c721096ec fixed #2099:fixed a bug in ScriptingCore::evalString not setting the outval 2013-05-02 09:03:24 +08:00
Darragh Coy 212feb8d8c Add CCDirector::popToSceneStackLevel(int level) 
This replicates a change made to cocos2d-iphone in the following commit:
59c5272bff

The cocos2d-iphone change was originally discussed in the following pull request:
http://github.com/cocos2d/cocos2d-x/pull/2210
 2013-04-30 23:33:22 +01:00