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

9303 Commits

Author SHA1 Message Date
James Chen 0c8e3e9129 Merge pull request #2349 from rogerzanoni/master 
fixed #2052: [Linux] [-Werror=array-bounds] error appears when compiling Box2dTestBed.
 2013-04-14 19:45:35 -07:00
James Chen 4ae375e7fe Merge pull request #2369 from dumganhar/iss1860-subccb-onNodeLoaded 
fixed #1860: onNodeLoaded will be called twice if ccb was added as a CCBFile and adding test.
 2013-04-14 19:41:08 -07:00
James Chen a5d78830db fixed #1860: onNodeLoaded will be called twice if ccb was added as a CCBFile. 2013-04-15 10:39:44 +08:00
James Chen c7631d5343 Merge pull request #2368 from dumganhar/iss2040-ccb-getScale 
fixed #2040: Getting scale property from sub-ccb node may trigger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
 2013-04-14 19:20:36 -07:00
James Chen a1568d1f74 fixed #2040: Getting scale property from sub-ccb node may trigger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'. 2013-04-15 10:18:35 +08:00
James Chen a06d2c44c1 Merge pull request #2367 from dumganhar/iss1862-setContainer 
fixed #1862: CCScrollView::setContainer may cause dangling pointer when NULL is passed into.
 2013-04-14 18:57:13 -07:00
James Chen 6c15c75c78 fixed #1862: CCScrollView::setContainer may cause dangling pointer when NULL is passed into. 2013-04-15 09:52:46 +08:00
James Chen fdd6529bd2 Merge pull request #2364 from dumganhar/iss2051-builder-crash-64bit 
fixed #2051: TestCpp/ExtensionsTest/CocosbuilderTest crashes under x86_64 target.
 2013-04-14 01:06:51 -07:00
James Chen 84b4c5ac2b fixed #2051: Comment update, int ~> intptr_t. 2013-04-14 16:05:54 +08:00
James Chen ea78ee9bb7 fixed #2051: TestCpp/ExtensionsTest/CocosbuilderTest crashes under x86_64 target. 2013-04-14 16:00:50 +08:00
James Chen 2757962748 Merge branch 'master' of https://github.com/billy1380/cocos2d-x into billy1380-master 2013-04-14 14:49:02 +08:00
James Chen a9617a2c20 Merge pull request #2363 from dumganhar/master 
Fixing an issue of out of bound in CCTableView.cpp.
 2013-04-13 20:19:16 -07:00
James Chen 17599174ad Fixing an issue of out of bound in CCTableView.cpp. 2013-04-14 11:05:03 +08:00
tianTian b7f0b2a8e0 Use CCLOG instead of CCLog; 2013-04-13 18:20:17 +08:00
James Chen 9dcb69d53b Update AUTHORS 2013-04-13 17:49:58 +08:00
James Chen b60ff750e4 Merge pull request #2360 from tiantian20007/backToUpsteram 
fix syntax error;
 2013-04-13 02:48:37 -07:00
tianTian 96359950cf Implement CCDictionary::writeToFile(); 
Use NSDictionay to do the job for iOS and Mac, and using tinyxml2 for other platform;
 2013-04-13 16:55:24 +08:00
tianTian edf1e53d2d fix syntax error; 2013-04-13 15:18:54 +08:00
James Gregory b327d3fdbb Remove redundant -l flags from emscripten build -- it doesn't have fontconfig, and GL stuff is linked in automatically. 2013-04-12 14:52:53 -07:00
James Gregory e5cd965ed3 Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it. 2013-04-12 14:51:29 -07:00
Mark Henderson 9c82c39978 remove duplicate default variable definition 2013-04-12 10:11:26 -07:00
billy1380 493d1d90ed fixed a bug that was causing x86_64 tests to crash while loading 
ccbuilder files
 2013-04-12 14:37:28 +01:00
James Chen 873354f84b Merge pull request #2358 from dumganhar/master 
Adding Box2D and chipmunk dependence for TestLua. Removing the definition of GL_RGB565 in CCTexture2D.pkg.
 2013-04-11 23:29:04 -07:00
James Chen 0ecf9da3a6 Adding Box2D and chipmunk dependence for TestLua. Removing the definition of GL_RGB565 in CCTexture2D.pkg. 2013-04-12 14:27:29 +08:00
James Chen f18cddac75 Merge pull request #2357 from dumganhar/iss2043-upgrade-spidermonkey20 
fixed #2043: Upgrading SpiderMonkey to Firefox20.0.
 2013-04-11 22:52:13 -07:00
