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

1302 Commits

Author SHA1 Message Date
andyque 32d3bf03bd fixed #3877. make fadeIn and fadeOut behaviours correct 2014-02-27 21:00:25 +08:00
boyu0 8c536589df Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss4118_physical_performance_improve 2014-02-27 20:04:04 +08:00
zhangbin 03ea69d074 Merge branch 'develop' of https://github.com/natural-law/cocos2d-x; branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-02-27 15:29:31 +08:00
boyu0 f400c1ac68 issue #4118: edit contact test and fix node setPhysicsBody bug 2014-02-27 13:35:37 +08:00
zhangbin 8afd23a001 closed #3727, In project "TestCpp", not pause/resume background music & effects when it's going to background/foreground. 2014-02-27 10:18:49 +08:00
boyu0 75ec508f0a issue #4118: improve performance. add Node and Sprite physicsSetPosition and physicsSetRotation method. 2014-02-27 09:45:35 +08:00
heliclei 186259b0b1 fix andriod compile error 2014-02-27 00:25:37 +08:00
heliclei 49b971867b fix win32 compile error 2014-02-27 00:13:17 +08:00
heliclei 9d6be63171 CCConsole:support file upload via telnet console 2014-02-26 23:41:47 +08:00
James Chen e4837e7f94 issue #4116: Removes script-bindings codes. 2014-02-26 21:34:06 +08:00
James Chen c2acfea633 issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00
James Chen 5e315273f9 Merge pull request #5467 from boyu0/bug4144_node_setphysicsbody 
closed #4144: fix bug: Can not use Node::setPhysicsBody to reset a physics body.
 2014-02-26 11:43:19 +08:00
James Chen 2b2979551e Merge pull request #5460 from boyu0/iss4118_physical_performance_improve 
issue #4118: Physical performance improve.
 2014-02-26 11:37:13 +08:00
boyu0 912dad7a71 closed #4144: fix bug: Node::setPhysicsBody doesn't work at the second time. 2014-02-26 10:53:41 +08:00
boyu0 2397aaf24d issue #4118: add physics contact test. 2014-02-25 15:28:13 +08:00
heliclei 63344a8560 remove unused declare 2014-02-25 11:58:45 +08:00
heliclei 514cd031b3 Merge remote-tracking branch 'upstream/develop' into fix-console-windows-crash 2014-02-25 11:09:58 +08:00
James Chen 2beacc21c9 Merge pull request #5456 from andyque/fixbug3801 
closed #3801: State is changed to RESUME when game comes back to foreground if pause button was clicked in Interval Test
 2014-02-25 10:57:23 +08:00
andyque f88e4be4ce rollback gui filename change 2014-02-25 10:18:45 +08:00
andyque f92301a872 fix jsb munaul bindings error 2014-02-25 10:18:45 +08:00
andyque bf81591b48 fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
andyque f5b0b77423 fixed #3801. uncomment pasue&resume logic when applicationDidBecomeActive and applicationWillResignActive 2014-02-25 10:16:17 +08:00
andyque 8f8b990c85 uncomment the pause() and resume() method call in test-js 2014-02-25 10:16:17 +08:00
James Chen 21fe4f234b Merge pull request #5382 from boyu0/iss4039_tilemap_objectgroup_fix 
closed #4039: fix bug: tilemap <object> x, y, width and height value parse incorrect.
 2014-02-24 22:23:05 +08:00
boyu0 d15009c510 issue #4039: delete name "converted_x", "converted_y", "converted_width", "converted_height". 2014-02-24 20:14:46 +08:00
heliclei 115d3e4a3b Merge remote-tracking branch 'upstream/develop' into fix-console-windows-crash 2014-02-24 17:03:28 +08:00
boyu0 2bc91c2ce3 issue #4039: change name “position_x”, “position_y”, “size_width”, “size_height” to "converted_x", "converted_y", "converted_width", "converted_height". 2014-02-24 16:42:07 +08:00
boyu0 1082f3cad4 issue #4039: change name “position_x”, “position_y”, “size_width”, “size_height” to "converted_x", "converted_y", "converted_width", "converted_height". 2014-02-24 16:39:15 +08:00
heliclei be45047b6b use send/recv to replace write/read 2014-02-24 12:01:04 +08:00
samuele3hu a765178a5f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic 2014-02-24 09:38:08 +08:00
Ricardo Quesada fe1160cd8c changes in API to support 3D 2014-02-22 19:16:42 -08:00
Ricardo Quesada 8ca746af17 Implements AABB culling for sprites 2014-02-22 17:47:56 -08:00
heliclei 92571ebe04 merge upstream/develop 2014-02-22 22:58:24 +08:00
heliclei 5376b6333e fix CCConsole crashed on windows, windows use send/recv(winsock) instead of read/write in unix to do socket i/o, create socketWrite/socketRead to wrap socket i/o function 2014-02-22 22:37:12 +08:00
samuele3hu 293ea66401 issue #3956:Remove the usage of “tolua.cast” 2014-02-21 16:22:35 +08:00
James Chen 1ce8f0ed82 Merge pull request #5428 from dumganhar/iss4106-vector-eraseObject 
closed #4106: Object which isn't in Vector would also be released when invoking Vector::eraseObject.
 2014-02-21 11:37:12 +08:00
