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

1804 Commits

Author SHA1 Message Date
andyque 942ceccd99 fix android and win32 compile error 2015-03-04 14:12:11 +08:00
yangxiao b938872621 lua binding 2015-03-04 12:58:51 +08:00
andyque 92fb735611 fix jenkins compile erorr 2015-03-04 12:09:12 +08:00
andyque 2e2fb122e6 fix v3 win32 build issue 2015-03-03 18:35:43 +08:00
andyque 23e49fe2b7 modify building slaves name lists in each slave 2015-03-03 16:42:48 +08:00
andyque 7b183a13ad sync jenkins script with v4-develop 2015-03-03 16:36:42 +08:00
andyque 992cc52a02 fix new windows jenkins slave compile error 2015-03-02 19:43:27 +08:00
yinjimmy 2042633294 update runtime to 2.0 2015-02-27 14:49:04 +08:00
zhangbin 6ada496b57 Update the reference of submodule cocos2d-console. 2015-02-25 18:03:05 +08:00
SunLightJuly 2b269aab53 update sub-module "cocos2d-console" 2015-02-25 10:45:36 +08:00
minggo c8eaa4aeba Merge pull request #10447 from super626/particle_merge 
add 3d particle (Particle Universe)
 2015-02-15 19:48:18 +08:00
samuele3hu 3a7cbe9d67 Add Particle3DTest for Lua and update related configure files 2015-02-15 15:56:20 +08:00
yangxiao 9153dd5cc3 add particle to lua binding 2015-02-13 18:27:32 +08:00
minggo f77cafb7ce Merge pull request #10267 from kompjoefriek/indent-consistency 
fixed indentation of Python files
 2015-02-13 15:36:20 +08:00
SunLightJuly aaf6ad03c8 called initGLContextAttrs() before create glview 2015-02-13 13:45:15 +08:00
kompjoefriek c6ab07ea02 fixed indentation of Python files 
- Changed tabs to spaces
- Changed 2 spaces to 4 spaces
 2015-02-12 21:22:19 +01:00
minggo e017511c65 disable travis notification 2015-02-12 18:39:42 +08:00
minggo 49489ba3ad update console 2015-01-30 20:06:43 +08:00
minggo f4266c9ae3 update console submodule 2015-01-30 14:58:20 +08:00
samuele3hu 80c2e0c153 Add AsyncLoadSprite3D test case and update the related lua binding 2015-01-28 21:47:52 +08:00
samuele3hu 6208e9cba5 Add more test cases about 3D 2015-01-28 09:40:20 +08:00
samuele3hu d74fb0e8b5 Update LayoutComponent Test case of UIEditTest 2015-01-22 10:21:38 +08:00
samuele3hu 3dd590cf9d Update bindings-generator submodule 2015-01-21 17:18:54 +08:00
minggo 08d392dd5f Merge pull request #10132 from samuele3hu/v3_4_issue9537 
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
 2015-01-21 13:39:29 +08:00
samuele3hu 205ead5b63 Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h 2015-01-21 11:48:34 +08:00
minggo abc6511ceb Merge pull request #10125 from samuele3hu/v3_4_issue9537 
issue #10107: Binding AnimationInfo to lua
 2015-01-21 11:02:11 +08:00
samuele3hu a3fbe04c10 issue #10107: Update the bindings-generator submodule 2015-01-21 10:07:21 +08:00
samuele3hu 666af29681 issue #10107: Binding AnimationInfo to lua 2015-01-21 10:06:48 +08:00
yusheng.lu 7fde1d0e0d When reading csd/csb and the simulator's resolution is changed, change the root node's size to fit the simulator windows size. It will make sure the layout component feature works. 2015-01-19 18:10:30 +08:00
dualface bc75849ac7 update template/runtime version 2015-01-16 23:22:03 +08:00
dualface 63fba4f86f fix compile win32 2015-01-16 23:19:00 +08:00
zhangbin b1f9fb4b8e Rename the Xcode target of libsimulator. 2015-01-16 14:29:48 +08:00
yinjimmy ccdf723d20 Optimize OutDir and IntDir for libsimulator 2015-01-15 14:39:56 +08:00
yinjimmy f652e1359a 1. Compatible vs2012 for libsimulator 
2. Adjust output directory for simulator
 2015-01-15 11:10:32 +08:00
