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

15919 Commits

Author SHA1 Message Date
Hanju Kim 39904e304d Merge remote-tracking branch 'remotes/upstream/develop' into develop 
Conflicts:
	cocos/2d/CCLabel.cpp
 2014-01-23 15:57:25 +09:00
James Chen f43f3c770b Merge pull request #5179 from lihex/issue#3781 
Update docs for bindings-generator.
 2014-01-22 22:35:40 -08:00
lihex f9b2ead623 Update docs. 2014-01-23 14:14:07 +08:00
samuele3hu 115d610c3a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix 2014-01-23 14:13:14 +08:00
samuele3hu 7d0f8c90db fix:Update some description 2014-01-23 14:12:34 +08:00
James Chen e4ca4f0150 Merge pull request #5178 from CocosRobot/updategeneratedsubmodule_1390456712 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-22 22:06:53 -08:00
CocosRobot 5edc28c849 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-23 05:58:35 +00:00
James Chen 49efe0acc2 Merge pull request #5177 from Dhilan007/develop_label 
Label:Change the default parameters of TextHAlignment and let setString method do a single function
 2014-01-22 21:50:22 -08:00
Dhilan007 bd97394ccc 1.Label:Change the default parameters 
2.Label:let setString method do a single function
 2014-01-23 13:42:27 +08:00
James Chen 9bb3444e04 Merge pull request #5176 from heliclei/develop 
[Jenkins]fix jenkins api, get correct build result
 2014-01-22 21:08:20 -08:00
heliclei 9642766c7e correct format 2014-01-23 12:57:18 +08:00
heliclei 67d5ab72d0 fix jenkins api, get correct build result 2014-01-23 12:54:35 +08:00
James Chen 91511840a1 Merge pull request #5175 from lihex/issue#3781 
Fix the path.
 2014-01-22 20:20:08 -08:00
lihex b9331a06f9 issue #3781, Fix the path. 2014-01-23 12:08:27 +08:00
James Chen 6c0e12d313 Merge pull request #5174 from CocosRobot/updategeneratedsubmodule_1390449401 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-22 20:01:12 -08:00
James Chen 15a82fdceb Update AUTHORS [ci skip] 2014-01-23 11:58:43 +08:00
James Chen 1e39b59c8d Update CHANGELOG [ci skip] 2014-01-23 11:56:59 +08:00
CocosRobot b0c828b471 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-23 03:56:45 +00:00
James Chen 9292d92f63 Merge pull request #5143 from pandamicro/develop 
closed #3806: SAXParser was supported with manual binding in JSB
 2014-01-22 19:50:15 -08:00
James Chen 5ede8088c8 Update CHANGELOG [ci skip] 2014-01-23 11:26:24 +08:00
James Chen aba15dfc2d Merge pull request #5172 from dumganhar/use-unified-cceglview 
Using unified 'desktop/CCEGLView.h/cpp' for Windows platform too.
 2014-01-22 19:23:44 -08:00
James Chen 8bcdb0ace0 Merge pull request #5173 from lihex/issue#3781 
Don't set a default PYTHON_ROOT & NDK_ROOT for user on Windows
 2014-01-22 19:22:24 -08:00
James Chen bb650729c3 Updates cocos_files.json. 2014-01-23 11:08:10 +08:00
James Chen 5dfcb76398 Updates template CMakeLists.txt. 2014-01-23 11:07:54 +08:00
lihex ecdd64a889 issue #3781, Don't set a default PYTHON_ROOT & NDK_ROOT for user on Windows. 2014-01-23 10:48:03 +08:00
James Chen 3829a1aa46 Merge pull request #5166 from heliclei/develop 
[jenkins]add post build script
 2014-01-22 18:47:43 -08:00
James Chen ce28972269 Updates cocos/2d/cocos2d.vcxproj. 2014-01-23 10:36:44 +08:00
James Chen 19062d716d Updates includes path to 'desktop/CCEGLView.h'. And added windows relevant codes. 2014-01-23 10:27:42 +08:00
samuele3hu 86bd3e12df Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix 2014-01-23 10:18:12 +08:00
samuele3hu 36421ca3b9 fix:Update the RELEASE_NOTES.md file 2014-01-23 10:10:39 +08:00
James Chen 9b02f97217 Updates windows project to use the unified 'desktop/CCEGLView.h/.cpp'. 2014-01-23 09:58:12 +08:00
minggo a1729fa1b4 Merge pull request #5159 from natural-law/develop 
Add test case for issue 2572
 2014-01-22 17:49:56 -08:00
Ricardo Quesada d8dae17a56 Merge pull request #5170 from ricardoquesada/release-notes-fixes 
Updates releaes notes with renderer updates
 2014-01-22 17:43:50 -08:00
Ricardo Quesada a2d167b885 Updates releaes notes with renderer updates 2014-01-22 17:43:17 -08:00
Ricardo Quesada c48415ef3c Merge pull request #5163 from dabingnn/develop_improve_renderer 
Develop improve renderer
 2014-01-22 17:04:19 -08:00
Ricardo Quesada 647dca3a3b Merge pull request #5169 from ricardoquesada/update_template_linux 
updated template for Linux
 2014-01-22 14:33:43 -08:00
Ricardo Quesada ae09cce83f updated template for Linux 2014-01-22 14:32:40 -08:00
Ricardo Quesada 7421310072 Merge pull request #5168 from ricardoquesada/cceglview_in_desktop 
Cceglview in desktop
 2014-01-22 14:19:53 -08:00
Ricardo Quesada dceb9cb1b9 compiles on Linux 2014-01-22 14:17:32 -08:00
Ricardo Quesada 6b8781241c code is cleaner 2014-01-22 13:51:01 -08:00
Ricardo Quesada 7249d3ca76 Unified CCEAGLView on Linux and Mac 2014-01-22 13:05:37 -08:00
Ricardo Quesada 83f16e25e3 merge from develop 2014-01-22 11:44:48 -08:00
Ricardo Quesada c1fb0a697c Merge pull request #5167 from martell/size_t 
Fixed x64 builds of testcpp with long to size_t changes
 2014-01-22 11:32:47 -08:00
martell 50176a038f Fixed x64 builds of testcpp with long to size_t changes 2014-01-22 19:21:25 +00:00
Ricardo Quesada 1b6dfcda40 Merge branch 'develop' into cceglview_in_desktop 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-01-22 11:21:16 -08:00
heliclei 04ee67481a set pr status at post build stage 2014-01-23 00:21:58 +08:00
pandamicro 7e4f82db1d Issue #3806: Update shared tests_v3.0 of js test cases 2014-01-22 22:57:34 +08:00
pandamicro 29fcf46497 Fixed #3806: Update tests 3.0 2014-01-22 22:41:30 +08:00
pandamicro 913360e526 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-22 22:32:44 +08:00
pandamicro d6df71cc11 Fixed #3806: Change parameters to const & 2014-01-22 22:31:26 +08:00