James Chen d92e995f8c Merge pull request #5361 from Dhilan007/develop_label 
issue #3821: LabelBMFont re-implemented as a wrapper of Label.
 2014-02-21 11:36:23 +08:00
James Chen c6b2b86fe5 closed #4106: Object which isn't in Vector would also be released when invoking Vector::eraseObject. 
Also refactored 'Vector::eraseObject':
1) Removed 'toRelease' parameter, Vector class should manage reference count.
2) Added 'removeAll' parameter to decide wether to remove all elements with the same value or just the first occurrence .
3) Added relevant UnitTest for 'Vector::eraseObject'.
 2014-02-21 11:24:37 +08:00
samuele3hu 555ef20202 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic 
Conflicts:
	cocos/scripting/lua/bindings/LuaBasicConversions.h
	cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp
 2014-02-21 10:10:20 +08:00
samuele3hu 3532665520 issue #3956:Change tolua_fix.c to tolua_fix.cpp and modify the toluafix_pushusertype_ccobject function to get real type of object 2014-02-21 09:45:33 +08:00
Dhilan007 54f48b23e6 LabelBMFont re-implemented as a wrapper of Label. 2014-02-20 22:33:52 +08:00
James Chen 97a6ac65d3 Merge pull request #5424 from heliclei/console-autotest 
testcpp autotest:support next, back and restart test via console
 2014-02-20 22:22:55 +08:00
heliclei e64a647563 testcpp autotest:support next, back and restart test via console 2014-02-20 21:49:13 +08:00
boyu0 4410e70ca1 closed #4096: add s3tc bitmap with no mipmaps test case. 2014-02-20 18:27:52 +08:00
James Chen f16d7652df Merge pull request #5393 from heliclei/console-autotest 
add console autotest support
 2014-02-20 17:58:21 +08:00
heliclei 1a1f92106a add more console output 2014-02-20 16:29:04 +08:00
James Chen 0af0ce9032 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1 
Conflicts:
	cocos/scripting/auto-generated
 2014-02-20 15:13:40 +08:00
James Chen 633604f79c issue #4058: Typo fix in ZwoptexTest.lua. 2014-02-20 14:12:14 +08:00
James Chen e3d14608df issue #4058: Uses 'void*' instead of 'Ref*' as target of Scheduler. Any class could response scheduler callback now. 2014-02-20 14:11:47 +08:00
heliclei 02af73dd46 add main directive to return main menu 2014-02-20 13:43:28 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
Dhilan007 ddd02b463c optimize label: 
1.remove unnecessary API
2.reduces object-creation and function calls.
 2014-02-19 20:26:14 +08:00
heliclei e7209fbfa4 add autotest help 2014-02-19 17:55:32 +08:00
Dhilan007 f086f39319 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-02-19 17:00:26 +08:00
heliclei f9dceb5c2d use '==' to do string compare 2014-02-19 16:54:42 +08:00
heliclei 0eb957e89c add console autotest support 2014-02-19 16:34:33 +08:00
boyu0 50cdc67191 issue #4039: set tilemap <object> x and y value to original, and add “position_x”, “position_y”, “size_width” and “size_height” value. 2014-02-18 17:44:05 +08:00
James Chen 58d3311da0 Merge pull request #5342 from heliclei/console-user-command 
closed #4063 :revise CCConsole to support more easily for adding custom command.
 2014-02-18 16:54:56 +08:00