minggo 825f90564c Merge pull request #9992 from samuele3hu/v3_4_issue9986 
issue #9986:Add lua bindings for Component and related test cases
 2015-01-14 17:05:51 +08:00
samuele3hu 77912270f9 issue #9986:Add lua bindings for Component and related test cases 2015-01-14 16:58:35 +08:00
yinjimmy f2ab171fab Merge branch 'v3' into combine 2015-01-14 16:38:06 +08:00
samuele3hu 951324a230 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_issue9820 
Conflicts:
	cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp
 2015-01-14 13:58:12 +08:00
samuele3hu 1d5350e648 Update bindings-generator submodule 2015-01-14 13:51:33 +08:00
samuele3hu 1d94ae4302 issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes 2015-01-14 13:51:09 +08:00
yinjimmy 532be9fb20 Fix compile error on windows 2015-01-13 19:22:11 +08:00
yinjimmy dc019defc1 Merge branch 'v3' into combine 2015-01-13 18:32:32 +08:00
zhangbin 9766e9f748 Update the reference of submodule cocos2d-console. 2015-01-13 11:16:54 +08:00
yinjimmy cf331c3abd update lua-template-default 2015-01-12 23:42:37 +08:00
yinjimmy 43c4f563d8 enable debug for iOS / Android platform 2015-01-12 22:59:46 +08:00
yinjimmy e700d47dbd Fix compile error on Windows 2015-01-12 20:55:36 +08:00
yinjimmy 0978a88b7f Merge branch 'v3' into combine 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
	templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
	templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
	tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
 2015-01-12 17:54:58 +08:00
yinjimmy 53cc07a2f6 Add setEventTrackingEnable for event tracking 2015-01-12 15:18:30 +08:00
yinjimmy dea3cf9863 move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
zhangbin 489dc2da16 Update the reference of submodule cocos2d-console. 2015-01-12 10:27:14 +08:00
yinjimmy e309dd69b1 add missing files 2015-01-09 11:33:24 +08:00
yinjimmy d2a3a6a8c0 merge lua-template-default with lua-template-runtime 2015-01-09 04:08:41 +08:00
yinjimmy 650b398419 move files 2015-01-08 21:12:44 +08:00
yinjimmy 82f37fcf72 add libsimulator 2015-01-08 14:10:28 +08:00
yinjimmy dee536def2 support win32 2015-01-08 13:36:59 +08:00
yinjimmy 197ab05a99 cleanup 2015-01-08 08:56:31 +08:00
yinjimmy f1f4e5f3c2 support android 2015-01-07 22:19:46 +08:00
yinjimmy 4fee8a5926 support iOS 2015-01-07 22:18:27 +08:00
yinjimmy 9122e15f2c move simulator 2015-01-07 17:50:15 +08:00
zhangbin d80830c264 Update the reference of submodule cocos2d-console. 2015-01-07 17:48:10 +08:00
minggo fbf565fd59 Merge pull request #9798 from samuele3hu/v3_4_packagesize 
issue #9796: Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit
 2015-01-07 11:14:22 +08:00
zhangbin 1837b083f7 Update the reference of submodule cocos2d-console. 2015-01-06 18:13:48 +08:00
samuele3hu 58d946b578 issue #9796: Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit 2015-01-05 17:10:25 +08:00
zhangbin 6adedee781 Update the reference of submodule cocos2d-console. 2014-12-31 14:55:14 +08:00
zhangbin 98e24b1cdc Update the reference of submodule cocos2d-console. 2014-12-30 16:28:23 +08:00
minggo 3c1978fcc3 Merge pull request #9611 from super626/quaternion 
Rotation With Quaternion
 2014-12-30 10:09:08 +08:00
