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

1132 Commits

Author SHA1 Message Date
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