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

16325 Commits

Author SHA1 Message Date
James Chen e9c003663f Update AUTHORS [ci skip] 2014-02-17 22:15:25 +08:00
James Chen 568d980027 Merge pull request #5375 from dumganhar/merge5289 
Merge PR #5289: fix string size check and assert condition
 2014-02-17 22:12:07 +08:00
James Chen f67f324378 Merge commit 'refs/pull/5289/head' of git://github.com/cocos2d/cocos2d-x into merge5289 
Conflicts:
	cocos/2d/platform/win32/CCImage.cpp
 2014-02-17 22:10:45 +08:00
James Chen 332baa2ddc Update AUTHORS [ci skip] 2014-02-17 22:00:44 +08:00
James Chen 27542731e2 Merge pull request #5374 from justmao945/develop 
Correcting the definition of CMake variables.
 2014-02-17 21:59:44 +08:00
James Chen 01b9d9be56 Merge pull request #5369 from Dhilan007/develop_labttfMultiline 
closed #4048:fixed LabelTTFMultiline test case show nothing on mac.
 2014-02-17 21:45:24 +08:00
James Chen 189ead7400 Merge pull request #5372 from dumganhar/iss4054-tmxlayer 
closed #4054: Removing child from TMXLayer may cause crash.
 2014-02-17 21:30:39 +08:00
JianjunMao 789ebffb14 fix string concatenation 
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++11") which leads to list of strings.
The result is "-stdlib=libc++;-std=c++11"  if CMAKE_CXX_FLAGS is defined as "-stdlib=libc++"
 2014-02-17 21:23:29 +08:00
James Chen 2ee1330479 closed #4054: Adds test for removing child from TMXLayer. 2014-02-17 21:16:25 +08:00
James Chen 19b1945efb closed #4054: Removing child from TMXLayer may cause crash. 2014-02-17 21:15:26 +08:00
James Chen e550ff7741 Merge pull request #5367 from samuele3hu/developPerformance 
issue #3708:Performance Test: data structure conversion in lua binding
 2014-02-17 15:16:31 +08:00
Dhilan007 4f94064242 closed #4048:fixed LabelTTFMultiline test case show nothing on mac. 2014-02-17 14:35:49 +08:00
James Chen cae938bd4e Update CHANGELOG [ci skip] 2014-02-17 12:56:28 +08:00
James Chen 2b6e1aaca6 Merge pull request #5368 from xingsenma/develop 
closed#3947: Simulates 'setTimeout' and 'setInterval' in JSB.
 2014-02-17 12:54:12 +08:00
samuele3hu 4d35c8626c issue #3708:Remove some comments 2014-02-17 10:36:30 +08:00
samuele3hu 69ec932cd4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerformance 2014-02-17 10:25:24 +08:00
samuele3hu 3f8bc8cc43 issue #3708:Remove the useless test case 2014-02-17 10:24:58 +08:00
xingsenma 1ec2d35631 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_20140103 2014-02-17 10:12:49 +08:00
James Chen 426876180f Merge pull request #5363 from CocosRobot/updategeneratedsubmodule_1392358937 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-14 14:26:26 +08:00
CocosRobot a5a8ff2d87 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-14 06:22:19 +00:00
James Chen c7b1ab4525 Merge pull request #5362 from ucchen/develop 
closed #4037: fix copy-paste error, all spxxx_to_jsval use lower case;
 2014-02-14 14:17:33 +08:00
ucchen 185ed86214 fix copy-paste error, all spxxx_to_jsval use lower case and add missing data structs getAttachment; 2014-02-14 13:24:56 +08:00
James Chen d628e7082b Merge pull request #5360 from CocosRobot/updategeneratedsubmodule_1392348248 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-14 11:25:01 +08:00
CocosRobot 104e0b4b29 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-14 03:24:11 +00:00
James Chen e016b897c3 Merge pull request #5359 from CocosRobot/update_cocosfiles_1392347985 
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
 2014-02-14 11:21:04 +08:00
James Chen 5ba38b1320 Update CHANGELOG [ci skip] 2014-02-14 11:20:34 +08:00
CocosRobot e5ff9e1290 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-14 03:19:46 +00:00
James Chen 84901995ea Update AUTHORS [ci skip] 2014-02-14 11:19:00 +08:00
James Chen 78163e604e Merge pull request #5358 from dumganhar/merge5343 
closed #4037:Exposed the missing data structures of Spine to JS
 2014-02-14 11:17:38 +08:00
James Chen a5aa547c7b Merge pull request #5316 from natural-law/ScenarioTest 
closed #3738: Add performance test case on game scenario.
 2014-02-14 11:12:01 +08:00
James Chen 32012ee72a Adds missing files for vs. 2014-02-14 10:53:30 +08:00
James Chen 79e7d218cb Updates Android.mk 2014-02-14 10:37:50 +08:00
James Chen 2078f6de57 Updates CMakeLists. 2014-02-14 10:34:28 +08:00
James Chen f04e604a51 Updates JS-Tests. 2014-02-14 10:27:19 +08:00
James Chen 9d764718f9 issue #4037: Removes unused files from Xcode setting. 2014-02-14 10:26:27 +08:00
James Chen ea7a27fdf7 Updates JS-Tests. 2014-02-14 09:59:54 +08:00
James Chen bc222774d8 Merge pull request #5354 from CocosRobot/updategeneratedsubmodule_1392341386 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-14 09:44:22 +08:00
James Chen 8700d0f64e Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5343 2014-02-14 09:44:06 +08:00
James Chen 1c6250bf00 Merge pull request #5356 from dumganhar/develop 
Typo fix in CCDevice.mm. widht -> width
 2014-02-14 09:43:24 +08:00
James Chen 1693ea0ef6 Typo fix in CCDevice.mm. 2014-02-14 09:41:06 +08:00
James Chen 17dab13502 Resets JS-Tests. 2014-02-14 09:36:27 +08:00
James Chen acefa4e237 Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343 2014-02-14 09:33:42 +08:00
CocosRobot 498a5e5b47 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-14 01:29:48 +00:00
James Chen 7a48305525 Merge pull request #5353 from CocosRobot/update_cocosfiles_1392341165 
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
 2014-02-14 09:29:12 +08:00
CocosRobot 15dbef99d3 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-14 01:26:06 +00:00
James Chen fb4699359d Merge pull request #5326 from Dhilan007/develop_label 
issue #3821: Moving platform-dependent codes of LabelTTF from cocos2d::Image to cocos2d::Device.
 2014-02-14 09:24:11 +08:00
James Chen 24c15b6b21 Updates project-creator/config-create/create_config.py. 
Don't print paths to terminal, it is only useful when debugging.
 2014-02-14 09:13:52 +08:00
James Chen c8ec90781c Merge pull request #5351 from heliclei/xcode-scheme 
share xcode build schemes to support xcodebuild command line build
 2014-02-14 09:09:07 +08:00
heliclei 37b372d21e fix build scheme name 2014-02-13 22:42:59 +08:00
Dhilan007 0d5c702708 move labelttf's platform-dependent code from CCImage to CCDevice 2014-02-13 21:08:43 +08:00