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

11829 Commits

Author SHA1 Message Date
folecr 6ac71f16c1 ccx : add nativeactivity 2013-08-05 02:05:36 -07:00
folecr 12f25a574d Shared Android makefile uses the platform specific code as a static library 
* Resolve conflicts with latest cocos2x/Android.mk
 * Revert changes to cocos2dx/Android.mk introduced by 9cba2c42c1
 * Update files in label_nodes
 2013-08-05 02:05:36 -07:00
folecr 588ca7e57b Android port is a static library 2013-08-05 02:04:25 -07:00
folecr 92c45d85f2 Up refresh interval to 2 secs 2013-08-05 02:04:25 -07:00
Éloi Rivard 13afa85cb9 Refactored toplevel Makefile 2013-08-05 10:42:56 +02:00
James Chen 40332299d1 Merge pull request #3368 from azmeuk/emscripten 
Multi-resolution emscripten html template.
 2013-08-05 01:10:08 -07:00
James Chen 915bb16a72 Update AUTHORS [ci skip] 2013-08-05 15:50:01 +08:00
James Chen 00af9cfa29 Update AUTHORS [ci skip] 2013-08-05 15:47:50 +08:00
James Chen 82d87e2270 Merge pull request #3369 from dumganhar/iss2480-vao-vbo-crash 
closed 2480: Fixed the crash caused by improper deletion of VBOs and VAO in ParticleSystemQuad.
 2013-08-05 00:44:33 -07:00
James Chen 2df0b056ce closed #2480: Fixed the crash caused by improper deletion of VBOs and VAO in ParticleSystemQuad. 2013-08-05 15:42:01 +08:00
Éloi Rivard 9dcb6fb80e Multi-resolution emscripten html template. 
Default emscripten html template update.
Minor emscripten warnings.
 2013-08-05 09:24:47 +02:00
dotsquid e92337f82d Fixed the crash caused by improper deletion of VBOs in ParticleSystemQuad. 2013-08-05 15:23:01 +08:00
James Chen fe0bae981f Merge pull request #3365 from CocosRobot/updategeneratedsubmodule_1375681464 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings.
 2013-08-04 22:45:46 -07:00
CocosRobot a53a388005 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-05 05:44:27 +00:00
James Chen 8623d206f0 Merge pull request #3364 from dumganhar/carlomorgantinizynga-new_develop_merge 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3342, some more clean up (code review)
 2013-08-04 22:44:03 -07:00
James Chen c61da90441 Merge branch 'new_develop_merge' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge 2013-08-05 13:40:59 +08:00
James Chen e73529b082 Merge pull request #3362 from dumganhar/carlomorgantinizynga-new_develop_merge 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3342, New (experimental) label TTF
 2013-08-04 22:39:20 -07:00
James Chen e08b319726 issue #2170: [JSB] Label is abstract class now. 2013-08-05 12:49:57 +08:00
James Chen ea10032b24 issue #2170: Adding missing libs for Android. 2013-08-05 11:43:43 +08:00
James Chen 9a9ffaeb4d issue #2170: A typo fix. 2013-08-05 11:33:59 +08:00
James Chen b52732cc6b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into carlomorgantinizynga-new_develop_merge 2013-08-05 11:27:46 +08:00
James Chen b8a7a4291f Merge branch 'carlomorgantinizynga-new_develop_merge' of https://github.com/dumganhar/cocos2d-x into carlomorgantinizynga-new_develop_merge 2013-08-05 11:26:34 +08:00
James Chen a979d6c6d3 Merge pull request #3340 from azmeuk/emscripten-fix 
Fixed emscripten build error.
 2013-08-04 20:22:34 -07:00
James Chen eaabd93051 issue #2170: Fixing compilaction errors on Emscripten. 2013-08-05 11:10:12 +08:00
James Chen a2fbf0c2b8 issue #2179: Fixing compilation errors on Linux. 2013-08-05 10:29:20 +08:00
tianTian 77d6692fed make CCBAnimationManager::getSequenceId public; add method CCBAnimationManager::getSequenceDuration to get duration of timeline; 2013-08-05 10:23:41 +08:00
James Chen 5ee6e7d79a Merge branch 'develop' into carlomorgantinizynga-new_develop_merge 
Conflicts:
	cocos2dx/Android.mk
 2013-08-05 10:09:15 +08:00
James Chen 78ad7bcb48 ControlEvent --> Control::EventType. 2013-08-05 10:03:02 +08:00
James Chen 8626455d69 Adding CCControl js binding. 2013-08-05 09:51:46 +08:00
Éloi Rivard 00c8cf62a5 Fixed emscripten build error. 2013-08-04 16:30:33 +02:00
minggo 1aadf55b59 Merge pull request #3355 from minggo/iss2434-refactor_androidmk 
closed #2434: simply Android.mk
 2013-08-03 08:33:14 -07:00
minggo 456b5af872 closed #2434:fixed path 2013-08-03 23:12:10 +08:00
carlo morgantini 73286ad76b some more clean up (code review) 2013-08-02 16:11:20 -07:00
James Chen 1becefefef Merge pull request #3356 from dumganhar/iss2469-windows-path2 
closed 2469：LabelTest and TileMapTest crash on windows.
 2013-08-02 03:02:17 -07:00
minggo 9cba2c42c1 closed #2434: simply Android.mk 2013-08-02 17:33:27 +08:00
James Chen 0db8b2bbf3 closed #2469：LabelTest and TileMapTest crash on windows. 2013-08-02 17:31:19 +08:00
boyu0 1a878cf795 issue #2345: Merge branch '2345' into iss2345_refactor_ccimage 2013-08-02 16:19:50 +08:00
boyu0 6afa77ddc3 issue #2345: update the png, jpeg and tiff libraries. Fix the testFormatForPvrTCSupport return incorrect answer when GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG undefined. 2013-08-02 16:02:40 +08:00
James Chen 53f4f1dab6 Merge pull request #3352 from CocosRobot/updategeneratedsubmodule_1375411584 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-08-02 00:09:33 -07:00
James Chen c1d715b778 Adding windows support for New Label. 2013-08-02 15:01:27 +08:00
boyu0 89dd5a19ad issue #2345: move g_texturePixelFormatInfoTables into Texture2D 2013-08-02 14:10:23 +08:00
zhangbin 7dddea8ae9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-08-02 14:02:51 +08:00
James Chen 67d710a41c Adding Android support for new label. 2013-08-02 13:46:26 +08:00
minggo ae3af70594 [ci skip] 2013-08-02 11:38:07 +08:00
minggo 5d4aa7bc6d [ci skip] 2013-08-02 11:34:36 +08:00
CocosRobot a6279367d5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-02 02:46:30 +00:00
James Chen f7b9d887bc Update AUTHORS [ci skip] 2013-08-02 10:45:41 +08:00
James Chen 85661c976c Merge pull request #3346 from nakosung/develop 
closed 2465: Wrong logic when pass an empty std::vector to WebSocket::init.
 2013-08-01 19:41:11 -07:00
성낙호 0883723c71 added cc.RemoveSelf 2013-08-02 10:59:16 +09:00
성낙호 c9077961e8 fix for undefined protocol 2013-08-02 10:35:45 +09:00