yangxiao de7b70f63e skip Node::set/getRotationQuat 2014-12-25 14:55:43 +08:00
minggo 6487cebead [ci skip]Don't notify because we don't use travis now. 2014-12-25 14:28:27 +08:00
youyou f678d1027c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-12-25 12:09:31 +08:00
andyque 78e3f92d5c add generate_docs.sh to tools 2014-12-24 16:40:14 +08:00
kaile.yin 9ef5d8213e update submodule 2014-12-22 14:07:00 +08:00
zhangbin f7a6472748 Update the reference of submodule cocos2d-console. 2014-12-16 17:19:06 +08:00
kaile.yin cb509aa69f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-09 13:33:39 +08:00
zhangbin 72f88a9790 Update the reference of submodule cocos2d-console. 2014-12-08 16:43:44 +08:00
kaile.yin 17bd5bf31e update submodule 2014-12-05 20:27:10 +08:00
kaile.yin 1db2bf89e0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-05 14:42:25 +08:00
minggo c217040f61 Merge pull request #9326 from samuele3hu/v3_fi_bindings 
Add support to clang3.4 because of using the ndk-r10c and update bindings-generator submodule
 2014-12-04 15:14:02 +08:00
zhangbin 79a7ca6516 Update the reference of submodule cocos2d-console. 2014-12-03 16:40:42 +08:00
kaile.yin 9d49f82eb9 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 
Conflicts:
	tools/tolua/cocos2dx.ini
 2014-12-03 16:00:32 +08:00
zhangbin 16df08679c Update the reference of submodule cocos2d-console. 2014-12-03 11:54:59 +08:00
samuele3hu ef16a460e6 Update bindings-generator submodule 2014-12-01 11:16:40 +08:00
samuele3hu 9900ccba4d Add support to clang3.4 because of using the ndk-r10c 2014-12-01 11:15:56 +08:00
Dhilan007 6603d7183a Update the reference of submodule cocos2d-console 2014-11-28 13:41:52 +08:00
Ricardo Quesada 2362ea372c new console version 2014-11-27 11:34:43 -08:00
Ricardo Quesada ab8838f0c0 New cocos2d-console version 2014-11-27 10:48:19 -08:00
zhangbin fade3dc61f Update the reference of submodule cocos2d-console. 2014-11-27 20:37:18 +08:00
samuele3hu 6cf092b855 Add cocos2dx_csloader.ini to generate the related lua bindings 2014-11-27 10:22:39 +08:00
samuele3hu 222f2cbd51 Decrease the package size of lua_empty_test 2014-11-26 21:54:18 +08:00
samuele3hu aa4277ed72 Update the bindings-generator submodule 2014-11-26 18:20:22 +08:00
youyou 07457a34b5 update lua ini files 2014-11-26 15:56:51 +08:00
andyque b70ddc7a14 add exception guard to db operation 2014-11-26 09:52:27 +08:00
samuele3hu a62fa8de58 Skip binding nodeWithFlatBuffers of CSLoader for lua 2014-11-24 23:36:44 +08:00
Ricardo Quesada 59461439ad Updates console 2014-11-20 17:55:59 -08:00
James Chen d6ee9525bd Merge pull request #9139 from nilium/v3-plugin-libjars-unignore 
Unignore libs dir and fix Travis script to descend into included directories. (follows #9108)
 2014-11-21 09:35:01 +08:00
Ricardo Quesada 04510c39fa Uses new version of cocos2d-console 2014-11-19 12:25:50 -08:00
zhangbin 5aff5640b5 Solve the error when building android for sample projects of engine. 
1. Update the project config.
2. Update the submodule cocos2d-console.
 2014-11-18 18:39:53 +08:00
Noel Cower 41027463c9 Descend into included directories to check for file inclusion. 
Only applies to directories that are marked as unignored, since the
travis script has the odd problem of not descending into those
directories and, as a result, not recording the files in them.

I'm assuming the failure to descend into included directories is
unintended.
 2014-11-17 08:45:30 -08:00
Noel Cower 590975d08d Also un-ignore libs dir under plugins. 
The configure script isn't smart enough to check if there are
un-ignored files in a directory, so this fixes that.
 2014-11-17 08:26:23 -08:00
zhangbin 365e09e5db Merge branch 'v3' into support-wp8 2014-11-17 16:01:12 +08:00
zhangbin 534570075b Update the reference of submodule cocos2d-console. 2014-11-17 15:57:49 +08:00