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

1744 Commits

Author SHA1 Message Date
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