James Chen ee4972ae96 Merge pull request #5371 from andyque/refactorActionEase 
closed #3620: Merge cocostudio/CCActionXxx to CCAction。
 2014-02-18 15:58:49 +08:00
Dhilan007 2ad81b0edb closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture. 2014-02-18 14:30:51 +08:00
andyque 0b932f4f5f fixed #3620. merge cocostudio/CCActionXXX to CCAction 2014-02-18 14:22:14 +08:00
andyque e1ca972d3a add tests of all the new added CCActionEaseEx in CCActionEase 2014-02-18 14:22:14 +08:00
samuele3hu 5acb556c74 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 2014-02-18 13:46:21 +08:00
samuele3hu 8cb424b535 close #3593:Add more test cases about SceneReader of cocoStudio 2014-02-18 13:44:11 +08:00
James Chen 19205e3db8 Merge pull request #5365 from natural-law/issue3964 
closed #3964: Solve the bug of Image::saveImageToPNG().
 2014-02-18 11:49:09 +08:00
James Chen 2ee1330479 closed #4054: Adds test for removing child from TMXLayer. 2014-02-17 21:16:25 +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
zhangbin e02f488224 Merge branch 'develop' into issue3964 2014-02-16 11:01:07 +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 f04e604a51 Updates JS-Tests. 2014-02-14 10:27:19 +08:00
James Chen ea7a27fdf7 Updates JS-Tests. 2014-02-14 09:59:54 +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
James Chen 4837b2dd2d issue #3990: setTotalParticles works as expected. _emissionRate has to be updated in setTotalParticles. 2014-02-13 17:01:38 +08:00
zhangbin 8ae5d2a049 closed #3964, Solve the bug of logic code in method Image::saveImageToPNG(). 2014-02-13 16:22:41 +08:00
ucchen 6e742077c2 add spine setAnimationListener test; 2014-02-13 11:58:54 +08:00
heliclei 9befe56a7e update unit test 2014-02-13 11:10:23 +08:00
James Chen 5da57e4c7d closed #3990: Adds test case for issue 3990. 2014-02-13 11:03:35 +08:00
ucchen 2c961bdfbf add spine manual binding; 2014-02-13 11:01:54 +08:00
Éloi Rivard 8adca38efa Linux javascript bindings support. 
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
 2014-02-13 01:42:14 +01:00
samuele3hu 3d0fabe08c issue #3708:Performance Test: data structure conversion in lua binding 2014-02-12 18:19:06 +08:00
boyu0 e7c077bb16 closed #3988: fix indent. 2014-02-12 16:21:26 +08:00
zhangbin bfce75f534 Merge branch 'develop' into ScenarioTest 2014-02-12 16:17:03 +08:00
zhangbin d99af40c32 issue #3738, Improve the performance test of game scenario. 2014-02-12 16:14:04 +08:00
boyu0 4fda8a2635 closed #3988: add bug test 2014-02-12 15:57:02 +08:00
zhangbin 89cc82c332 Merge branch 'develop' into ScenarioTest 2014-02-10 14:26:31 +08:00
James Chen 51ba0cbb17 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268 2014-02-10 14:09:57 +08:00
zhangbin 11dbb37414 issue #3738, Add move actions for the tile map in PerformanceScenarioTest. 2014-02-10 14:04:21 +08:00
Dhilan007 6a662a6330 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2014-02-10 11:47:05 +08:00
zhangbin 926f84d385 issue #3738, Add game scenario performance test case. 2014-02-10 11:42:15 +08:00
James Chen 99c20c4e30 Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268 
Conflicts:
	tests/test-javascript/tests
 2014-02-10 11:38:56 +08:00
Ricardo Quesada 907446d8d0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices 2014-02-09 19:32:35 -08:00
Ricardo Quesada 24f655f9b1 Better 'vertices drawn' 2014-02-09 19:31:45 -08:00
Dhilan007 e12c1f57ac Label::reduce unnecessary calculation amount. 2014-02-10 11:21:54 +08:00
James Chen eda4c9a420 Merge pull request #5302 from Pisces000221/improve-label-chinese 
closed #3933 :A string which only contains CJK characters can't make a line-break when it's needed
 2014-02-10 11:03:03 +08:00
