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

3537 Commits

Author SHA1 Message Date
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
CocosRobot 5db3fa8df0 [AUTO]: updating luabinding automatically 2014-05-05 23:58:54 +00:00
Ricardo Quesada e413b86295 Revert `new Sprite` change done a few days ago 
Use `std::nothrow` for new in Sprite (should be done in all `new` code)
 2014-05-05 16:53:37 -07:00
Ricardo Quesada 0e6dd9afe5 Particles can be created without texture 
Needed for complex particles like in EarthWarrior3D
 2014-05-05 15:50:08 -07:00
Dale Stammen 9a05e86ab6 updated missing files 2014-05-05 13:26:28 -07:00
Dale Stammen 78204c7c91 removed obsolete headers 2014-05-05 13:25:57 -07:00
andyque 0d9d2a57dc issue #3861. fix a indent problem 2014-05-05 17:54:21 +08:00
andyque 34b3114e55 issue #3861. add license to CCEventFocus and CCEventListenerFocus 2014-05-05 17:49:31 +08:00
andyque 2d0de93baf issue #4861, fixed a widget bug and add VBox test 2014-05-05 11:37:40 +08:00
andyque afb65bbebd issue #4861, fix widget query method 2014-05-05 11:37:39 +08:00
andyque 503be87675 issue #4861. refactor UILayout to search widget by index 2014-05-05 11:37:39 +08:00
andyque a7fbd590dc issue #4861. add a horizontal focus test 2014-05-05 11:37:39 +08:00
andyque 9383900123 issue #4861. cleanup some code of UILayout and UIWidget 2014-05-05 11:37:39 +08:00
andyque 33f7a500f3 issue #4861. add android keypad support 2014-05-05 11:37:38 +08:00
andyque 47acbc24e0 issue #4861, add CCEventFocus and CCEventListener 2014-05-05 11:37:38 +08:00
andyque b35ddfe5b5 issue #4861, add focus functionality into Widget class 2014-05-05 11:37:38 +08:00
andyque 1dee81a166 issue #4861, refactor setFocused into setHilighted 2014-05-05 11:37:38 +08:00
James Chen 8cbcf17163 issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
James Chen 3b3c1c4dbb issue #4674: Removed large files and updated .gitignore 2014-05-04 14:36:16 +08:00
CocosRobot cdd04ee11f [AUTO]: updating luabinding automatically 2014-05-02 01:12:32 +00:00
Ricardo Quesada b67f3008a5 Lua compiles again 2014-05-01 18:07:25 -07:00
CocosRobot d75a7c51a3 [AUTO]: updating luabinding automatically 2014-05-02 00:37:21 +00:00
Ricardo Quesada 207e67318d rolling back tests 2014-05-01 16:55:28 -07:00
Ricardo Quesada 462338879e rolling back physics in layer 2014-05-01 16:42:35 -07:00
Ricardo Quesada 32f3fedb37 Moves cocos/2d/Android.mk to cocos/Android.mk 
Easier to find Android.mk
 2014-05-01 14:09:26 -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 1cfd133555 fixes tmx maps 2014-05-01 11:51:11 -07:00
CocosRobot 7cb5f4c418 [AUTO]: updating luabinding automatically 2014-05-01 02:25:38 +00:00
Ricardo Quesada 9bd6ace582 compiles on iOS 2014-04-30 19:21:10 -07:00
Ricardo Quesada b8eba4e1c1 oops 2014-04-30 19:13:58 -07:00
Ricardo Quesada 7b2e558bb0 Merge pull request #6531 from ricardoquesada/fix_builder_squash 
Fixes linux build
 2014-04-30 19:10:12 -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
James Chen 35505aa63f Merge pull request #6528 from CocosRobot/update_lua_bindings_1398905829 
[AUTO]: updating luabinding automatically
 2014-05-01 09:33:33 +08:00
