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

1307 Commits

Author SHA1 Message Date
Ricardo Quesada a0ab8fcdf3 onDraw() updated 
`onDraw()` receives `const kmMat4 &transform` and `bool
transformUpdated`.

`CC_NODE_DRAW_SETUP()` is no longer used in our code.
`_modelViewTransform` is only used as a cache.
 2014-03-05 15:49:08 -08:00
Ricardo Quesada 0cb759cab8 Better names for tests 2014-03-05 11:50:12 -08:00
CaiWenzhi cb5f9ad6dc Modify windows project 2014-03-05 22:34:24 +08:00
CaiWenzhi ad85d2c800 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-05 21:20:26 +08:00
CaiWenzhi 4f9dfdbef8 Fixed build error except Windows 2014-03-05 21:18:51 +08:00
minggo 6d31e4eb15 remove wrong sub-title 2014-03-05 19:58:33 +08:00
James Chen 12206fc1fd Merge pull request #5561 from boyu0/v3.0_final_test 
Move Box2dTestBed step method to onDraw.
 2014-03-05 19:28:42 +08:00
minggo f1cd89b168 Merge pull request #5557 from dabingnn/develop_fixRetroTest 
fix: shader RetroTest by using new label
 2014-03-05 19:25:40 +08:00
minggo b7df75745e Merge pull request #5562 from Dhilan007/develop_label 
issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline
 2014-03-05 17:28:37 +08:00
CaiWenzhi ab47cafb31 Merge branch 'develop' into develop_nutty_modify_framework_for315 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/gui/UIButton.cpp
	cocos/gui/UIButton.h
	cocos/gui/UIWidget.h
 2014-03-05 16:52:31 +08:00
boyu0 b0414a88ed Delete Box2DView::tick() method. 2014-03-05 15:55:08 +08:00
Dhilan007 23501b40aa issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline 2014-03-05 15:54:40 +08:00
boyu0 8a4f16fec6 Move Box2dTestBed step method to onDraw 2014-03-05 15:40:16 +08:00
James Chen 8e28400725 Some warning fixes in cpp-tests. 2014-03-05 15:04:47 +08:00
Huabing.Xu b866a16503 fix: shader RetroTest by using new label 2014-03-05 14:41:13 +08:00
boyu0 e0de7efa8e Rename ActionManagerTest->RemoveTest to StopActionTest 2014-03-05 14:32:00 +08:00
Ricardo Quesada 0bbc1cf5c3 fixes more warnings 2014-03-04 14:00:32 -08:00
Ricardo Quesada 7ac663e02c GL Program API fixes 2014-03-04 13:51:43 -08:00
CaiWenzhi 353f6fb42c Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-05 01:09:51 +08:00
CaiWenzhi 7415ecc2b7 Fixed crash of sample 2014-03-04 17:06:12 +08:00
CaiWenzhi 8b9d572961 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-04 16:59:06 +08:00
CaiWenzhi 4a2dc4a607 Add custom widget and reader 2014-03-04 16:51:35 +08:00
Huabing.Xu 99d0ce160a rename setVirtualViewPort->setVirtualViewport 2014-03-04 15:41:36 +08:00
Huabing.Xu 0d4783dd39 set scaleY to -1 for test case, because renderTexture result is not the same as texture load from file 2014-03-04 15:24:06 +08:00
Huabing.Xu 3e9e33a46b add new test cases 2014-03-04 15:07:54 +08:00
Ricardo Quesada c386f88e32 Merge branch 'develop' into visit_draw_improved 
Conflicts:
	CHANGELOG
	cocos/gui/UILayout.h
 2014-03-03 11:27:42 -08:00
minggo 01dd962cb6 Merge pull request #5495 from Dhilan007/develop_gblur 
fixed incorrect effect of Gaussian Blur.
 2014-03-03 18:01:29 +08:00
