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

116 Commits

Author SHA1 Message Date
minggo bf2250a67a Merge pull request #6738 from cocoscodeide/v3 
update template project lua
 2014-05-16 18:10:10 +08:00
cw aa2aa4bcdf fixed repo 2014-05-16 17:08:33 +08:00
Jason Xu 67a558c83d for 93562d6aa6 
update Cocos2dxHelper and AndroidManifest.xml template.
 2014-05-16 15:55:00 +08:00
cw ceeba9a081 mofiy size 2014-05-16 12:02:59 +08:00
cw 48e437801f add prebuiltruntime 2014-05-16 11:57:03 +08:00
cocoscodeide bad30e4b66 Merge pull request #12 from bofeng-song/v3 
add support for reverse orientation for android
 2014-05-15 18:07:14 +08:00
bofeng-song c0297c6e5f add support for reverse orientation for android 2014-05-15 17:58:23 +08:00
cocoscodeide eb00d7816c Merge pull request #11 from chuanweizhang2013/v3luaruntime 
set macox deployment target
 2014-05-15 17:13:13 +08:00
cw 82f08513b0 set macox deployment target 2014-05-15 17:07:14 +08:00
cocoscodeide 53a7521c36 Merge pull request #10 from chuanweizhang2013/v3luaruntime 
fixed warnging
 2014-05-15 11:49:28 +08:00
cw a7c0a44792 fixed warnging 2014-05-15 11:34:17 +08:00
cocoscodeide 772d22b6fc Merge pull request #9 from chuanweizhang2013/v3luaruntime 
V3luaruntime
 2014-05-14 18:06:19 +08:00
cw b42eb08bad fixed error 2014-05-14 18:01:38 +08:00
bofeng-song d0d20e7272 fix build err 2014-05-14 15:52:58 +08:00
cw 7c8e237ee2 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime 2014-05-14 15:11:59 +08:00
cw 501762f3b5 remove post-new.py 2014-05-14 15:03:32 +08:00
bofeng-song 668ed34512 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-05-14 15:03:07 +08:00
bofeng-song 20346d8ef6 lua runtime, support custom orientation 2014-05-14 15:02:24 +08:00
cw e0fe2cb2e2 modify android orientation 2014-05-14 14:58:36 +08:00
cw cc5ba9b2b1 modify android orientation 2014-05-14 14:40:27 +08:00
cw d9543e9371 fixed mistake 2014-05-13 18:15:25 +08:00
cw 3207d841a3 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime 2014-05-13 18:01:38 +08:00
cocoscodeide 0b301d6602 Merge pull request #5 from cocos2d/v3 
update cocos2d-x
 2014-05-13 17:59:18 +08:00
chuanweizhang2013 21483b1a47 add start search config.json 2014-05-13 17:44:35 +08:00
chuanweizhang2013 c8d871a60b modify read config time 2014-05-13 15:56:39 +08:00
zhangbin b0adc6fe51 Modify the lua runtime template for the implementation of downloading runtime files. 2014-05-13 15:06:56 +08:00
James Chen 8115b09d29 Adds config.json for runtime 2014-05-12 17:55:57 +08:00
James Chen 5dc69026ac Updates download-deps.py to support download several files. 2014-05-12 17:53:51 +08:00
cocoscodeide 64b630912d Merge pull request #3 from chuanweizhang2013/v3luaruntime 
fixed project name
 2014-05-12 13:44:31 +08:00
chuanweizhang2013 d502e41af4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into codeidev3 
Conflicts:
	templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
 2014-05-09 14:28:14 +08:00
chuanweizhang2013 c973dba4f1 add entry file support 2014-05-09 14:06:20 +08:00
chuanweizhang2013 48566b70e0 add ignore .gz 2014-05-08 20:59:24 +08:00
chuanweizhang2013 8f7cb74dd1 fixed debug 2014-05-08 16:02:55 +08:00
chuanweizhang2013 ee4b6ba2bc add visibleRect 2014-05-08 13:57:34 +08:00
cw b9d5ef5eda add visible 2014-05-08 13:47:41 +08:00
chuanweizhang2013 784761828b modify post-new.py 2014-05-08 09:26:59 +08:00
cw 919a780e2a add suport ios screen orientation set 2014-05-07 20:50:29 +08:00
cw c9a7c44537 rename mac simulator app's file simulatorconfig class 2014-05-07 11:10:46 +08:00
chuanweizhang2013 c3d7465cc7 move win menu bar to sysmenu 2014-05-06 17:03:40 +08:00
chuanweizhang2013 cd7ea468e8 modify lua_debugger.c 2014-05-05 21:18:33 +08:00
chuanweizhang2013 5164a66e10 add config parser 2014-05-05 21:04:04 +08:00
Tom Whittock a587da13fc Lua template should fail to launch on lua error 
Without this change, the app continues to run, attempts to access the
badly-initialised scene and issues more error messages. This causes
further errors every frame, covering up the original error in the output
 2014-05-05 13:12:42 +01: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
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
Huabing.Xu 7a38050e09 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
minggo 65ffb5bb65 Merge pull request #6324 from kicktheken/develop 
Fix lua project template crash on iOS5.1 device
 2014-04-21 11:07:59 +08:00
Kenneth Chan a2fa6ef2d5 Fix lua project template crash on iOS5.1 device 2014-04-18 18:02:40 -07:00
Huabing.Xu 3b83d52f95 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/ui/UIButton.cpp
	cocos/ui/UIButton.h
	cocos/ui/UICheckBox.cpp
	cocos/ui/UICheckBox.h
	cocos/ui/UIImageView.cpp
	cocos/ui/UIImageView.h
	cocos/ui/UILayout.cpp
	cocos/ui/UILayout.h
	cocos/ui/UILoadingBar.cpp
	cocos/ui/UIRichText.h
	cocos/ui/UISlider.cpp
	cocos/ui/UIText.cpp
	cocos/ui/UIText.h
	cocos/ui/UITextAtlas.cpp
	cocos/ui/UITextAtlas.h
	cocos/ui/UITextBMFont.cpp
	cocos/ui/UITextBMFont.h
	cocos/ui/UITextField.cpp
	cocos/ui/UITextField.h
	cocos/ui/UIWidget.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
 2014-04-19 00:30:34 +08:00
cw 0f61481c40 add android runtime 2014-04-18 14:12:34 +08:00