Dhilan007 a8387a12f0 Merge branch 'improve-label-chinese' of https://github.com/Pisces000221/cocos2d-x into develop 2014-02-10 10:09:56 +08:00
Ricardo Quesada 9d5393631c Merge branch 'develop' into fast_tmx 
Conflicts:
	tests/test-cpp/Classes/ConsoleTest/ConsoleTest.cpp
	tests/test-cpp/Classes/VisibleRect.cpp
 2014-02-08 12:49:56 -08:00
Ricardo Quesada 560abe77c8 better Console support 
* Arguments are passed as std::string
* Adds `resolution` and `projection` command
* `texture` and `fileutils` supports the `flush` argument
 2014-02-08 12:46:44 -08:00
Ricardo Quesada 13aa3ad2b5 Adds new commands to Console 
* resolution
* projection
 2014-02-08 12:35:11 -08:00
Ricardo Quesada c7a999335c Console. Less error prone, easier to use, more documentation 2014-02-08 10:20:12 -08:00
Ricardo Quesada ceba63db8b Merge branch 'develop' into fast_tmx 2014-02-08 09:08:33 -08:00
Pisces000221 03be459376 Update LabelTestNew.lua 2014-02-08 17:17:35 +08:00
Pisces000221 cef84f05af Add LabelTTFCJKWrappingTest 2014-02-08 17:16:59 +08:00
Pisces000221 49163bb774 Add LabelTTFCJKWrappingTest 2014-02-08 17:15:57 +08:00
Pisces000221 1170943cf8 Add LabelTTFCJKWrappingTest 2014-02-08 17:14:38 +08:00
Ricardo Quesada 82700339c0 Adds a way to print the renderer vertices 2014-02-07 19:37:44 -08:00
Ricardo Quesada 616feadda1 More fixes and "tiles" is an uint32 (GID) 2014-02-07 18:11:17 -08:00
James Chen c25787e575 issue #3900: Removes the definition of DEBUG. Windows uses _DEBUG . 2014-02-07 16:01:57 +08:00
James Chen 5714552458 issue #3900: mozjs-27.0.lib -> mozjs-27.lib for windows. 2014-02-07 15:29:44 +08:00
James Chen 4c2da5d286 issue #3900: mozjs-25 -> mozjs-27 for windows. 2014-02-07 15:16:14 +08:00
Ricardo Quesada e33baac396 iso almost working 2014-02-06 22:20:28 -08:00
Ricardo Quesada ad7b54eb0e iso almost working 100% ok 2014-02-06 18:47:45 -08:00
Ricardo Quesada cf08d0b3f9 isometric kind of working 2014-02-06 16:19:46 -08:00
Ricardo Quesada 3560227d09 sort of working 2014-02-05 19:51:24 -08:00
Ricardo Quesada 9a53f5a9f5 Testing a new TMX renderer 
faster
 2014-02-04 17:59:21 -08:00
