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