Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/base
History
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
..
CCAutoreleasePool.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCAutoreleasePool.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCConfiguration.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCConfiguration.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCConsole.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCConsole.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCData.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCData.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDataVisitor.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDataVisitor.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDirector.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCDirector.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCEvent.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEvent.h issue #4861, add CCEventFocus and CCEventListener 2014-05-05 11:37:38 +08:00
CCEventAcceleration.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventAcceleration.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventCustom.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventCustom.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventDispatcher.cpp issue #4861. add android keypad support 2014-05-05 11:37:38 +08:00
CCEventDispatcher.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventFocus.cpp issue #3861. add license to CCEventFocus and CCEventListenerFocus 2014-05-05 17:49:31 +08:00
CCEventFocus.h issue #3861. add license to CCEventFocus and CCEventListenerFocus 2014-05-05 17:49:31 +08:00
CCEventKeyboard.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventKeyboard.h issue #4861. add android keypad support 2014-05-05 11:37:38 +08:00
CCEventListener.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListener.h issue #4861, add CCEventFocus and CCEventListener 2014-05-05 11:37:38 +08:00
CCEventListenerAcceleration.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerAcceleration.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerCustom.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerCustom.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerFocus.cpp issue #3861. add license to CCEventFocus and CCEventListenerFocus 2014-05-05 17:49:31 +08:00
CCEventListenerFocus.h closed #3861, fixed some typo and indent problem 2014-05-06 12:04:52 +08:00
CCEventListenerKeyboard.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerKeyboard.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerMouse.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerMouse.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerTouch.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerTouch.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventMouse.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventMouse.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventTouch.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventTouch.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventType.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCMap.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCNS.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCNS.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCPlatformConfig.h added CC_PLATFORM_WINRT and WP8 2014-03-22 06:11:27 -07:00
CCPlatformMacros.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCProfiling.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCProfiling.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCRef.cpp trackRef and untrackRef are static function now. 2014-05-14 11:55:20 +08:00
CCRef.h Fixes wrong indention and whitespace cleanup 2014-05-14 10:25:45 +08:00
CCRefPtr.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCScheduler.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCScheduler.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCTouch.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTouch.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCValue.cpp Adds ValueVectorNull, ValueMapNull, ValueMapIntKeyNull global variables. 2014-05-13 17:03:48 +08:00
CCValue.h Adds ValueVectorNull, ValueMapNull, ValueMapIntKeyNull global variables. 2014-05-13 17:03:48 +08:00
CCVector.h Improved directory structure 2014-04-29 17:37:36 -07:00
CMakeLists.txt issue #3861, fix linux compile error 2014-05-06 09:40:50 +08:00
ZipUtils.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
ZipUtils.h Improved directory structure 2014-04-29 17:37:36 -07:00
atitc.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
atitc.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
base64.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
base64.h Improved directory structure 2014-04-29 17:37:36 -07:00
ccConfig.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
ccMacros.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
ccTypes.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
ccTypes.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
etc1.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
etc1.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
s3tc.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
s3tc.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00