Ricardo Quesada 6ce6806544 new modules 2014-01-31 16:07:09 -08:00
Ricardo Quesada e77d22a58f samples -> tests 2014-01-31 14:09:28 -08:00
minggo f9c40f7372 issue #1399: work ok on iOS after adjusting directory structure 2012-07-19 17:22:36 +08:00
James Chen 20eec32ff0 Updated proj.android/project.properties. target=android-10 --> 8 2012-06-28 18:26:28 +08:00
James Chen 26a02804d9 Added some resources. Updated Texture2dTest.cpp. 2012-06-28 17:34:50 +08:00
James Chen aba33b5bda Reverted build_native.sh. 2012-06-28 16:58:32 +08:00
minggo 5b08a5996c add product name for iOS 2012-06-28 13:52:10 +08:00
minggo e3771a8ad4 modify code sign 2012-06-28 13:41:05 +08:00
minggo 3c43dfb6fe disable retina 2012-06-28 11:50:11 +08:00
minggo 7348fa12c3 update CHANGELOG and delete some unneeded files 2012-06-28 11:47:54 +08:00
James Chen 86942aedb4 fixed #1368: Implement EffectsAdvancedTest (Effect4). Added some comments. 2012-06-27 20:50:47 +08:00
James Chen 33e32e987c Implement EffectsAdvancedTest (Effect4). 2012-06-27 18:44:25 +08:00
James Chen 13793a9d75 fixed #1367: Updated ShaderTest.cpp, TileMapTest.cpp. 2012-06-27 17:08:50 +08:00
James Chen a901b0bb12 fixed #1367: Refactor "createWith***" to "create". 2012-06-27 14:21:29 +08:00
James Chen f6026d2ba3 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-26 12:09:48 +08:00
James Chen 95a2696b6b fixed #1365: Some files of Resources folder which is copied by build_native.sh will lost authority in cygwin. 2012-06-26 12:09:23 +08:00
minggo 765da0c80a enable depth test when running test case:Bug-1159 2012-06-26 11:09:37 +08:00
minggo 5cc1f7d230 fixed #1338:stop animation when entering background and start animation when comming to foreground 2012-06-21 11:42:49 +08:00
James Chen 2af75ecd65 fixed #1336: HelloCocosBuilder/HelloCocosBuilderLayer.cpp 2012-06-20 12:08:34 +08:00
James Chen b818c0afa6 fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces. 2012-06-20 11:48:31 +08:00
James Chen 07b9db8e91 Merge branch 'gles20' into gles20-ccbi 2012-06-19 17:28:31 +08:00
James Chen c4056b1bb0 fixed #1269: Updated include search paths for win32 and android. 2012-06-19 17:22:55 +08:00
James Chen 591566b43a fixed #1335: Memory leaks in cocos2dx and CCBReader. 2012-06-19 16:31:26 +08:00
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
minggo 2666df9472 issue #1269:mrege latest code and fix conflict 2012-06-19 13:57:33 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
James Chen 9fa74721a7 fixed #1334: Add ScrollViewTest to CocosBuilderTest. 2012-06-19 10:34:15 +08:00
Nicolas Gramlich 6f26ea7a56 Added actual implementation of CCScrollViewLoader. Added ScrollViewTest to CococsBuilderTest. 2012-06-18 13:59:45 -07:00
Nicolas Gramlich 227683bfa4 Cleaned up CCNodeLoaders by using the Marco instead of having a boilerplate createCCNode method in all the cpp files. 2012-06-18 13:33:19 -07:00
minggo 6d0608d0f1 fixed #1333: add CCScrollView for iOS 2012-06-18 19:24:47 +08:00
James Chen 3cf0f3555c issue #1330: Removed virtual for callback functions. 2012-06-16 15:22:23 +08:00
James Chen 73c9707d5d CCBIReader fixes + building and running flawless on iOS and Android. 
Made it works on win32.
 2012-06-16 12:48:20 +08:00
Nicolas Gramlich 13bcf2180c Merge with gles20. 2012-06-15 16:26:10 -07:00
Nicolas Gramlich c38bfd0a24 Updated xcode project file. 2012-06-15 16:16:08 -07:00
Nicolas Gramlich d175884f79 Added ParticleSystemTest. 2012-06-15 14:48:36 -07:00
James Chen cc572ab8e7 fixed #1329: Moved all java files part of engine into a certain directory, then all projects refer to them. 2012-06-15 18:15:43 +08:00
James Chen 24cc0796b6 Merge branch 'cocos2dxandroidlibrary' of https://github.com/folecr/cocos2d-x into folecr_android 2012-06-15 17:47:04 +08:00
minggo 899022d107 fixed #1292:fix some bugs that caused by modify function name 2012-06-15 17:39:13 +08:00
James Chen 595a402c83 fixed #1292:make some function names more readable. 2012-06-15 16:47:30 +08:00
James Chen 0afdfe33da Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-15 15:25:37 +08:00
James Chen c17091ac70 fixed #1310: Updated vs2010 project configuration after synchronizing to rc2. 2012-06-15 15:24:22 +08:00
minggo 266a5e5e66 Merge pull request #1028 from minggo/iss1292_moidify_function_name 
issue #1292:make some function names more readable
 2012-06-15 00:14:13 -07:00
minggo d0f905992a issue #1292:make some function names more readable 2012-06-15 15:10:40 +08:00
James Chen 159b91b6cd Fixed a logic error in ActionScaleTest. 2012-06-15 13:56:27 +08:00
James Chen bc150ea5a9 fixed #1327: Exported 'create' method for lua bindings. 2012-06-15 11:46:51 +08:00
folecr 6fc2dc5ed9 Use Java code instead of XML to define layout 
* Android layout for cocos apps are very simple (full screen)
 * Avoids creation of R.java for loading the layout
 * Can package entire library in jar
 * Remove unused layout resource
 2012-06-14 19:52:45 -07:00