CocosRobot 94e01a2e81 [AUTO]: updating luabinding automatically 2014-05-01 00:58:35 +00:00
Ricardo Quesada 598bb91133 you should be 10 2014-04-30 17:56:14 -07:00
Ricardo Quesada 53b293e85f Merge branch 'v3' into improved_directory_structure 2014-04-30 17:52:52 -07:00
Ricardo Quesada 98f26b4987 Compiles on Windows 2014-04-30 17:44:41 -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 c722b74e36 Merge branch 'v3' into v3_refactor_normalize 2014-04-30 20:08:37 +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 7bc9b96d1a remove some cumbersome struct keyword 2014-04-30 18:37:30 +08:00
Huabing.Xu ea4fee2c31 refactor normalize in Vector2 2014-04-30 18:07:05 +08:00
minggo 2cbbaed5b3 Merge pull request #6512 from dabingnn/v3_renderTextureBug 
V3 render texture bug
 2014-04-30 17:52:14 +08:00
minggo 0dff539a18 Merge pull request #6521 from boyu0/particle_yCoordFlipped_bug 
Fix ParticleSystem yCoordFlipped bug.
 2014-04-30 17:03:01 +08:00
boyu0 489adaf315 fix indent 2014-04-30 16:33:35 +08:00
boyu0 c1d60f4b33 Fix ParticleSystem yCoordFlipped bug. 2014-04-30 16:18:39 +08:00
boyu0 0699aa94fe Change Value::asBool() return false by default. 2014-04-30 15:07:26 +08:00
yangxiao 11dc9367ff wrong rotation 2014-04-29 18:19:30 -07:00
yangxiao 3237d7b23d Revert "wrong rotation" 
This reverts commit 3c9560017e.
 2014-04-29 18:14:41 -07: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
yangxiao 3c9560017e wrong rotation 2014-04-29 17:27:32 -07:00
samuele3hu 58a9e40b82 Modify some functions return value from `bool` to `int` 2014-04-29 17:17:18 +08:00
samuele3hu 4eaec951b6 use `new` and `CC_SAFE_DELETE_ARRAY` to replace `malloc` and `free` 2014-04-29 16:04:08 +08:00
Huabing.Xu 331c2d3872 readd wp8 code which is removed by accident 2014-04-29 16:03:50 +08:00
Huabing.Xu faa0f67644 using pointer instead of Director::getInstance() in RenderTexture 2014-04-29 15:13:24 +08:00
Huabing.Xu bd93a5cb76 fix bug for renderTexture created which is bigger than screen size 2014-04-29 15:08:44 +08:00
samuele3hu ae488e5afa Replace `vec2s` with `points` 2014-04-29 14:39:19 +08:00
samuele3hu 84c1f9281e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error 2014-04-28 16:28:44 +08:00
samuele3hu d729a161a4 Add some deprecated functions and replace the Point related to Vector2 2014-04-28 16:28:15 +08:00
CocosRobot 78a7c98b26 [AUTO]: updating luabinding automatically 2014-04-28 07:01:59 +00:00
James Chen e96883ec43 Merge pull request #6394 from samuele3hu/dev_compile_error 
Fix compile error for Lua
 2014-04-28 14:57:48 +08:00
James Chen 35207fd8ba Merge pull request #6399 from dumganhar/v3 
fullPathForFilename optimization: Checking whether the path is an empty string.
 2014-04-28 14:56:01 +08:00
James Chen 4f41b9d3ac fullPathForFilename optimization: Checking whether the path is an empty string. 2014-04-28 14:53:30 +08:00
samuele3hu c3f40bdc24 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error 2014-04-28 14:05:08 +08:00
samuele3hu d3670644bf Fix compile error for Lua 2014-04-28 14:04:37 +08:00
James Chen 8538b27385 Merge pull request #6391 from dabingnn/v3_optimize 
V3 optimize
 2014-04-28 13:39:15 +08:00