James Chen b5bad26a88 fixed #2043: Updating spidermonkey to Firefox v20 for Windows. 2013-04-12 13:38:21 +08:00
James Chen e1ed841b8e fixed #2043: Updating to spidermonkey20 for android. 2013-04-12 12:52:50 +08:00
James Chen fea712fcf8 fixed #2043: Disabled YARR_JIT on ios. 2013-04-12 11:58:53 +08:00
James Chen 42997f7390 Merge branch 'master' into iss2043-upgrade-spidermonkey20 2013-04-12 10:57:33 +08:00
Mark Henderson 038a04c05b Fixing SpriteBatchNode and LabelBMFont to prevent error when release is called without calling init 2013-04-11 15:02:09 -07:00
minggo 1e689f6be8 Update AUTHORS 2013-04-11 10:34:29 +08:00
yodesoft 5952597c1a Set writable path to XDG_CONFIG_HOME if it exists. 2013-04-11 09:20:25 +08:00
yodesoft cda864b597 Read app name from /proc/self/exe 2013-04-11 08:58:48 +08:00
Roger Zanoni 05873ad7a0 Check array boundaries to avoid the "array-bounds" error on linux 
Compiling on linux causes the error "array subscript is above array
bounds [-Werror=array-bounds]". This commit adds boundary checking
using the constant defining the maximum number of items in the "nuke" array.

Signed-off-by: Roger Zanoni <roger.zanoni@openbossa.org>
 2013-04-10 10:53:52 -04:00
yodesoft db5df829fb Restore codes of init m_strDefaultResRootPath 2013-04-10 18:39:01 +08:00
yodesoft 85c932112f Merge remote-tracking branch 'upstream/master' 2013-04-10 17:54:50 +08:00
James Chen 88fe3b2b1b Merge pull request #2347 from dumganhar/iss2048-variable-cellsize 
fixed #2048: Support variable cell sizes in CCTableView.
 2013-04-10 02:14:42 -07:00
James Chen fb0794bef6 fixed #2048: Fixing compilation errors on linux. 2013-04-10 17:13:19 +08:00
James Chen 448096cbfd Updating AUTHORS. 2013-04-10 16:40:59 +08:00
James Chen 6e9fcf8c05 fixed #2048: Adding test case for variable cell sizes in CCTableView. 2013-04-10 16:38:00 +08:00
James Chen 3f695d1934 Merge branch 'master' of https://github.com/SevInf/cocos2d-x into SevInf-master 2013-04-10 16:07:54 +08:00
James Chen 0c0cea791b Update AUTHORS 2013-04-10 15:54:00 +08:00
James Chen 862d4d6316 Merge pull request #2195 from folecr/androidlinkerflags 
fixed #2047: Clean up linked libraries for Android.
 2013-04-10 00:53:00 -07:00
James Chen d252cd4cff Update AUTHORS 2013-04-10 14:41:27 +08:00
James Chen 64fa434064 Merge pull request #2346 from dumganhar/iss2046-newlines 
fixed #2046: Stripping newlines from log message and fixing linux library location.
 2013-04-09 23:28:47 -07:00
James Chen 32406efec2 Merge branch 'newlines_in_cclog' of https://github.com/sbc100/cocos2d-x into sbc100-newlines_in_cclog 
Conflicts:
	cocos2dx/proj.linux/cocos2dx.mk
 2013-04-10 14:17:23 +08:00
James Chen 487b4f8a89 Merge pull request #2340 from rohankuruvilla/cocosplayer 
fixed #2045: Small fixes to CocosPlayer.
1)Fixing AppDelegate to include OpenGL bindings
2)Adding orientation change JNI stubs
3)Commenting out cache clean on receiving new zip file (was causing consistency issues)
4)Fixing bug where "Connected!" message was displayed on a different thread
 2013-04-09 23:07:24 -07:00
James Chen 223ff18c56 Update AUTHORS 2013-04-10 12:52:13 +08:00
James Chen 68867b8798 Merge pull request #2212 from rogerzanoni/linux_link 
fixed #2044: Fix linux build, libpthread and libGL libraries need to be linked on linux.
 2013-04-09 21:50:54 -07:00
James Chen 556cbaff23 Merge pull request #2345 from natural-law/master 
issue #1471 : Resolve the encoding bug in modifyAppMk.sh
 2013-04-09 21:01:18 -07:00