minggo c965c8d770 fixed 1181: synchronize latest codes 2012-06-15 10:27:52 +08:00
folecr d651da6f0d Tests : Ant build project files 2012-06-14 19:21:03 -07:00
folecr d86e088e9f Tests : Use cocos2dandroid library 
* Remove code and resources that are now in a library
     * Add library as a dependency for HelloWorld
     * Use cocos2dx_default_ resources
 2012-06-14 19:21:03 -07:00
Nicolas Gramlich 8d7dce0999 Added glue macros to reduce boilerplate code when implementing CCBSelectorResolver and CCBMemberVariableAssigner. Added LabelTest, MenuTest and SpriteTest. 2012-06-14 18:16:54 -07:00
Nicolas Gramlich a7ad34864f CocosBuilderTest: Simplified the 'XYZLoader' classes to be header only, with nice and short macros to do the boilderplate stuff. 2012-06-14 14:23:53 -07:00
minggo 221be759c6 issue #1324: merge James Chen's codes 2012-06-14 18:54:05 +08:00
minggo 9d9e2579e3 issue #1181: save render texture when comming to background 2012-06-14 18:37:57 +08:00
James Chen 052d8ea931 fixed #1324: Added some create methods. Compiling successfully on win32 by vs2008. 2012-06-14 18:32:44 +08:00
James Chen 3a410c14a1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 
Conflicts:
	cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
	cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp
	cocos2dx/label_nodes/CCLabelBMFont.cpp
	cocos2dx/menu_nodes/CCMenuItem.cpp
	cocos2dx/menu_nodes/CCMenuItem.h
	cocos2dx/misc_nodes/CCRenderTexture.h
	cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
	tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp
	tests/tests/LabelTest/LabelTest.cpp
 2012-06-14 17:36:31 +08:00
