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

29832 Commits

Author SHA1 Message Date
minggo 66b6959c10 Merge pull request #11317 from CocosRobot/update_cocosfiles_1428458166 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-08 09:58:44 +08:00
CocosRobot cfb11f2acf [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-08 01:56:07 +00:00
minggo 3d1cd76a06 Merge pull request #11315 from andyque/upgrade-3rd-party-libs-v3 
Upgrade 3rd party libs
 2015-04-08 09:54:17 +08:00
minggo 6892ec85ee [ci skip]update CHANGELOG 2015-04-08 09:47:01 +08:00
andyque 8a4a7344b0 fix freetype include 2015-04-08 09:24:34 +08:00
XiaoYang 840c6382c5 Merge pull request #290 from tangziwen/terrain 
Terrain
 2015-04-08 09:08:15 +08:00
andyque 1e7ec88c50 update config.json 2015-04-07 23:25:06 +08:00
andyque ce204a11db remove zlib in linux, because linux use system png and zlib 2015-04-07 23:20:03 +08:00
andyque 9457904fac fixed freetype2 include issue 2015-04-07 23:20:02 +08:00
andyque e4cf3885a5 use prebuilt zlib for android and mac 2015-04-07 23:20:02 +08:00
andyque 9f5932ceeb resolve the chipmunk compile issue 2015-04-07 23:20:02 +08:00
andyque b5d0b4df5e upgrade libraries 2015-04-07 23:20:02 +08:00
Michael Sotnikov f962e14b43 replace const_cast with mutable in path getters; 
more getters (is*/get*) became const;
 2015-04-07 17:15:15 +03:00
tangziwen a220a8f669 fix wrong attribute location bind, fix memory leak, enable back-face culling 2015-04-07 18:47:19 +08:00
minggo ca090281a4 Merge pull request #11307 from WenhaiLin/v3-label-effect 
Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label.
 2015-04-07 18:22:35 +08:00
minggo 31b21b56fe [ci skip]update CHANGELOG 2015-04-07 18:18:22 +08:00
minggo 50fa15c0cd Merge pull request #11301 from samuele3hu/v3_lua_jit 
Add luajit support for iOS 64bit devices and related test cases
 2015-04-07 18:17:09 +08:00
lvlong c9014e12b4 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
Conflicts:
	CHANGELOG
 2015-04-07 16:40:57 +08:00
lvlong 99ef79f940 modify INT_NEAR 2015-04-07 16:37:51 +08:00
WenhaiLin 6bcddbc779 Test automation support:Catch crash event on WIN32/MAC/IOS/ANDROID 2015-04-07 16:14:27 +08:00
minggo 01a9177d51 Merge pull request #11308 from minggo/update-release-note 
[ci skip]update release note
 2015-04-07 16:00:40 +08:00
minggo 8436ef1ab6 update release note 2015-04-07 15:59:40 +08:00
WenhaiLin 927cda3f0d Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label. 2015-04-07 15:51:57 +08:00
minggo ec3a114767 [ci skip]update CHANGELOG 2015-04-07 15:30:37 +08:00
minggo eb928432ce Merge pull request #11302 from WenhaiLin/v3-label-shadowcolor 
Label: Fixed shadow color is incorrect.
 2015-04-07 15:27:19 +08:00
minggo b85d26b2f6 Merge pull request #11303 from WenhaiLin/v3-autotest 
Add missing test
 2015-04-07 14:28:05 +08:00
minggo c18ba06ec4 [ci skip]update CHANGELOG 2015-04-07 14:07:24 +08:00
minggo 353c2b0d75 Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3 
Optimize Vec3
 2015-04-07 14:04:57 +08:00
minggo 420ace04e5 Merge pull request #11304 from tangziwen/terrain 
terrain test update
 2015-04-07 14:02:01 +08:00
minggo 81e2edd2ca Merge pull request #11305 from andyque/improve-jenkins-android-build-speed 
android slave only build cpp-tests and lua-tests for PR
 2015-04-07 12:04:35 +08:00
andyque 32b2e4c20e android slave only build cpp-tests and lua-tests for PR 2015-04-07 11:58:04 +08:00
tangziwen 176f7dd879 slightly modified the camera's default position & terrain's Lod distance in the terrain test 2015-04-07 11:50:09 +08:00
WenhaiLin a6699058a0 Add missing test 2015-04-07 11:43:02 +08:00
lvlong 70048788ea modify change log. 2015-04-07 11:19:48 +08:00
WenhaiLin c5c5d3e39d Label: Fixed shadow color is incorrect. 2015-04-07 11:17:01 +08:00
minggo 3a1a7c0122 [ci skip] update version 2015-04-07 10:38:01 +08:00
minggo 1646278be2 [ci skip] update version 2015-04-07 10:36:38 +08:00
minggo 295b6d7044 [ci skip] update version 2015-04-07 10:35:49 +08:00
minggo 9fb39284c1 [ci skip]update CHANGELOG 2015-04-07 10:35:09 +08:00
samuele3hu af46ec5b57 Update config.son for the version of external dependence 2015-04-07 10:00:37 +08:00
minggo 4bd304da80 Merge pull request #11300 from CocosRobot/update_cocosfiles_1428370461 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-07 09:56:35 +08:00
minggo 98682eefe6 [ci skip]update CHANGELOG 2015-04-07 09:52:45 +08:00
CocosRobot 738d03d2db [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-07 01:34:23 +00:00
minggo 3736d1a6b5 [ci skip]update CHANGELOG 2015-04-07 09:33:32 +08:00
minggo deaa6a19f0 Merge pull request #11257 from super626/terrain 
Terrain
 2015-04-07 09:32:35 +08:00
samuele3hu fd554c07da Rename the file names 2015-04-07 09:31:04 +08:00
XiaoFeng 16aa704ffd Merge branch 'v3' of github.com:xiaofeng11/cocos2d-x into v3 2015-04-07 09:11:14 +08:00
XiaoFeng 4929d8102a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-04-07 09:06:06 +08:00
Ricardo Quesada 98866f5f6b Merge pull request #11297 from ricardoquesada/fix_warnings_on_xcode_63 
fixes warnings on Xcode 6.3
 2015-04-06 13:03:15 -07:00
Ricardo Quesada a782eb022d fixes warnings on Xcode 6.3 
instead of using `abs()` it uses `std::abs()`
 2015-04-06 12:08:30 -07:00