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

20090 Commits

Author SHA1 Message Date
cw a7c0a44792 fixed warnging 2014-05-15 11:34:17 +08:00
minggo 39d3d65157 Merge pull request #6754 from minggo/monkey-test 
Matrix -> Mat4
 2014-05-15 11:10:39 +08:00
minggo 67f809e223 Matrix -> Mat4 2014-05-15 11:09:17 +08:00
minggo e0e82555a1 Merge pull request #6707 from andyque/issue5005 
fix widget enable issue
 2014-05-15 11:08:39 +08:00
andyque cfa0342618 Merge branch 'v3' into issue5005 
Conflicts:
	cocos/ui/UIWidget.cpp
 2014-05-15 11:03:03 +08:00
andyque 3f08dd2758 issue #5183, remove no needed type 2014-05-15 10:48:33 +08:00
andyque b32ca246e7 issue #5183, done 2014-05-15 10:44:19 +08:00
James Chen 140560057b Merge pull request #6751 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-05-15 10:40:42 +08:00
zhangbin 2eafb3c39f Update the reference of submodule cocos2d-console. 2014-05-15 10:37:06 +08:00
shujunqiao 39e5619f3f modify /merge to /head in pull-request-build. 2014-05-15 10:36:01 +08:00
andyque 5697d2417a issue #5183, done 2014-05-15 10:23:25 +08:00
andyque 0639e49031 issue #5183, add LayoutProtocol 2014-05-15 10:07:42 +08:00
minggo 25ffb997f5 Merge pull request #6748 from minggo/template-fix 
use RGBA8 as default pixel format
 2014-05-15 10:01:36 +08:00
minggo 354566d782 use RGBA8 as default pixel format 2014-05-15 09:56:26 +08:00
byeonggee.seo c6f2a2aeb3 name fix 2014-05-15 10:19:59 +09:00
Ricardo Quesada 35b29dd0f3 Merge pull request #6747 from ricardoquesada/improved_shader_test 
Even better shader test
 2014-05-14 16:56:30 -07:00
Ricardo Quesada 1c13f901ae Even better shader test 2014-05-14 16:55:57 -07:00
zifter 287b10f070 Fixed double calling onExit method. 2014-05-14 23:28:47 +03:00
Ricardo Quesada 6c025d22b5 Merge pull request #6746 from ricardoquesada/shadertest2_fixes 
Improvments on the shader2 tests
 2014-05-14 13:10:17 -07:00
Ricardo Quesada 839170c147 Improvments on the shader2 tests 2014-05-14 13:09:33 -07:00
NatWeiss 146c9da102 Fix compilation error using arch i386 
Adding a member variable to hold the `placeholderAttributes` property fixes a compilation error regarding synthesis when building with ARCH=i386.
 2014-05-14 10:29:11 -07:00
Ricardo Quesada eb973058f5 Merge pull request #6743 from CocosRobot/update_lua_bindings_1400087657 
[AUTO]: updating luabinding automatically
 2014-05-14 10:18:26 -07:00
CocosRobot 7b45fc90a8 [AUTO]: updating luabinding automatically 2014-05-14 17:16:02 +00:00
Ricardo Quesada 5f8a5921d5 Merge pull request #6742 from ricardoquesada/v3_renameMathClassName_squash 
math renames
 2014-05-14 10:08:28 -07:00
Ricardo Quesada dc711643cd Squashed commit of the following: 
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed May 14 10:03:44 2014 -0700

    math renames

    `Vector2` -> `Vec2`
    `Vector3` -> `Vec3`
    `Vector4` -> `Vec4`
    `Matrix` -> `Mat4`

commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:24:28 2014 -0700

    raw version of rename Vector3

commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:07:14 2014 -0700

    rename Vector2 after merge

commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:05:30 2014 -0700

    Merge branch 'v3' into v3_renameMathClassName

    Conflicts:
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp

commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 08:51:45 2014 -0700

    rename vector2 in tests/cpp-empty-test folder

commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:58:23 2014 -0700

    rename vector2 in tests/cpp-tests cpp files

commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:52:57 2014 -0700

    rename vector2 in tests/cpp-tests head files

commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:49:48 2014 -0700

    rename vector2 in extension folder

commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:47:22 2014 -0700

    rename vector2 in cocos/2d cpp files

commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:44:39 2014 -0700

    rename vector2 in cocos/2d head files

commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:59 2014 -0700

    rename vector2 in cocos/base folder

commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:43 2014 -0700

    rename vector2 in cocos/deprecated folder

commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:26 2014 -0700

    rename vector2 in cocos/editor-support folder

commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:36:48 2014 -0700

    rename vector2 in cocos/ui folder

commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:39 2014 -0700

    rename vector2 in cocos/renderer folder

commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:15 2014 -0700

    rename vector2 in cocos/physics folder

commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:25:01 2014 -0700

    rename vector2 in cocos/math folder

commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:16:55 2014 -0700

    rename Vector2 to Vec2
    deprecate typedef Vector2
 2014-05-14 10:07:09 -07:00
zifter 6fcef92708 Fix Progress Action. 2014-05-14 19:13:14 +03:00
James Chen 86fb75a031 Merge pull request #6739 from shujunqiao/pull-build-branch 
[ci skip],for stupid error in equal
 2014-05-14 20:00:07 +08:00
shujunqiao a1f1b2f3a1 [ci skip],for stupid error in equal (backup_files = current_files = range(1)) 2014-05-14 18:47:58 +08:00
minggo abc08e703f Merge pull request #6728 from pandamicro/FixParticlesInit 
Fixed #5040: Remove memory allocation assertion to permit multiply init
 2014-05-14 18:39:13 +08:00
minggo d46362abb3 Merge pull request #6681 from minggo/director-fix 
[ci skip] don't trigger onExitTransitionDidStart
 2014-05-14 18:24:26 +08:00
andyque 967c071c68 issue #5183, refator LayoutExecutant 2014-05-14 18:24:23 +08:00
minggo 048d6c09d3 Merge pull request #6701 from heliclei/autotest-autorun 
support auto start cpp-tests
 2014-05-14 18:16:58 +08:00
cocoscodeide 772d22b6fc Merge pull request #9 from chuanweizhang2013/v3luaruntime 
V3luaruntime
 2014-05-14 18:06:19 +08:00
andyque 8c8f9611f7 issue #5183, add CCLayoutExecutant file 2014-05-14 18:03:44 +08:00
James Chen 8a92b6cc7f Merge pull request #6736 from CocosRobot/update_lua_bindings_1400061063 
[AUTO]: updating luabinding automatically
 2014-05-14 18:02:30 +08:00
cw b42eb08bad fixed error 2014-05-14 18:01:38 +08:00
byeonggee.seo 76cd9911cb bug fix 2014-05-14 18:58:55 +09:00
minggo fba3bf2d15 Merge pull request #6735 from Dhilan007/v3_labelfix 
label's small improvement.
 2014-05-14 17:58:46 +08:00
CocosRobot 6f6d233ea5 [AUTO]: updating luabinding automatically 2014-05-14 09:52:20 +00:00
minggo db0ea94b8a Merge pull request #6730 from andyque/refactor5110 
refactor ui framework
 2014-05-14 17:47:47 +08:00
minggo 9c6e612c1f Merge pull request #6729 from lmskater/add-external-lib-to-ci-release 
[Jenkins][ci skip] Add external lib to ci release build
 2014-05-14 17:41:19 +08:00
andyque 6cb3b47488 closed #5110, refactor 2014-05-14 17:07:24 +08:00
Dhilan007 059ea3dd8a label's small improvement. 2014-05-14 16:41:26 +08:00
James Chen bbc906e7db Merge pull request #6732 from samuele3hu/v3_fix 
fix compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value
 2014-05-14 16:35:03 +08:00
andyque 9d5c2ba773 closed #5110, add const specifier to getStringLength function 2014-05-14 16:25:30 +08:00
andyque 09fce798f0 closed #5110, add const reference to typedef 2014-05-14 16:14:28 +08:00
andyque 437b30487c issue #5110, refactor UITextBMFont 2014-05-14 16:02:31 +08:00
cocoscodeide 747f28c2e1 Merge pull request #8 from bofeng-song/v3 
fix build err
 2014-05-14 15:55:55 +08:00
bofeng-song d0d20e7272 fix build err 2014-05-14 15:52:58 +08:00
andyque 76cefcaa3f issue #5110, refactor UITextAtlas 2014-05-14 15:51:50 +08:00