Nicolas Gramlich cc5eabeb28 ButtonTestLayer: Now showing the CCControlEvent information on screen. Fixed CCLOG -> CCLog (because CCLOG doesn't show up on Android.). 2012-06-14 01:32:52 -07:00
James Chen 23574172ff issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
James Chen 3f7b44fc23 issue #1324: Added create() for static member functions that new an autorelease object 2012-06-14 15:13:16 +08:00
Nicolas Gramlich cdd1fb50ac Moved from std::string to CCString *. Since the std::string utility methods in CCBReader were buggy on Android (for unknown reasons). Made string utility methods in CCBReader static. Android build now working equivalent to iOS build. *YAY* 2012-06-14 00:01:01 -07:00
Nicolas Gramlich 5550d9f2b0 Merge with gles20. 2012-06-13 15:56:52 -07:00
Nicolas Gramlich 3e61e1f014 Updated Android build files to new CCBReader. Fixed a bunch of compiler errors/warnings when building for Android. 2012-06-13 15:25:59 -07:00
Nicolas Gramlich 29b22adccc Batch converted manual 'using namespace cocos2d(::extension);' to USING_NS_CC(_EXT);. CocosBuilderExample: Made HelloCococsBuilderLayer selectors work. Made ButtonTestLayer work. 2012-06-13 14:19:13 -07:00
minggo 9321a8d025 fixed #1322: vertical alignment works ok on android 2012-06-13 18:33:44 +08:00
minggo f80fd0c232 Merge pull request #1015 from minggo/gles20 
issue #1310:synchronize some codes
 2012-06-12 19:46:45 -07:00
minggo b282d52a65 issue #1310:synchronize some codes 2012-06-13 10:41:04 +08:00
Nicolas Gramlich 895604f42e Unified Header Guards. Added CCNodeLoaderListener, simulating the didLoadFromCCB selector. 2012-06-12 11:59:49 -07:00
James Chen d2a16c2b76 issue #1310: Updated MotionStreakTest. 2012-06-12 18:27:36 +08:00
James Chen e943dbf2fd issue #1310: Updated TileMapTest, TransitionsTest, ZwoptexTest. 2012-06-12 18:22:48 +08:00
James Chen 2be8ba120c issue #1310: Updated vs2008 project setting. 2012-06-12 18:15:25 +08:00
James Chen 6d4b80a826 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-12 18:13:02 +08:00
James Chen dab90107b9 issue #1310: Updated SchedulerTest. 2012-06-12 18:12:45 +08:00
James Chen 92f0364dca Merge pull request #1008 from dumganhar/gles20 
issue #1310: Reverted floatr to CCTimer.
 2012-06-12 02:09:10 -07:00
James Chen 08fc714a7f issue #1310: Reverted floatr to CCTimer. 2012-06-12 17:07:54 +08:00
minggo 1d77d53af3 Merge pull request #1007 from minggo/gles20 
issue #1310: synchronize some codes
 2012-06-12 01:57:24 -07:00
minggo 9fbe1fef96 issue #1310: synchronize some codes 2012-06-12 16:56:34 +08:00
James Chen c8b5ad0440 issue #1310: Updated RotateWorldTest and SceneTest. 2012-06-12 16:22:25 +08:00
James Chen 23519ef85c issue #1310: Updated ParallaxTest and RenderTextureTest. 2012-06-12 15:55:23 +08:00
James Chen 1c0f391e03 issue #1310: Updated ParticleTest. 2012-06-12 15:40:31 +08:00
James Chen ae1ea76ca1 issue #1310: Updated NodeTest. 2012-06-12 15:22:42 +08:00
James Chen f5b2a5d33d issue #1310: Updated LayerTest. 2012-06-12 15:14:01 +08:00
James Chen b770010c41 issue #1310: Updated LabelTest. Added init method for CCLabelBMFont. Fixed a bug in CCLabelAtlas::initWithString. 
In CCSpriteBatchNode::initWithTexture, when capacity is equal to 0, set it to default value.
 2012-06-12 14:33:53 +08:00
James Chen ef8ec1a941 issue #1310: Added some resources for tests project. 2012-06-12 14:32:57 +08:00
James Chen 9185f771f1 issue #1310: Added some resources for tests project. 2012-06-12 14:29:15 +08:00
minggo 916b276607 issue #1310: synchronize CCTexturePVR 2012-06-12 12:02:15 +08:00
James Chen 974f0d714d issue #1310: Updated FontTest. And fixed a compilation error in FontTest. 2012-06-12 11:16:31 +08:00
Nicolas Gramlich 1f2652a8d7 Made CCBIReaderTest finally work completely. =) Also added support for having a root path when loading a ccb-file (i.e. when you have the two directories, one for the ccb files, one for the spritesheets. <- With a common ancestor.) 2012-06-11 18:31:11 -07:00
Nicolas Gramlich 4c8351f304 Removed Zombie files. 2012-06-11 15:00:11 -07:00
Nicolas Gramlich 342c65e293 Added CCBIReaderTest, which doesn't work since XCode sucks big time, not finding a simple file. 2012-06-11 14:57:30 -07:00
Nicolas Gramlich 58b53be708 Merge with gles20. 2012-06-11 11:50:32 -07:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07:00
minggo ccbfd24c21 issue #1310: synchronize ActionManagerTest ActionEaseTest ActionsProgressTest ActionsTest 2012-06-11 18:25:57 +08:00
James Chen 2ce7c86c50 fixed #1315: TileMapTest can't be shown correctly in retina mode. 2012-06-11 14:44:32 +08:00
James Chen 33ea7905a5 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/platform/ios/CCFileUtils.mm
 2012-06-11 11:01:36 +08:00
James Chen c95cbb1774 issue #1310: Used CCLabelAtlas instead of CCLabelBMFont to display FPS,SPF status. 
Updated CCFileUtils, added some method, such as sharedFileUtils/purgeFileUtils/purgeCachedEntries.
Fixed a bug in CCDirector, made retina mode work correctly.
 2012-06-11 10:59:57 +08:00
minggo 94235d3602 issue #1310: make tests and HelloWorld work ok 2012-06-11 10:41:52 +08:00
James Chen c9dc60b0f7 issue #1310: fixed a bug in CCSpriteFrameCache.cpp. Disable retina mode for tests project. 2012-06-08 17:58:21 +08:00
James Chen 371b3f9938 issue #1310: Tests project updated!. 2012-06-08 17:34:15 +08:00
minggo cc16320445 issue #1310: syncronize actions 2012-06-08 13:55:28 +08:00
minggo 6cf8ea283d Merge pull request #973 from minggo/iss1278_effect_android 
fixed #1278: stop effect when unloading effect
 2012-06-06 00:41:26 -07:00