Huabing.Xu e6f7854225 clean for kazmath in project file 2014-04-28 13:14:22 +08:00
James Chen 6e0ee08d84 Merge pull request #6390 from Dhilan007/v3 
fixed compile fail on wp8
 2014-04-28 11:59:06 +08:00
Dhilan007 b4a9381238 fixed return type is not right 2014-04-28 11:55:45 +08:00
Dhilan007 35f83fc40a fixed compile fail 2014-04-28 11:42:54 +08:00
James Chen aa04176d83 Merge pull request #6386 from pipu/fixed_bug_ui_layout_clip 
fixed the clipping of ui layout read from CocoStudio could not work
 2014-04-28 11:08:40 +08:00
pipu c492f4d3c3 fixed ui layout clip 2014-04-28 10:06:11 +08:00
James Chen cbcf2e2bc8 Merge pull request #6384 from dabingnn/v3_optimize 
change tab to space for CCDirector.cpp
 2014-04-28 09:54:43 +08:00
Huabing.Xu 64d7a6bd37 change tab to space 2014-04-28 09:51:10 +08:00
Ricardo Quesada d0ebc14076 compiles on linux 2014-04-26 10:41:57 -07:00
Ricardo Quesada 81c2d92355 yeah... love in includes 
<3
 2014-04-26 10:35:57 -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
Ricardo Quesada b053a9145a Compiles on Windows32 2014-04-25 22:03:25 -07:00
Ricardo Quesada c7a606fc78 Adds auto-culling for labels! 
yeah!
 2014-04-25 19:00:22 -07:00
Ricardo Quesada 22fb1a774a version is v3.1-alpha0 2014-04-25 18:03:35 -07:00
Ricardo Quesada b801995bbe Merge branch 'v3' into develop_migrate_math_lib 2014-04-25 17:56:52 -07:00
James Chen c1f220447a Merge pull request #6373 from xhcnb/deprecated_callback 
use new ccHttpRequestCallback.
 2014-04-25 17:34:11 +08:00
Jason Xu 42c374157d CC_CALLBACK_2 not std::bind directly 2014-04-25 17:32:21 +08:00
James Chen d868196aae Merge pull request #6372 from twhittock/mac-application-retcodes 
Returns correct value for Application::run on Mac platform
 2014-04-25 17:19:51 +08:00
Jason Xu 5cc483276b use new ccHttpRequestCallback. 2014-04-25 17:15:57 +08:00
Tom Whittock ec42b7c76a Use correct return codes from mac CCApplication 2014-04-25 10:01:10 +01:00
Huabing.Xu 85e97f246d Merge branch 'develop_migrate_math_lib_merge' into develop_migrate_math_lib 2014-04-25 16:37:31 +08:00
Huabing.Xu dbf241c38d fix compile error after merge 2014-04-25 16:30:51 +08:00
Huabing.Xu feec24e3ef Merge branch 'v3' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCNode.cpp
	cocos/2d/CCRenderTexture.cpp
	cocos/2d/platform/wp8/CCGLView.h
	cocos/physics/CCPhysicsBody.cpp
	extensions/physics-nodes/CCPhysicsSprite.cpp
	extensions/physics-nodes/CCPhysicsSprite.h
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
 2014-04-25 16:20:24 +08:00
Huabing.Xu 613ba6e5b6 work on linux now 2014-04-25 15:10:37 +08:00
James Chen 828401a23d Merge pull request #6302 from zifter/FixParticle 
closed #4880: Particle systems loading incorrectly in CocosBuilder
 2014-04-25 14:15:44 +08:00
James Chen 8ffd663eb6 Merge pull request #6154 from newnon/develop_jni_improvements 
[android] Adds onActivityResult listeners
 2014-04-25 13:51:36 +08:00
James Chen 1b82cd7f08 Merge pull request #6093 from dplusic/develop 
fixed cc.pGetAngle not using absolute value
 2014-04-25 13:41:41 +08:00
CocosRobot e9b51a2a42 [AUTO]: updating luabinding automatically 2014-04-25 04:00:21 +00:00