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

111 Commits

Author SHA1 Message Date
yangxiao ca0afcfa92 add Quaternion::ZERO 2014-07-31 18:36:30 +08:00
Huabing.Xu 4b059689d3 add CC_DLL for functions 2014-07-15 11:18:05 +08:00
Huabing.Xu 09a75f73cf add CC_DLL in math folder 2014-07-14 16:40:54 +08:00
Huabing.Xu 60dd7a4514 Merge branch 'v3' into v3_dll 2014-07-11 11:10:26 +08:00
Huabing.Xu f5cffba6c9 change pure virtual function to virtual function in action series 
remove unimplemented function to deprecated and give an empty implementation
add CC_DLL to Vec2
 2014-07-11 10:19:49 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
gin0606 3ae8e29ce5 Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
Ricardo Quesada 2ab70ca39b Point is no longer deprecated 
As discussed on the forums:

- Point must not be deprecated (not it must not be used internally)
- Point2, Point3, must not be used. Use Vec2, Vec3 instead
 2014-05-18 15:12:48 -07:00
Ricardo Quesada 0f67247325 Squashed commit of the following: 
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into files

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
 2014-05-16 14:36:00 -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
Ricardo Quesada 31dd70dba2 Matrix::identity() -> IDENTITY 
consistency with the rest of the  cocos2d API
 2014-05-13 10:26:25 -07:00
James Chen 86411837c6 PLEASE NEVER `using namespace cocos2d;` in header file 2014-05-13 16:15:21 +08:00
Huabing.Xu c581f74142 Merge branch 'v3' into v3.1_unify_ZERO_ONE 2014-05-05 18:10:13 -07:00
Huabing.Xu 32f9a8ffc6 comment out warning code in quaternion.cpp 
unify ZERO, ONE, UNIT_X/Y/Z/W into a consistent convention
 2014-05-05 18:07:58 -07:00
Ricardo Quesada 4483d653d5 math fixes 
- Moves deprecated Point to CCDeprecated.h
- Adds Point2 and Point3
- removes `math` from `cocos2d::math` namespace
 2014-05-05 17:10:41 -07:00
Ricardo Quesada 25213c81f6 linux cmake improvements 
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
 2014-05-01 13:01:51 -07:00
Ricardo Quesada 40fe815ab9 Squashed commit of the following: 
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 19:05:18 2014 -0700

    more linux fixes

commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 19:04:04 2014 -0700

    more linux fixes

commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 19:02:07 2014 -0700

    fixes linux isuses

commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:58:50 2014 -0700

    more linux fixes

commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:57:33 2014 -0700

    more linux fixes

commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:53:43 2014 -0700

    more linux fixes

commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:49:28 2014 -0700

    more linux fixes

commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:47:43 2014 -0700

    more linux fixes

commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:46:00 2014 -0700

    more linux fixes

commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:43:15 2014 -0700

    more linux fixes

commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:36:06 2014 -0700

    more fixes for linux

commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:35:29 2014 -0700

    more fixes for linux

commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:34:44 2014 -0700

    more fixes for linux

commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:33:45 2014 -0700

    fixes for linux

commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:16:48 2014 -0700

    compiles on Windows

commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:07:20 2014 -0700

    fix builder
 2014-04-30 19:09:13 -07:00
Ricardo Quesada b5f513ce16 Merge branch 'v3' into improved_directory_structure 2014-04-30 13:15:10 -07:00
Huabing.Xu 183dd1ec64 inverse and conjugate, negate for matrix 2014-05-01 01:59:36 +08:00
Huabing.Xu 8fe4c472fd inverse and conjugate for quaternion 2014-05-01 01:32:16 +08:00
Huabing.Xu 16105df503 getNormalize->getNormalized 2014-05-01 01:10:18 +08:00
Huabing.Xu 84515b521d refactor normalize in Quaternion 2014-04-30 20:06:49 +08:00
Huabing.Xu 441279c7ab refactor normalize in Vector4 2014-04-30 19:59:06 +08:00
Huabing.Xu 3ccb6dcbed refactor normalize in Vector3 2014-04-30 19:50:36 +08:00
Huabing.Xu ea4fee2c31 refactor normalize in Vector2 2014-04-30 18:07:05 +08:00
Ricardo Quesada 1954edc655 Adds Apache2 license to GamePlay3d files 2014-04-29 17:50:12 -07:00
Ricardo Quesada 8bb8416c26 Improved directory structure 2014-04-29 17:37:36 -07:00
Ricardo Quesada 9b118e5e96 Squashed commit of the following: 
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:10:06 2014 -0700

    Updates templates files

commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:08:19 2014 -0700

    compiles on Windows

commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:55:30 2014 -0700

    adds cocos2d.h

commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:54:24 2014 -0700

    re-adds missing files

commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:51:12 2014 -0700

    Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes

commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:49:12 2014 -0700

    Adds SimpleAudioEngine

commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:47:45 2014 -0700

    Compiles for Android

commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:13:35 2014 -0700

    Fixes the includes
 2014-04-26 10:11:22 -07:00
Huabing.Xu 613ba6e5b6 work on linux now 2014-04-25 15:10:37 +08:00
Huabing.Xu 68e058b12d IOS/Mac OK: remove kazMath 
Make code compatible with old tests
 2014-04-21 17:37:52 +08:00
Huabing.Xu d14d3007d0 remove kazmath include file 2014-04-16 14:08:58 +08:00
Huabing.Xu 6fd7197d96 remove warning message---continue 2014-04-16 11:18:23 +08:00
Huabing.Xu a32bb8cd23 remove warning message---continue 2014-04-16 10:58:34 +08:00
Huabing.Xu b01941b6ac remove warning message---continue 2014-04-16 10:42:39 +08:00
Huabing.Xu 2bb32a8e4b remove warning message 2014-04-16 10:27:17 +08:00
Huabing.Xu 95cb7721f6 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCSprite.cpp
	tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
 2014-04-15 22:21:04 +08:00
Huabing.Xu 63b52dd287 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
Huabing.Xu 3f496069b4 add interface in Vector2 for Point 2014-04-15 11:58:08 +08:00
Ricardo Quesada 584ccf65e4 Culling working again 2014-04-14 16:46:19 -07:00
Huabing.Xu c081fc61aa comment kmMat4 & Matrix conversion code 2014-04-14 17:49:45 +08:00
Huabing.Xu 4e0be639a2 remove typo 2014-04-10 17:09:48 +08:00
Huabing.Xu 7441c06680 change matrix projection compatible with kazmath logic 2014-04-10 17:02:36 +08:00
Huabing.Xu 184f10ae0f add conversion from kmMat4 to Matrix 2014-04-04 17:58:37 +08:00
Huabing.Xu 4e93943347 minor change 2014-04-02 14:41:05 +08:00
Huabing.Xu 4a78008d77 namespace rename 2014-04-02 12:09:51 +08:00
Huabing.Xu 8561569885 iOS can compile now 2014-04-02 11:21:48 +08:00
Huabing.Xu efc3ddfe57 remove base dependence, add ccMacros.h 2014-04-02 11:06:37 +08:00
Huabing.Xu 0e2969f495 init version of math 2014-04-02 10:33:07 +08:00
Ricardo Quesada 0d69617a6c Adds CC_DLL to kazmath for windows compatibility 2014-03-04 18:07:03 -08:00
Ricardo Quesada f269ec1f8f Compiles on Linux 2014-03-04 17:24:04 -08:00
Ricardo Quesada c63f210e26 Compiles on Android 2014-03-04 16:59:39 -08:00
Ricardo Quesada 4fe3b16287 Updates to latest version of kazmath 2014-03-04 16:33:00 -08:00
Ricardo Quesada 8ca746af17 Implements AABB culling for sprites 2014-02-22 17:47:56 -08:00
James Chen 2a3481f20c Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
James Chen c965131a08 Uses relative path for kazmath/CMakeLists.txt and physics/CMakeLists.txt. 2014-01-06 19:33:28 -08:00
Ricardo Quesada 8fb5fad20d Merge branch 'develop' into arm64 2013-11-04 15:02:35 -08:00
Ricardo Quesada 0350ac7021 arm64 support 2013-11-04 11:53:40 -08:00
James Chen 9be8ca3714 [cmake] output lib to root/lib 2013-11-04 21:03:08 +08:00
James Chen 8676523433 Adding CMakeLists.txt 2013-11-04 21:03:07 +08:00
minggo 95acb1b9e3 issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00