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

20240 Commits

Author SHA1 Message Date
samuele3hu ee4e5e4800 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-14 14:45:15 +08:00
andyque 578ff2735d issue #5110, fix VideoPlayer android compile error 2014-05-14 14:44:04 +08:00
samuele3hu 534ad2aafb fix the compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value 2014-05-14 14:43:10 +08:00
cw cc5ba9b2b1 modify android orientation 2014-05-14 14:40:27 +08:00
minggo f22804241a Merge pull request #6725 from dumganhar/ref-tracker 
Adds ref memory tracker to easily find out memory leak for instance of Ref or its subclasses
 2014-05-14 13:44:22 +08:00
James Chen 4c23ff5b8c trackRef and untrackRef are static function now. 2014-05-14 11:55:20 +08:00
lm cf24e327ee [Jenkins][ci skip] Add external lib to ci release build 2014-05-14 11:53:27 +08:00
pandamicro a463a1630f Fixed #5040: Remove memory allocation assertion to permit multiply init 2014-05-14 11:49:09 +08:00
andyque 46cf6251b6 issue #5110, rename a member variable and delete gui prefix in ui tests 2014-05-14 11:26:04 +08:00
James Chen 77d330da77 Merge pull request #6727 from shujunqiao/pull-build-trigger 
[ci skip], modify v3!=v2 about config.json.
 2014-05-14 11:23:59 +08:00
vision 7b0cf3c860 replace std::function with const std::function& 2014-05-14 11:21:46 +08:00
shujunqiao 1341970b40 [ci skip], modify v3!=v2 about config.json. 2014-05-14 11:19:30 +08:00
andyque e6a36fde18 issue #5110, refactor VideoPlayer 2014-05-14 11:18:11 +08:00
James Chen 7bc0eea7f0 Merge pull request #6724 from CocosRobot/update_lua_bindings_1400032916 
[AUTO]: updating luabinding automatically
 2014-05-14 10:50:44 +08:00
andyque 08801c035e issue #5110. refactor UILoadingBar, remove unneeded deprecats 2014-05-14 10:48:16 +08:00
vision e7df247d65 replace more tabs with spaces to uniform the code styles. 2014-05-14 10:40:56 +08:00
James Chen 54176b0267 Include <algorithm> for std::find 2014-05-14 10:31:09 +08:00
James Chen c14482254d Fixes wrong indention and whitespace cleanup 2014-05-14 10:25:45 +08:00
James Chen ba3f5f8eee Updates indention in CCRef.h 2014-05-14 10:17:08 +08:00
James Chen 72d29976c3 Disables memory tracker by default 2014-05-14 10:16:05 +08:00
James Chen eb8f07370c Remove a comment in CCRef.cpp 2014-05-14 10:12:49 +08:00
James Chen d9d4d9d51a Adds ref memory tracker to easily find out memory leak for instance of Ref or its subclasses 2014-05-14 10:07:03 +08:00
CocosRobot 20c50ef189 [AUTO]: updating luabinding automatically 2014-05-14 02:03:18 +00:00
minggo 89bb56e829 [ci skip] 2014-05-14 09:59:38 +08:00
minggo 0303e5d270 Merge pull request #6716 from andyque/issue4900 
closed #4900, add TTF font to UIText
 2014-05-14 09:57:57 +08:00
andyque ca4a7a7e53 issue #4900, refactor 2014-05-14 09:55:55 +08:00
andyque 92d9120967 issue #4900, refactor 2014-05-14 09:37:21 +08:00
andyque df86b07f15 closed #5005, refactor 2014-05-14 09:23: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 52578d9145 Merge pull request #6723 from ricardoquesada/EffectNode 
Adds effectNode in ShaderTest2
 2014-05-13 18:13:51 -07: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 0866c0121d Merge pull request #6722 from ricardoquesada/multitexturing_fixes 
Adds simple sample for multitexturing
 2014-05-13 14:09:47 -07:00
zifter 249dffa346 getter always must be a const method. 2014-05-13 23:28:04 +03:00
Ricardo Quesada 6462a1bf79 Adds simple sample for multitexturing 2014-05-13 12:55:34 -07:00
Ricardo Quesada adce46a7b4 Merge pull request #6720 from ricardoquesada/matrix_constants 
Matrix::identity() -> IDENTITY
 2014-05-13 10:28:41 -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
James Chen 41e57a6de3 Merge pull request #6718 from dumganhar/v3 
Updates travis.yml, adds email notification to @Minggo and @James
 2014-05-13 21:30:22 +08:00
James Chen bd82c119b6 Updates travis.yml, adds email notification to @Minggo and @James 2014-05-13 21:26:25 +08:00
Dhilan007 ed0ae9d5b3 fix compiling fail on Linux. 2014-05-13 18:51:02 +08:00
minggo ac22dc236a [ci skip] 2014-05-13 18:45:41 +08:00
andyque a28bdb0ed5 closed #5005, refactor 2014-05-13 18:41:38 +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
bofeng-song 11f28c47cb Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3 2014-05-13 18:35:18 +08:00
visiblelight fe91f46882 The target filename shuld use a writable path. 2014-05-13 18:34:35 +08:00
bofeng-song 47bc17eac2 Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3 2014-05-13 18:33:08 +08:00
James Chen c57815778d Merge pull request #6717 from lmskater/add-error-commit-status 
[Jenkins][ci skip] Add error commit status for cancel build in queue
 2014-05-13 18:21:30 +08:00
lm 5cd5a2339b [Jenkins][ci skip] Add error commit status for cancel build in queue 2014-05-13 18:16:51 +08:00