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

385 Commits

Author SHA1 Message Date
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
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
James Chen 037c57ef96 Merge branch 'develop' into perf-callback 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-04-25 12:07:48 +08:00
James Chen 477fc9f0e0 Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-04-25 10:59:11 +08:00
James Chen 7beb8b78fe Merge pull request #6325 from MSOpenTech/wp8-3.0-update 
Wp8 3.0 update：
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
 2014-04-25 10:41:58 +08:00
Huabing.Xu 7a38050e09 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
Huabing.Xu 68e058b12d IOS/Mac OK: remove kazMath 
Make code compatible with old tests
 2014-04-21 17:37:52 +08:00
andyque a6b81ec772 issue #3333, fix project unused link 2014-04-21 17:13:43 +08:00
Dale Stammen f71178bac5 added missing files 2014-04-19 10:11:18 -07:00
Dale Stammen 1a56f435fe added missing files 2014-04-19 09:32:12 -07:00
James Chen ec40dda7f3 Adds performance test for callbacks: 1) std::function, 
2) (target->*selector)(), 3) simulate new api of Scheduler
 2014-04-16 10:35:58 +08:00
Huabing.Xu c3bf78494a remove CCFrustum.cpp, we will use new instead 2014-04-14 14:18:32 +08:00
Huabing.Xu 1670e07300 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-04-11 11:18:13 +08:00
James Chen 0af6057996 issue #4729: [ios/mac] Updates cocos2d_libs.xcodeproj 2014-04-10 00:36:42 +08:00
James Chen 2fc6c0150c issue #4729: iOS/Mac works fine 2014-04-10 00:36:41 +08:00
Darragh Coy f147ef723a Merge the alternate RefPtr<T> implementation 
Merge in the version at: https://github.com/DarraghCoy/cocos2d-x/blob/add_refptr_class_alt_impl/cocos/base/CCRefPtr.h
This version sacrifices the ability to use forward references in some places in return for added type safety and ensures we can never assign a non cocos2d::Ref derived object to the pointer.
 2014-04-07 16:04:00 -07:00
Huabing.Xu f9405e0ea9 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-03 17:47:16 +08:00
Huabing.Xu 1a454590e7 changed project file 2014-04-02 15:06:42 +08:00
James Chen 48839b9d4d closed #4635: ControlSwitch's marksprite is shown at a wrong place 2014-04-02 11:26:39 +08:00
James Chen 8ae82e2eb5 Fixed copying resource fails in empty-lua-test. 2014-04-01 20:06:43 +08:00
samuele3hu 6c92c10a67 update android-build.py for copying files about lua 2014-04-01 18:09:49 +08:00
minggo 7fb5e1f13a Merge pull request #6066 from minggo/quadcommand-optimize 
use xxhash to generate material id
 2014-04-01 11:27:51 +08:00
minggo 504eea0269 use xxhash to generate material id 2014-03-31 13:47:07 +08:00
minggo 6cc51a2cfc Merge pull request #6057 from samuele3hu/develop_socket 
Add the omitted socket script for lua-tests
 2014-03-31 10:15:38 +08:00
samuele3hu 219a91a641 Add the omitted socket script for lua-tests 2014-03-29 14:58:23 +08:00
Dale Stammen 039e746745 updated project dependencies 2014-03-28 16:12:00 -07:00
Dale Stammen ffbaac5fa5 fixed project refs 2014-03-28 16:03:37 -07:00
Dale Stammen 7b25ffeb4e added wp8 build files 2014-03-28 11:33:09 -07:00
Darragh Coy 036dc5542c Add cocos2d::RefPtr<T> 
This class which acts a smart pointer type class for cocos2d::Ref objects. Can be used to help automate memory management and remove manual retain/release calls from code, resulting in less code and less chance of errors. Also useful to implement the RAII idiom in certain scenarios, ensuring that an object gets released upon exiting a scope.
 2014-03-26 15:30:15 -07:00
CaiWenzhi 243b7e5822 Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
CaiWenzhi 2dffcb9808 Add ProtectedNode and remove "addNode" 2014-03-25 14:28:58 +08:00
James Chen f6b94d8c3e Updates iOS/Mac project configuration, CCTweenFunc.h/.cpp was included to wrong target. 2014-03-24 10:23:21 +08:00
James Chen d5e8bde89e Merge pull request #5889 from samuele3hu/develop_socket 
close #4400: Use the latest version of LuaSocket and modify the related project config
 2014-03-21 10:52:38 +08:00
samuele3hu 4b25c9f62e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-03-20 17:07:33 +08:00
samuele3hu d3487d2d3c close #4400: Use the newest version of LuaSocket for lua 2014-03-20 17:04:54 +08:00
andyque 91d972ba87 rollback the scheme mode of projects 2014-03-20 17:01:21 +08:00
andyque dd790ce54d add id return value to LuaObjectCBridge 2014-03-20 16:59:18 +08:00
andyque 7ab639ec0f fix lots compile warnings 2014-03-20 16:24:55 +08:00
andyque 2dcc600fa1 remove unused accelerometer 2014-03-20 14:29:05 +08:00
andyque 7ae77c9335 fix cocos2dx engine internal warnings 2014-03-20 10:58:04 +08:00
andyque 23c3fabeb2 fix box2d ios & mac library warnings 2014-03-20 10:18:56 +08:00
andyque d7b3737605 fix cocos2d tests and lu-bdinings and cocos2d_libs project config warnings 2014-03-20 10:14:25 +08:00
boyu0 f23db68151 build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files. 2014-03-15 01:19:06 +08:00
boyu0 a54bfb223e fix typo, add release condition link arguments. 2014-03-14 14:33:33 +08:00
boyu0 fddffae611 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into support_for_xcode_iphone_64bit_simulator 2014-03-14 14:21:52 +08:00
boyu0 38a1b13415 extract arm64 architectures form .a file, add condition link arguments. 2014-03-14 14:18:13 +08:00
James Chen b893ca3378 Some fixes for android-build.py. 2014-03-14 12:52:43 +08:00
CaiWenzhi a4d558adee Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-13 10:25:32 +08:00
CaiWenzhi b8ce59962a Fixed bug of ScrollView 2014-03-13 10:11:41 +08:00