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

8944 Commits

Author SHA1 Message Date
James Chen 36cc495dd9 Merge pull request #2529 from rohankuruvilla/cocosplayer 
fixed #2128: Bug fixes in CCBReader.
 2013-05-07 18:55:38 -07:00
James Gregory 25bded7faf Now validates as asm.js: Disable HttpClient, pthread_cond_signal and eglReleaseThread in Emscripten. 2013-05-07 17:25:39 -07:00
James Gregory a33e2965af Add libwebp linkage (needed for asm.js validation) 2013-05-07 17:24:24 -07:00
Rohan Kuruvilla b7aa71dcfc Fixing crash while trying to load sprite frame when the file is missing. Reports error instead 2013-05-07 14:53:41 -07:00
Rohan Kuruvilla 3d356d0a8f Removing setting ignoreAnchorPoint for child CCB files. Was causing a bug with positioning 2013-05-07 14:53:41 -07:00
imbahom 8d14627dd8 Update CCNode.cpp 
注释错误
 2013-05-07 14:53:41 -07:00
Michael Fox d735835753 Fixing coloring in CCControlButtons by overriding the set/get color functions 2013-05-07 13:48:58 -07:00
Michael Fox f51506eed2 Fixing CCScale9Sprites when loaded from CCB files to be able to change color and opacity 2013-05-07 12:02:32 -07:00
Ed Bartley 3ff7e5871c Added function ccSetPvrEncryptionKey(…) to set the encryption key in a single function call. 
Updated the TextureAtlasEncryptionTest to show how to use the ccSetPvrEncryptionKey(…) function.
Updated the notes and header docs for improved clarity.
 2013-05-07 10:14:38 -04:00
danielhaaser 8acf2644b6 Fix incorrect colors in CCDrawNode. 2013-05-07 10:15:50 -03:00
James Chen 70472d558d Merge pull request #2430 from imbahom/master 
Fix a typo in CCNode.cpp.
 2013-05-07 01:48:31 -07:00
James Chen bdecd6f4a9 Update AUTHORS 2013-05-07 16:42:20 +08:00
James Chen c45ebfa628 Merge pull request #2422 from brawsome/master 
fixed #2127: Adding CCLOG before original path is returned in CCFileUtils::fullPathForFileName to aid in debugging.
The PR has fix two issues:
1) Added additional CCLOG to CCFileUtils::fullPathForFilename:
There's currently no way to be sure, from a calling function, that
fullPathForFilename has returned an invalid file path, which makes it
difficult to quickly track down missing, or incorrect file paths. Added
a CCLOG before the original string is returned to make debugging
missing or incorrect file paths easier.

2) Optmization to ccArrayGetIndexOfObject …
Optimized loop of ccArrayGetIndexOfObject to remove the overhead of 3
pointer dereferences per iteration, and pre-increment the int for
speed. If this function is called a lot, and with a large list, this
will result in a good performance win.
This can probably be done with just pointers, but I haven't taken the
time to validate all function calls to make sure it would be
appropriate. Though I can guarantee that if this worked fine before, it
will work fine with this change.
 2013-05-07 01:40:57 -07:00
samuele3 305c7d9deb Add a newline 2013-05-07 16:14:23 +08:00
James Chen d8d9e89601 Update AUTHORS 2013-05-07 15:55:35 +08:00
James Chen d313dcd923 Merge pull request #2523 from dumganhar/iss2133-curl_raii 
fixed #2123: Refactoring network extension, fixing unlikely memory leaks, adding PUT/DELETE methods.
 2013-05-07 00:53:20 -07:00
James Chen 288838ec92 Fixing compilation errors. 2013-05-07 15:51:58 +08:00
James Chen d5b5b9b6bf Merge branch 'iss2133-curl_raii' of https://github.com/dumganhar/cocos2d-x into dumganhar-iss2133-curl_raii 2013-05-07 15:44:27 +08:00
James Chen 912905054e fixed #2123: Refactoring network extension, fixing unlikely memory leaks, adding PUT/DELETE methods. 
Merge branch 'curl_raii' of https://github.com/sergey-shambir/cocos2d-x into sergey-shambir-curl_raii

Conflicts:
	extensions/network/HttpClient.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
 2013-05-07 15:37:25 +08:00
minggo df1c112541 Update AUTHORS 2013-05-07 15:29:43 +08:00
minggo 26bdc459d3 Merge pull request #2143 from CodeSnooker/master 
Added Method to create a CCMenuItemToggle from a CCArray with a target selector
 2013-05-07 00:26:56 -07:00
James Chen 140927494a Updating http test url, removing www prefix. 2013-05-07 15:13:55 +08:00
minggo 0a9e100496 Update AUTHORS 2013-05-07 14:59:28 +08:00
minggo fab0857d6e Update AUTHORS 2013-05-07 14:58:06 +08:00
James Gregory 0630e15475 Merge remote-tracking branch 'origin/master' into emscriptenate 2013-05-06 23:56:16 -07:00
James Chen fe5cae77e8 Update AUTHORS 2013-05-07 14:55:27 +08:00
minggo d58f21dc76 Merge pull request #2521 from minggo/emscriptenate 
fix conflict of #2050
 2013-05-06 23:51:38 -07:00
James Chen a9aafdafac Merge pull request #2490 from coolengineer/pull-request-httpclient 
fixed #2119: Introduce HttpResponse callback selector type to resolve #2365, fixed version ;-)
 2013-05-06 23:44:20 -07:00
James Chen eb936b0feb Merge pull request #2522 from dumganhar/fix-building-error 
Fix compilation errors for linux port.
 2013-05-06 23:39:18 -07:00
James Chen 2418e72a0e Fix compilation errors for linux port. 2013-05-07 14:36:01 +08:00
minggo 1166a02e13 resolve conflict for #2505 2013-05-07 14:31:00 +08:00
minggo 90b8dfd383 Merge pull request #2504 from wagaf-d/ccpchanges 
Move ccpX functions to CCPoint methods and operators
 2013-05-06 23:22:21 -07:00
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 Gregory c7ac6b9d01 Add libjpeg linkage. 2013-05-06 22:28:13 -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
Adrien Béraud 16d2b5a957 Assert that the user does not divide by 0 in CCPoint and CCSize 2013-05-07 14:58:43 +10:00
James Gregory adbc3f7552 Add note about Emscripten support to README 2013-05-06 21:41:28 -07:00
Adrien Béraud ca4c2edc29 Clarify CCPoint::rotate & unrotate documentation 2013-05-07 14:36:17 +10:00
James Gregory 14deb7160e Merge branch 'emscriptenate' of github.com:j4m3z0r/cocos2d-x into emscriptenate 
Conflicts:
	AUTHORS
 2013-05-06 21:32:46 -07:00
James Gregory ce2d97c848 Simplify Emscripten makefile a little. 2013-05-06 21:30:03 -07:00
James Gregory 0a4c4b13ef Merge fix 2013-05-06 21:30:03 -07:00
James Gregory a285117aca Disable unsafe GL opts, enable -O2 2013-05-06 21:29:45 -07:00
James Gregory d68d0e6d78 Add myself to authors so folks know who to blame :) 2013-05-06 21:29:44 -07:00
James Gregory 66acd358fc Remove lua samples from emscripten makefile 2013-05-06 21:29:44 -07:00
James Gregory fc7a9da304 Move to a separate Makefile for Emscripten. 2013-05-06 21:29:44 -07:00
James Gregory 7b04e6b0e7 Implement primitive drawing methods for Emscripten 2013-05-06 21:29:44 -07:00
James Gregory 92e4c76f20 Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it. 2013-05-06 21:29:44 -07:00