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

16879 Commits

Author SHA1 Message Date
Ricardo Quesada 5a2697816f Updates CHANGELOG 2014-02-28 16:41:37 -08:00
Ricardo Quesada 3588041409 removed empty spaces 2014-02-28 16:39:04 -08:00
Ricardo Quesada 9d501479c1 removes unused ivar from ParticleSystemQuad 2014-02-28 16:19:27 -08:00
Ricardo Quesada da8e571862 shaders set in the correct position 2014-02-28 16:14:55 -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 13b60c8759 Applies Wu Hao's patch for 2.5D 2014-02-28 13:48:00 -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 e301e84fc6 Merge pull request #5496 from andyque/bug4103 
fixed #4103. fix crash when websocket close
 2014-02-28 17:44:49 +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
andyque 46c93f07ad fixed #4103. fix crash when websocket close 2014-02-28 17:32:54 +08:00
zhangbin 7d5ac249fb Modify the depend project path for project "TestCpp". 2014-02-28 17:29:12 +08:00
James Chen b5ca9f21d1 Merge pull request #5482 from andyque/fix3868 
fixed #3868: Possible crash on repeat running between HttpClientTest, WebSocketTest, SocketIOTest
 2014-02-28 16:57:33 +08:00
James Chen 2995f91b59 Update CHANGELOG [ci skip] 2014-02-28 16:38:05 +08:00
James Chen 40d29824c5 Update AUTHORS [ci skip] 2014-02-28 16:36:09 +08:00
James Chen ec4a4466b4 Merge pull request #5461 from Wilhansen/spine_skelFix 
closed #4156: spine::Skeleton would not be updated after re-adding to scene.
 2014-02-28 16:34:35 +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 5244cb93ed closed #4150: Delete PhysicsBodyInfo::set/getPosition/Rotation method. 2014-02-28 15:50:38 +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
James Chen d33017f27a issue #4129: Adds default argument(nullptr) for dispatchCustomEvent. 2014-02-28 15:40:45 +08:00
James Chen b2cebebbaf issue #4129: Remove unused references in Xcode project. 2014-02-28 15:40:03 +08:00
boyu0 a934d29c57 issue #4150: Correct body position with the node has a parent. Add set/getPosition/Rotation method. 2014-02-28 15:31:25 +08:00
James Chen 7774bb4c6c closed #4129: Event listeners in engine shouldn't be removed by method removeAllEventListeners(). 2014-02-28 15:09:53 +08:00
James Chen bbc1c385c2 issue #4129: EventTouch::getTouches return const reference. 2014-02-28 15:08:18 +08:00
James Chen 7fcc9f02d7 Merge pull request #5490 from natural-law/issue3684 
closed #3684: Set shader program before TextureAtlas is rendered.
 2014-02-28 13:55:07 +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
James Chen 658cf72d31 issue #4129: Uses 'const reference' when getting touches by EventTouch::getTouches. 2014-02-28 13:43:28 +08:00
James Chen 8a04fbabf1 issue #4129: EventDispatcher::_listeners -> _listenerMap. 2014-02-28 12:01:47 +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
Ricardo Quesada 5d8aa8629d Merge pull request #5489 from ricardoquesada/spine_fixes 
SpineDrawing fixes
 2014-02-27 19:41:09 -08:00
Ricardo Quesada 8ebf00fec1 SpineDrawing fixes 2014-02-27 19:40:21 -08:00
James Chen 7bfd180743 Update CHANGELOG [ci skip] 2014-02-28 10:19:37 +08:00
James Chen c8b6438750 Update AUTHORS [ci skip] 2014-02-28 10:18:08 +08:00
James Chen 5454a2db62 Update CHANGELOG [ci skip] 2014-02-27 21:56:31 +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 cd35bc17e8 Update CHANGELOG [ci skip] 2014-02-27 21:53:31 +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 ab9f030b11 Merge pull request #5487 from dumganhar/develop 
Adds 'override' keyword for override functions (onEnter, onExit) in cpp-tests.
 2014-02-27 21:21:10 +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
minggo 2d0032c825 Merge pull request #5479 from boyu0/iss4118_physical_performance_improve 
issue #4118: improve physical performance.
 2014-02-27 20:51:41 +08:00
boyu0 5ff60485a4 issue #4118: set body update after physics step. 2014-02-27 20:23:23 +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
James Chen e117687a92 Merge pull request #5485 from dumganhar/develop 
Fix travis build fails.
 2014-02-27 16:24:21 +08:00