minggo 594342ea3e Merge pull request #5505 from dumganhar/event-dispatcher-refactor 
[EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'.
 2014-03-03 17:56:57 +08:00
minggo be0ac5dc1c Merge pull request #5493 from boyu0/bug4150_physics_position_rotation 
closed #4150: fix physics position and rotation bug.
 2014-03-03 14:57:33 +08:00
James Chen 1aa9e35fb2 Merge pull request #5500 from dumganhar/scheduler-refactor 
closed #4165: Refactors Scheduler class.
 2014-03-03 11:20:06 +08:00
James Chen 757425c54b issue #4165: Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now. 2014-03-03 11:00:30 +08:00
James Chen 104531c22e Merge pull request #5499 from heliclei/autotest-run 
add CCConosle [autotest run] command
 2014-03-03 10:06:25 +08:00
James Chen f3949e078b [EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'. 2014-03-02 17:41:18 +08:00
James Chen 23f15ed9b5 closed #4160: Adds test case for issue 4160. 2014-03-02 16:22:57 +08:00
Ricardo Quesada cdc19eea1c Nodes: setAdditionalTransform() receives a pointer 
and not a const reference.
If the pointer is `NULL`, then it won't use the additionalTransform
 2014-03-01 08:26:54 -08:00
James Chen e6d2c4ec73 Refactors Scheduler class. 
* Timer is an abstract class now.
* Adds three new timers ( `TimerTargetSelector`, `TimerTargetCallback`, `TimerScriptHandler`) which are inherited from Timer.
* Adds new API 'scheduleCallback` / `unscheduleCallbackForKey', and callback's target could be any classes since we're using `void*` to identify target.
* `Scheduler::scheduleCallback` use `std::function`, therefore, it supports passing `lambda`, `member_function` and `global_function`.
* The old selector API is still kept since it's very useful when schedule callback is a member function, it doesn't need a `key` to identify the callback function. (+1 squashed commit)
* Adds relevant test cases.
 2014-03-01 14:09:09 +08:00
Ricardo Quesada b50a787f6d Adds new ParticleTest for auto-batching 2014-02-28 22:03:36 -08:00
Ricardo Quesada d78304599d Cache working OK. 
Performance increased in 20% for static objects.
 2014-02-28 16:10:48 -08:00
Ricardo Quesada 6920bec6ef transform object returns the MV 
code cleaner.
the kmGL code is altogether
 2014-02-28 11:20:53 -08:00
Ricardo Quesada ff79c0d9ad Merge branch 'develop' into visit_draw_improved 2014-02-28 10:59:07 -08:00
heliclei 02bf79f075 fix windows compile error 2014-02-28 23:41:01 +08:00
heliclei d50391e5dd add CCConosle [autotest run] command 2014-02-28 23:02:22 +08:00
James Chen c2167501cc Merge pull request #5494 from natural-law/develop 
Modify the depend project path for project "TestCpp".
 2014-02-28 17:36:36 +08:00
Dhilan007 0837b73dda fixed incorrect effect of Gaussian Blur. 2014-02-28 17:34:24 +08:00
zhangbin 7d5ac249fb Modify the depend project path for project "TestCpp". 2014-02-28 17:29:12 +08:00
James Chen 225b5e0e4f Merge pull request #5492 from dumganhar/iss4129-remove-all-listener 
closed #4129: Event listeners used in engine shouldn't be removed by method removeAllEventListeners().
 2014-02-28 16:09:54 +08:00
boyu0 015180bf62 issue #4150: Add physics position/rotation test 2014-02-28 15:47:49 +08:00
James Chen 7dd75ea2cb issue #4129: Adds test case for issue 4119. 2014-02-28 15:46:48 +08:00
Ricardo Quesada eb66ddd931 visit and draw improved. 
`visit()` and `draw()` are improved.
they both receive:
 - `Renderer`
 - `kmMat4` for transformation
 - `bool` whether or not the transform changed from the previous frame

Although `draw` and `visit` are not using the 3 new parameters,
they will start using it in the coming days (or weeks, or months).

Those parameters are needed for:
 - `Renderer` shouldn't be a singleton. There should be one renderer per Director. There could be more than one renderer
 - we should get rid of `kmGLXXX` functions since nodoby knows what is happening. the `kmMat4` is for that.
 - whenever possible, we should try to optimize the multiplications. the `dirty` flag is for that.

We need those changes, so, it is better to change the API now, and not right after v3.0-final is released.
 2014-02-27 21:43:54 -08:00
zhangbin 9a5adc5be5 closed #3684, Optimize the code of TextureAtlas test case. 2014-02-28 11:52:08 +08:00
zhangbin ddf5957a9c closed #3684, Set shader program before TextureAtlas is rendered. 2014-02-28 11:43:41 +08:00
James Chen b363751b1a Merge pull request #5477 from heliclei/console-upload-file 
CCConsole:support file upload via telnet console
 2014-02-27 21:53:57 +08:00
James Chen 4277509966 Merge pull request #5463 from andyque/refactor3877 
closed #3877. make fadeIn and fadeOut behaviours correct
 2014-02-27 21:49:38 +08:00
heliclei 5531cae2ec Merge remote-tracking branch 'upstream/develop' into console-upload-file 2014-02-27 21:35:53 +08:00
James Chen a96f44f31d Adds override for override functions (onEnter, onExit) in cpp-tests. 2014-02-27 21:10:03 +08:00
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