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

195 Commits

Author SHA1 Message Date
chuanweizhang2013 1b3af4be19 move runtime res path 2014-05-22 22:08:04 +08:00
chuanweizhang2013 111840f37b add play ui 2014-05-22 11:52:49 +08:00
Sergey 49f26f3fbf lua template & android-build.py updated 2014-05-20 13:49:02 +04:00
cw 1aa92bdef0 add java nativeIsDebug 2014-05-20 13:53:52 +08:00
cw 84d66219c8 fixed android degbug 2014-05-20 11:44:46 +08:00
cocoscodeide a2be97380b Merge pull request #14 from bofeng-song/v3 
show uploading file in play scene
 2014-05-19 13:35:31 +08:00
cw 859242c29b fixed portrait 2014-05-17 22:24:56 +08:00
cw 150125f411 fixed mac relaunch bug 2014-05-17 19:11:12 +08:00
cw 8db2882431 fixed head search path 2014-05-17 14:41:03 +08:00
cw 84e9cd3a77 modify vec2 2014-05-17 11:35:57 +08:00
bofeng-song 6a8712482c fix build error 2014-05-17 11:30:07 +08:00
Ricardo Quesada 0f67247325 Squashed commit of the following: 
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into files

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
 2014-05-16 14:36:00 -07:00
minggo bf2250a67a Merge pull request #6738 from cocoscodeide/v3 
update template project lua
 2014-05-16 18:10:10 +08:00
bofeng-song 662d8454f7 remove inner function from header file 2014-05-16 16:46:35 +08:00
bofeng-song 5cf961912b fix potential problem 2014-05-16 16:24:26 +08:00
bofeng-song 8a407cd0ba show uploading file in play scene 2014-05-16 15:59:09 +08:00
Jason Xu 67a558c83d for 93562d6aa6 
update Cocos2dxHelper and AndroidManifest.xml template.
 2014-05-16 15:55:00 +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 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
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
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
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
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 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
cw a9e697523e amend comment 2014-04-18 11:40:51 +08:00
cw 2914f60fcf fixed xiaomi show ip error 2014-04-17 16:50:11 +08:00
Huabing.Xu 7f61639541 replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
chuanweizhang2013 1fadba7de1 add static to variable 2014-04-11 10:41:35 +08:00
cw 06b727d184 remove comment code and rename function 2014-04-10 18:15:07 +08:00
chuanweizhang2013 b8ed365b7f tab to 4 space 2014-04-10 15:53:42 +08:00
chuanweizhang2013 eb6ef4d067 tab to 4 space 2014-04-10 15:51:25 +08:00
chuanweizhang2013 d5940243e1 mofiy wrong indention 2014-04-10 15:37:59 +08:00
chuanweizhang2013 c6ec729bf8 modify 2014-04-10 10:35:53 +08:00
chuanweizhang2013 d4e2b72f12 add platform symbol 2014-04-09 19:17:13 +08:00
chuanweizhang2013 b077ed40e8 Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime 2014-04-09 17:55:58 +08:00
chuanweizhang2013 e97552c2d3 add reload 2014-04-09 17:54:10 +08:00
cw d34fddb06e rename lua folder 2014-04-09 17:03:38 +08:00
cw c0fe791aae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luaruntime 
Conflicts:
	templates/lua-template-runtime/src/main.lua
 2014-04-04 18:17:54 +08:00
chuanweizhang2013 a6cd18d05d cmd to request 2014-04-02 13:47:09 +08:00
samuele3hu 0a1d23753b fix the lua template error that would lead to crash when do rotate 2014-03-31 23:11:26 +08:00
chuanweizhang2013 d74fd796eb add resouce reload 2014-03-31 16:49:12 +08:00
chuanweizhang2013 189136ccb8 fixed mistake 2014-03-31 11:39:49 +08:00
chuanweizhang2013 32402b109e add memset 2014-03-31 11:26:30 +08:00
chuanweizhang2013 93c424071e update runtime 2014-03-31 11:18:41 +08:00
cw 2649c5b971 add socket 2014-03-28 16:26:56 +08:00
chuanweizhang2013 0d65057116 update runtime 2014-03-28 16:07:29 +08:00
chuanweizhang2013 c016f80f58 fixed no json file bug 2014-03-28 15:45:10 +08:00
chuanweizhang2013 4b691cf7e9 add fileinfo support 2014-03-28 15:06:49 +08:00
chuanweizhang2013 5aa3a5d956 update socket rules 2014-03-28 11:37:17 +08:00
chuanweizhang2013 210cee9f08 update socket protocol 2014-03-26 14:48:04 +08:00
Dhilan007 c642d4d4c4 update templates for remove native activity 2014-03-25 15:43:42 +08:00
chuanweizhang2013 3c575d36d8 / 2014-03-21 15:53:02 +08:00
cw 8a40fbc159 update pc show msg 2014-03-21 11:56:21 +08:00
chuanweizhang2013 46d58775d7 update search path 2014-03-19 17:23:06 +08:00
chuanweizhang2013 a0b8200b79 forget include 2014-03-19 09:50:06 +08:00
chuanweizhang2013 7af5060896 add pc args 2014-03-18 18:24:58 +08:00
chuanweizhang2013 6b2ce283e4 fixed win32 don't exit 2014-03-17 20:46:49 +08:00
chuanweizhang2013 08a04e6408 update release writepath 2014-03-17 14:44:20 +08:00
chuanweizhang2013 b44b5ce52f add send \n 2014-03-16 17:32:08 +08:00
chuanweizhang2013 2f62cd2383 modify recv namelen array 2014-03-15 18:30:58 +08:00
chuanweizhang2013 ec6c4ddf64 modify recv namelen array 2014-03-15 18:28:42 +08:00
chuanweizhang2013 0dc85e42a7 modify module_path 2014-03-13 09:51:43 +08:00
James Chen ac0aecb394 Merge pull request #5737 from dumganhar/runtime-fix 
Lua Runtime fix
 2014-03-12 21:48:35 +08:00
James Chen cc8738ee94 Simulator fix: After main loop, NSApplication needs to be terminated immediately. 2014-03-12 21:45:15 +08:00
minggo e1afa0ad5c Merge pull request #5735 from minggo/template-java-des 
add description for how to load .so
 2014-03-12 21:31:30 +08:00
minggo 656211a72f add description for how to load .so 2014-03-12 21:28:38 +08:00
chuanweizhang2013 fafc292d33 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luamerage 2014-03-12 15:28:07 +08:00
chuanweizhang2013 4153667249 add runtime template 2014-03-12 11:04:56 +08:00
andyque 2c2a5ee38e rename gui to ui 2014-03-12 10:46:49 +08:00
cw 133a68f614 add runtime template 2014-03-11 16:52:06 +08:00