minggo 1ff04700b5 fixed #1278: stop effect when unloading effect 2012-06-06 15:38:25 +08:00
James Chen 37aa196c73 Removed some unused codes. 2012-06-06 14:31:49 +08:00
James Chen 6bb2941ec9 fixed #1300: Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA 2012-06-06 10:06:51 +08:00
minggo dc24094b5f fixed #1290:use Shaders folder in correct way 2012-06-04 11:41:03 +08:00
James Chen cfbf29ccfc Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1282_ati 2012-06-01 13:47:23 +08:00
James Chen ebcc78497f fixed #1282: Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error. 2012-06-01 13:44:28 +08:00
minggo 93b5fc37c7 typo fix 2012-06-01 12:04:04 +08:00
James Chen 9be586e4ec Updated main.cpp for each project of android. 2012-05-31 10:13:05 +08:00
minggo 5ad2bec3d8 Merge pull request #946 from minggo/gles20 
fix some bug
 2012-05-30 03:33:19 -07:00
minggo a698f9bf69 fix some bug 2012-05-30 18:31:20 +08:00
James Chen 922f7544ad Updated TouchesTest. 2012-05-30 16:55:46 +08:00
James Chen bd248b5ac0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-05-30 16:09:52 +08:00
James Chen 7115a7f3c9 issue #1275: Memory leaks in CCBReader and ActionsTest. 2012-05-30 16:09:19 +08:00
minggo 8203cf00ba use fonts/fps_images.png 2012-05-30 13:37:36 +08:00
James Chen ff0dde984c fixed #1240: Updated vs2008 project setting (release target). 2012-05-29 18:29:56 +08:00
James Chen b4fad0bb2b fixed #1240: Updated vs2010 project setting (release target). 2012-05-29 18:06:52 +08:00
James Chen 1ddb5d51b5 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-05-29 17:13:21 +08:00
minggo a09bbbd0ba fixed #1177: modify project setting, because CCStd.h is moved into platform/ios 2012-05-29 16:23:57 +08:00
James Chen 19c96632b5 fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces. 2012-05-29 16:21:23 +08:00
James Chen a00db6e072 fixed #1240: Updated ios project configuration. 2012-05-25 17:00:33 +08:00
James Chen c902e884f4 fixed #1240: Moved particle files to Particle folder. Fixed a bug in tiff decoding. Refactored CCTextureCache::adddImage. 2012-05-25 16:52:47 +08:00
James Chen 6477a02022 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1240_tiff 2012-05-25 11:00:20 +08:00
James Chen 0b8a75e982 fixed #1240: Used dynamic libtiff library for win32. Fixed some warnings. Added tiff test in Texture2dTest. 2012-05-25 10:58:28 +08:00
minggo 138de3171f Merge pull request #912 from minggo/merge_nicolasgramlich 
Merge pull request by nicolasgramlich
 2012-05-23 19:56:05 -07:00
minggo 0ba62c3854 issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp 2012-05-24 10:48:39 +08:00
James Chen a5b63d8f6c fixed #1251: Added CocosBuilderTest to the test project for VS2008. 2012-05-23 11:41:42 +08:00
Nicolas Gramlich a62e017977 Made MenuTest use a differently names labelatlas to avoid collision with fps_images.fnt/png. 2012-05-22 13:26:20 -07:00
Walzer 7dadd8128c rename tests/Resource/CocosBuilder to CocosBuilder_v1 2012-05-11 21:22:50 +08:00
Walzer dc18dc0942 test ccb v2 format, add relative-position support 2012-05-11 20:53:30 +08:00
Walzer ae12434128 fixed #1205, rename CCCustomClass to CCCustomClassProtocol, add windows support. 2012-05-08 11:30:08 +08:00
Walzer f10b94fd15 issue #1205, CCBReader works on both iOS & Android now; public APIs of CCBReader are reduced; ccb files in subfolder is supported. 2012-05-07 22:52:58 +08:00
Walzer 1a73064055 issue #1205, refactor the tricky cpp reflection to easier approach, add cocos2d::extension namespace for CCBReader, add doxygen comments. Todo: CCB support on android 2012-05-07 18:14:15 +08:00
Walzer c76e3c0936 remove CppReflection, add CCBCustomClass and CCBCustomClassFactory to implement reflection, leave some jobs to class HelloCocosBuilder: public CCBCustomClass. The approach is not so tricky, much easier to understand now. 2012-05-07 17:05:17 +08:00
Walzer 07276c3bba Merge commit '184b31efa3aaa340621f5aa736d3b16e6ad97327' into gles20 2012-05-05 15:49:11 +08:00