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

40 Commits

Author SHA1 Message Date
一线灵|Deal 5645bb241e
Final migrate (#876) 2022-10-01 16:24:52 +08:00
一线灵 13fc72c02c
Migrate axys (#782) 2022-08-08 18:02:17 +08:00
一线灵 279337f17f
Migrate engine namespace to `axis`(abbv: `ax`) (#743) 2022-07-11 17:50:21 +08:00
halx99 9ee4181976 Migrate tests, extensions and configs ReSquash for unexpected changes +2 2022-07-09 22:23:34 +08:00
halx99 5b2eb79456 Update project urls 2022-02-24 18:45:25 +08:00
halx99 ce5adf35f7 Committing clang-format changes 2021-12-28 08:06:23 +00:00
rh101 e5bbea3cca Test code updated with long to int32_t changes 2021-09-02 15:48:05 +10:00
leeda 18a6d8241d update Copyright. might need manual fix later (#18659) 
* Copyright use python script updated. might be fix by manual later

* Revert "Copyright use python script updated. might be fix by manual later"

This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.

* re modify copyright, consider utf-8-sig encoding

* another situation, add Copyright before  "Permission is hereby granted"

* Revert "another situation, add Copyright before  "Permission is hereby granted""

This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.

* another situation, add Copyright before Permission is hereby granted

* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."

* script modify copyright, consider is cocos copyright or not

* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."

* manual fix, not fix audio related

* change "2016-2016" to "2016"
 2018-01-29 16:25:32 +08:00
minggo 84ccbde845 Sequence issue (#18009) 
* fix SequenceWithFinalInstant test issue

* fix the issue that sequence will not finish for ever
 2017-07-03 09:15:53 +08:00
minggo 4ad1901a92 fix comiling issue 2017-04-05 14:57:04 +08:00
minggo b5a1360a17 revert #17437 (#17545) 
* revert #17437

* fix resource path
 2017-03-20 09:28:12 +08:00
j-jorge 6cd7314497 cocos2d::Sequence::isDone() checks that the last action is actually done. (#17437) 2017-03-07 09:36:09 +08:00
CocosRobot d07794052f Update license to 2017 (#17362) 
* Typo: CopyRight -> Copyright

* Copyright update: chukong-inc.com -> Chukong Technologies Inc.

* [js files] Copyright update: 2014 -> 2014-2017

* [cpp files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2015 -> 2015-2017

* [js files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2016 -> 2016-2017

* Copyright update: 2013 -> 2013-2017

* Copyright update: 201?-201? -> 201?-2017

* License year fixes.

* Liscene year fix in CCRay.cpp

* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
 2017-02-14 14:36:57 +08:00
Aleksey Zolotov 0de81de721 fix #14936 (#17190) 
* fix #14936

* #14936 testcases
 2017-01-17 09:48:30 +08:00
charlesstlaurent b1a64ae730 new actions ResizeBy and ResizeTo (#16275) 
* new actions ResizeBy and ResizeTo

* FDP-5580-ResizeBy and ResizeTo fix and Test cpp : added a scale exemple in the test cpp to compare with our new resize + fix

* FDP-5580: actions ResizeBy and ResizeTo : changed some functions visibility
 2016-08-16 16:55:31 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
AlwynC 4c7e4671d9 Modified the layer follow action class to include a horizontal (x) and vertical (y) offset. (#15194) 2016-04-20 17:25:31 +08:00
Ricardo Quesada 3646d1e9fc Adds init(array) for Sequence and Spawn 
it also makes the code cleaner.
this is needed for JS
 2015-12-03 12:16:21 -08:00
WenhaiLin 1494f09f06 Remove unneeded include files and fixed warns. 2015-06-25 23:15:39 +08:00
samuele3hu ea75e222ba issue #10302: Remove duplicated test cases 2015-05-26 17:20:46 +08:00
Milos Jakovljevic 0343fd4061 Changing the name of the Action, adding more comments 2015-04-28 11:48:19 +02:00
Milos Jakovljevic a13c519882 Adding FloatAction to animate any property over time. 2015-04-18 14:35:14 +02:00
WenhaiLin a378651320 Fixed some test cases of action not respond click event as expected. 2015-04-09 14:20:59 +08:00
Ricardo Quesada 51374eb822 tests compiles on xcode 6.3 
no more USING_NS in the header files.
it creates conflict with xcode 6.3
 2015-04-08 17:37:30 -07:00
WenhaiLin 0d51c13743 Make all test cases work fine with new test framework. 2015-04-03 14:31:03 +08:00
Martin Konopka 2c80b6ae3a Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-15 00:10:08 +01:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
minggo 1268f73a7c MoveTo and MoveBy support Vec3 2014-12-22 14:34:35 +08:00
Ricardo Quesada 342d934a0e scheduler and macro fixes 
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)

Updates all smaples
 2014-10-03 09:38:36 -07:00
huangshiwu fb1d47900c Deprecate DrawPrimitives and enhance DrawNode 2014-09-11 15:39:56 +08:00
minggo db17084b6d fix warnings 2014-08-15 12:06:16 +08:00
Ricardo Quesada 1b8d0d88df Adds setNormalizedPosition() 
Changes in `visit()` were done in order to do it
in a robust and fast way.
 2014-05-30 16:42:05 -07:00
Ishiguro Yusuke b8f9b1f20b Add test case for reproducing Repeat bug 2014-05-27 15:40:38 +09: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
James Chen 0dd22af688 closed #5160: Updates ActionTest 2014-05-13 17:08:52 +08:00
Huabing.Xu 7f61639541 replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
Huabing.Xu d865341694 remove kmMat4 interface in cpp-tests 2014-04-10 10:16:16 +08:00
Huabing.Xu 3837c23ebe draw() using Matrix instead of kmMat4 2014-04-08 22:07:35 +08:00
zhangbin 0e0000e6d5 The projection reset to DEFAULT when a test case onExit(). 2014-04-02 17:12:09 +08:00
James Chen b88de91a15 Renames 'samples' folder to 'tests', ouch.... 2014-03-11 19:10:34 +08:00