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

3709 Commits

Author SHA1 Message Date
vision dfb016dde3 move the utility from Renderer to UtilsHelper 2014-05-14 16:25:47 +08:00
vision 7b0cf3c860 replace std::function with const std::function& 2014-05-14 11:21:46 +08:00
vision e7df247d65 replace more tabs with spaces to uniform the code styles. 2014-05-14 10:40:56 +08:00
vision 021be6ef9b Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot 2014-05-14 09:22:36 +08:00
Ricardo Quesada 723938e292 Adds effectNode in ShaderTest2 2014-05-13 18:12:58 -07:00
Ricardo Quesada 0171e27747 Merge pull request #6714 from Dhilan007/v3_nodefix 
Fix a bug that if a node changes parent, parent's matrix will not update to reflect this change.
 2014-05-13 14:14:27 -07:00
Ricardo Quesada 6462a1bf79 Adds simple sample for multitexturing 2014-05-13 12:55:34 -07:00
Ricardo Quesada 31dd70dba2 Matrix::identity() -> IDENTITY 
consistency with the rest of the  cocos2d API
 2014-05-13 10:26:25 -07:00
visiblelight 541d03d668 Now it shoudl run fine on iOS 2014-05-14 01:06:26 +08:00
visiblelight 4df8624a54 Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot 2014-05-13 22:37:40 +08:00
minggo 05c16de87a Merge pull request #6715 from dumganhar/iss5160-animation-notification 
closed #5160: Dispatch a custom event after an animation frame is displayed
 2014-05-13 18:38:44 +08:00
visiblelight fe91f46882 The target filename shuld use a writable path. 2014-05-13 18:34:35 +08:00
minggo 7d7d0b8251 Merge pull request #6712 from dumganhar/dont-using-cocos2d-namespace-in-header 
PLEASE NEVER `using namespace cocos2d;` in header file
 2014-05-13 18:07:18 +08:00
visiblelight 0de27ad4f1 Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot 2014-05-13 17:30:16 +08:00
James Chen 1ced31a2d3 issue #5160: Don't use static variables, use member variables 2014-05-13 17:29:05 +08:00
visiblelight 5459b581b0 replace tab with spaces; remove the 'flipped' parameter; 2014-05-13 17:17:15 +08:00
James Chen 0cd2196b88 closed #5160: Dispatch a custom event after an animation frame is displayed 2014-05-13 17:08:30 +08:00
James Chen d0c98d6269 Adds ValueVectorNull, ValueMapNull, ValueMapIntKeyNull global variables. 2014-05-13 17:03:48 +08:00
Dhilan007 1a7ca64be2 Merge branch 'reparentChildren' of https://github.com/darkdukey/cocos2d-x into v3_nodefix 2014-05-13 16:36:42 +08:00
visiblelight 47e4ee4ff2 add a new utility function to capture the screen 2014-05-13 16:23:35 +08:00
James Chen 86411837c6 PLEASE NEVER `using namespace cocos2d;` in header file 2014-05-13 16:15:21 +08:00
Ricardo Quesada cd194cad9f Merge pull request #6711 from ricardoquesada/indent_issues 
fixes more indentation issues
 2014-05-13 00:10:30 -07:00
Ricardo Quesada 8aea6fe89f fixes more indentation issues 2014-05-13 00:10:01 -07:00
CocosRobot 7ad48b632a [AUTO]: updating luabinding automatically 2014-05-13 07:03:12 +00:00
Ricardo Quesada f25de7869b indentation issues 2014-05-12 23:57:46 -07:00
Ricardo Quesada cdac920b5f Merge remote-tracking branch 'cocos2d/v3' into multitexturingsupport 2014-05-12 23:52:02 -07:00
Ricardo Quesada 71848aca93 Initial multitexturing support 2014-05-12 23:51:37 -07:00
Nite Luo 7d8cfc4cca set parent transform dirty when addChild 2014-05-12 23:28:20 -07:00
minggo 75196d96ce Merge pull request #6696 from andyque/issue5121 
issue 5121, fix loading bar init flicker and refator percentage
 2014-05-13 13:45:01 +08:00
andyque 7049fd253d closed #5121, add const to getPercent method 2014-05-13 12:06:28 +08:00
CocosRobot bf6ed6eb8b [AUTO]: updating luabinding automatically 2014-05-13 03:39:46 +00:00
minggo ccb55448da Merge pull request #6685 from andyque/refactor5118 
closed #5118, remove WidgetType and refactor LayoutType to Type
 2014-05-13 11:35:36 +08:00
andyque 7db02fc0e9 closed #5121, change percentage from int to float 2014-05-13 10:34:08 +08:00
andyque 5e01c61d8b closed #5118, fix indent 2014-05-13 10:15:29 +08:00
andyque 9125673c1c issue #5121, fix LoadingBar percentage when initialize 2014-05-13 10:13:08 +08:00
Ricardo Quesada 012f1020ca GLProgramState fixes 
It is possible to submit to the Renderer a Sprite with custom uniforms
(although it won't be batched).
It is possible to use a custom shader + uniforms on Sprite with
subclassing Sprite
 2014-05-12 19:12:56 -07:00
andyque c2f7c10f1c closed #5118, refactor, improving variable name 2014-05-13 09:56:10 +08:00
Ricardo Quesada 5d24b3d99a Merge pull request #6693 from MSOpenTech/wp8-v3-fix2 
Fixes for WP8 V3 build recently broken by recent commits
 2014-05-12 10:06:32 -07:00
Dale Stammen 78df412669 updated project files to latest version of cocos2d 2014-05-12 09:27:52 -07:00
Dale Stammen 34b0245cfe updated WP8 precompiled shaders 2014-05-12 09:27:27 -07:00
Dale Stammen bad71e38d0 fixed for ABSOLUTE and RELATIVE winrt compiler reserved words 2014-05-12 09:26:39 -07:00
Dale Stammen 50336dca40 updated to latest version of cocos2d 2014-05-12 09:25:37 -07:00
James Chen 602d89126f Value: initialize Value with Type::None when its move and copy 
contructor is called.
Memory leak fix in `operator =(Value&&)` move assignment.
 2014-05-12 23:32:51 +08:00
James Chen b24f742c92 Null ptr check in value assignment 2014-05-12 18:45:36 +08:00
andyque ebffc66a83 closed #5118, fix CCSGUIReader setAnchorPoint 2014-05-12 18:07:13 +08:00
andyque a0a4df5ac5 closed #5118, remove WidgetType and refactor LayoutType to Type 2014-05-12 18:00:54 +08:00
minggo 9ab2dae212 Merge pull request #6635 from dumganhar/iss4660-unicode 
issue #4660: ccUTF8 uses utf8-utf16 conversion in llvm3.4
 2014-05-12 17:57:25 +08:00
CocosRobot 16b31e3157 [AUTO]: updating luabinding automatically 2014-05-12 08:14:14 +00:00
minggo f290d4d3ff Merge pull request #6632 from andyque/refactor5057 
issue #5057. add UIDeprecated.h and refactor FocusDirection to inner class of
 2014-05-12 16:10:21 +08:00
andyque 9a8c87601c Merge branch 'v3' into refactor5057 2014-05-12 15:52:47 +08:00