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

15548 Commits

Author SHA1 Message Date
CaiWenzhi 58ed383c01 Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone 2014-01-17 14:12:19 +08:00
Ricardo Quesada f4572e8cac Merge pull request #5104 from ricardoquesada/android_compile_fixes 
compiles on Android
 2014-01-16 21:59:09 -08:00
Ricardo Quesada 1b5b9da102 compiles on Android 
compiles on Android
 2014-01-16 21:58:14 -08:00
Ricardo Quesada 2b8107d817 Merge pull request #5102 from ricardoquesada/compile_fixes 
Fixes compilation issues on Linux
 2014-01-16 21:49:56 -08:00
Ricardo Quesada cfbceb0e22 Fixes compilation issues on Linux 2014-01-16 21:49:14 -08:00
Ricardo Quesada d6719470ad Merge pull request #5101 from ricardoquesada/header_dependency_fixes 
Header dependency fixes
 2014-01-16 21:37:40 -08:00
Ricardo Quesada a74a524eaa Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into header_dependency_fixes 2014-01-16 21:36:22 -08:00
Ricardo Quesada d0dbf34319 removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
CaiWenzhi 233faea690 Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs 2014-01-17 13:11:29 +08:00
CaiWenzhi bea46fa290 Add clone method to LayoutParameter 2014-01-17 13:10:04 +08:00
James Chen 54d587153b Update CHANGELOG [ci skip] 2014-01-17 11:55:20 +08:00
James Chen 9413c6e042 Merge pull request #5086 from Dhilan007/develop_label 
closed #3628:Integrate LabelAtlas with new Label
 2014-01-16 19:52:05 -08:00
CaiWenzhi 602133a071 Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs 2014-01-17 11:25:38 +08:00
LinWenhai 484f6a8f36 Merge pull request #1 from dumganhar/new-label-atlas 
issue #3628: Adds missing files for iOS and Mac.
 2014-01-16 19:21:19 -08:00
James Chen d309ae76d0 issue #3628: Adds missing files for iOS and Mac. 2014-01-17 11:13:40 +08:00
James Chen 31199183b2 Merge commit 'refs/pull/5086/head' of git://github.com/cocos2d/cocos2d-x into new-label-atlas 2014-01-17 11:10:04 +08:00
James Chen 09f56f3a8b Merge pull request #5047 from btspoony/develop 
closed #3750: Fix long string will be cut off by function “cc_utf8_to_utf16”.
 2014-01-16 19:06:39 -08:00
James Chen 8667161a7d Merge pull request #5087 from dumganhar/iss2789-perf-container 
issue #2789:  Performance Test for Container (Vector<T>, Array were finished)
 2014-01-16 18:30:50 -08:00
James Chen f48f429825 issue #2789: Removes unused empty lines and renames some variables. 2014-01-17 10:29:21 +08:00
James Chen 3af95f3e84 issue #2789: Updates windows projects. 2014-01-17 10:05:26 +08:00
James Chen b3e1319982 issue #2789: Updates Android.mk and CMakeLists.txt. 2014-01-17 10:03:10 +08:00
James Chen 83b459fcdb issue #2789: Adds loop test for Vector and Array. 2014-01-17 10:02:13 +08:00
James Chen 811f55bb8d issue #2789: Avoids compiler to do optimization. 2014-01-17 10:02:12 +08:00
James Chen 4302f3886d issue #2789: Adds performance test for Vector and CCArray. 2014-01-17 10:02:12 +08:00
Dhilan007 f5afa09de1 remove unneeded empty line. 2014-01-17 09:46:59 +08:00
Ricardo Quesada f2471b8caf Merge pull request #5068 from dabingnn/develop_renderer_tileMapTest 
add performance test for New renderer: LargeTileMap test for quadCommand
 2014-01-16 16:03:42 -08:00
Ricardo Quesada 218d9ceabc Merge pull request #5097 from ricardoquesada/render_vbo_fixes 
Renderer: When not using VAOs, call...
 2014-01-16 15:03:29 -08:00
Ricardo Quesada cb9761125b Renderer: When not using VAOs, call... 
... glBufferData() to update the contents, and not glBufferSubData()
since the performance is better
 2014-01-16 15:02:39 -08:00
Ricardo Quesada 4bd2b9364a Merge pull request #5096 from ricardoquesada/active_texture 
Adds GL::activeTexture()
 2014-01-16 13:44:56 -08:00
Ricardo Quesada ce633b44ab Adds GL::activeTexture() 
`GL::activeTexture()` is the cached version of `glActiveTexture`
All code must use it.
 2014-01-16 13:44:18 -08:00
Ricardo Quesada a724fd9f6a Merge pull request #5095 from ricardoquesada/missing_files 
Adds missing files
 2014-01-16 13:10:18 -08:00
Ricardo Quesada d2bc2caa17 Adds missing files 2014-01-16 13:09:51 -08:00
Ricardo Quesada 367297c68c Merge pull request #5094 from ricardoquesada/perf_more_fixes 
Adds test '13' to Sprite Test
 2014-01-16 13:08:28 -08:00
Ricardo Quesada 4dba667ea2 Adds test '13' to Sprite Test 
...and also adds missing Image HD files
 2014-01-16 13:07:56 -08:00
Ricardo Quesada cbaae6a4e4 Merge pull request #5093 from ricardoquesada/sprite_perf_test_fixes 
Remove Sprites works as expected
 2014-01-16 12:23:10 -08:00
Ricardo Quesada afb4077de5 Remove Sprites works as expected 2014-01-16 12:22:11 -08:00
Ricardo Quesada f600ee640d Merge pull request #5091 from luisparravicini/issue-3734 
warnings in CCLabelBMFont.cpp when compiling in release mode
 2014-01-16 09:39:24 -08:00
Luis Parravicini 3210e12e1c fixes #3734 2014-01-16 14:23:52 -03:00
Dhilan007 53be67c653 update project file. 2014-01-16 18:12:53 +08:00
Dhilan007 671b008f3d fix compiling error cause by sprintf_s. 2014-01-16 17:50:09 +08:00
James Chen 47b978803e Merge pull request #5085 from heliclei/develop 
[jenkins]add job trigger,to update github pull request status instantly
 2014-01-16 01:36:23 -08:00
James Chen 74870aaf92 Update CHANGELOG [ci skip] 2014-01-16 17:21:07 +08:00
Dhilan007 a765e5e7e1 closed #3628:Integrate LabelAtlas with new Label 2014-01-16 16:37:29 +08:00
heliclei 925a4f0f30 add reopen support 2014-01-16 16:22:04 +08:00
heliclei df4cb47ab3 Merge remote-tracking branch 'upstream/develop' into develop 2014-01-16 16:17:44 +08:00
James Chen 191fc763f6 Update CHANGELOG [ci skip] 2014-01-16 16:12:15 +08:00
James Chen 21dc91bf78 Merge pull request #5082 from Dhilan007/develop_label 
closed #3726:Fix crash when using unknown character.
 2014-01-16 00:10:53 -08:00
James Chen 93beb44150 Update CHANGELOG [ci skip] 2014-01-16 15:35:46 +08:00
James Chen d000d9739d Merge pull request #5084 from andyque/develop 
closed #3683. fixed convertToWorldSpaceAR of CCSkin returning error coordinate. This PR fixes that TestColliderDetector not working
 2014-01-15 23:33:45 -08:00
heliclei 9de4c4fa70 [jenkins]add job trigger,to update github pull request status instantly 2014-01-16 15:16:12 +08:00