Jon Segador
64fa90ff0f
Vector2 replaced by Vec2
2014-05-16 16:21:36 +02:00
minggo
bf2250a67a
Merge pull request #6738 from cocoscodeide/v3
...
update template project lua
2014-05-16 18:10:10 +08:00
bofeng-song
6dd7f2d630
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
2014-05-16 17:19:36 +08:00
cw
aa2aa4bcdf
fixed repo
2014-05-16 17:08:33 +08:00
bofeng-song
662d8454f7
remove inner function from header file
2014-05-16 16:46:35 +08:00
CocosRobot
c2ace4c56e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-16 08:43:41 +00: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
cw
ceeba9a081
mofiy size
2014-05-16 12:02:59 +08:00
cw
48e437801f
add prebuiltruntime
2014-05-16 11:57:03 +08:00
CocosRobot
b9562e5dbf
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-15 10:30:59 +00: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
minggo
354566d782
use RGBA8 as default pixel format
2014-05-15 09:56:26 +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
minggo
4356727465
Merge pull request #6619 from myourys/v3
...
update cpp-default-template for android *Eclipse*
2014-05-13 13:52:28 +08:00
CocosRobot
79b679a3b0
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-12 11:05:12 +00:00
James Chen
eb9fbea7be
Merge pull request #6686 from dumganhar/download-runtime
...
Updates download-deps.py to support to download several zip files. (external and lua-runtime-bin)
2014-05-12 19:00:15 +08:00
CocosRobot
e9cf6060be
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-12 09:59:17 +00: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
CocosRobot
18e8f1bdae
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-12 08:11:46 +00:00
cocoscodeide
64b630912d
Merge pull request #3 from chuanweizhang2013/v3luaruntime
...
fixed project name
2014-05-12 13:44:31 +08:00
CocosRobot
4ce297458f
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-10 03:58:12 +00:00
Ricardo Quesada
63c7c6a05c
Updates template files
2014-05-09 18:41:12 -07:00
Ricardo Quesada
fec1b82c0a
Shader files use STRINGIFY
2014-05-09 16:45:42 -07:00
Ricardo Quesada
808561705a
new files for template
2014-05-09 15:40:48 -07: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
CocosRobot
224b0910c9
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-09 05:42:30 +00:00
cocoscodeide
6efaa2fe8f
Merge pull request #2 from chuanweizhang2013/v3luaruntime
...
modify luadebug and adjust code file
2014-05-08 22:09:06 +08:00
chuanweizhang2013
48566b70e0
add ignore .gz
2014-05-08 20:59:24 +08:00
CocosRobot
7ef529b1c4
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-08 10:35:12 +00:00
minggo
56f749f273
Merge pull request #6575 from twhittock/lua-main-error-no-launch
...
Lua template should fail to launch on lua error
2014-05-08 17:58:48 +08:00
chuanweizhang2013
8f7cb74dd1
fixed debug
2014-05-08 16:02:55 +08:00
CocosRobot
fb0094e0b7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-08 07:30:48 +00:00
CocosRobot
9e45b4be3a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-08 06:00:35 +00:00
minggo
8dba4e3b13
Merge pull request #6570 from gin0606/buildNativeVariableArguments
...
Upgrade build_native.py to take variable number of arguments
2014-05-08 13:59:16 +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
Hector
420439cdea
update cpp-default-template for android *Eclipse*
2014-05-08 11:20:25 +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
CocosRobot
7fb79c2a52
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-07 09:43:30 +00:00
minggo
21aa7058e3
:= -> +=
2014-05-07 14:35:43 +08:00
minggo
976ef3e2a4
add some comment for dependences module in Android.mk to make it simple to use other module
2014-05-07 14:31:05 +08:00
cocoscodeide
04600227ae
Merge pull request #1 from chuanweizhang2013/v3luaruntime
...
V3luaruntime
2014-05-07 11:34:35 +08:00
cw
c9a7c44537
rename mac simulator app's file simulatorconfig class
2014-05-07 11:10:46 +08:00
CocosRobot
12ba2b178e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-06 11:20:46 +00:00
chuanweizhang2013
c3d7465cc7
move win menu bar to sysmenu
2014-05-06 17:03:40 +08:00
Dale Stammen
12daf49900
added missing Assets folder
2014-05-05 13:48:31 -07: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
CocosRobot
897b3c61ce
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-05 05:40:36 +00:00
gin0606
dd8d932c0a
Upgrade build_native.py to take variable number of arguments
2014-05-05 12:48:51 +09:00
CocosRobot
e32647ec88
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-04 17:37:16 +00: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
db68b9ca31
Lua and C++ compiles for linux
2014-05-01 15:23:20 -07:00
CocosRobot
74d377eb70
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-01 21:14:53 +00: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
CocosRobot
2247086111
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-01 00:55:27 +00:00
Ricardo Quesada
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
James Chen
9b3f456f80
Merge pull request #6393 from Dhilan007/v3
...
template work on wp8 now
2014-04-28 14:08:06 +08:00
Dhilan007
698657a6ab
template work on wp8 now
2014-04-28 14:04:52 +08:00
Huabing.Xu
e6f7854225
clean for kazmath in project file
2014-04-28 13:14:22 +08:00
Huabing.Xu
62fbf3ff7c
template for linux cpp
2014-04-28 11:24:58 +08:00
Huabing.Xu
aa3859eddb
template work on IOS/Mac now
2014-04-28 11:10:55 +08:00
Ricardo Quesada
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
Huabing.Xu
feec24e3ef
Merge branch 'v3' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
2014-04-25 16:20:24 +08:00
CocosRobot
679f8c7750
[AUTO][ci skip]: updating cocos2dx_files.json
2014-04-25 03:05:26 +00:00
CocosRobot
617ccbb4fa
[AUTO][ci skip]: updating cocos2dx_files.json
2014-04-25 02:43:56 +00:00
James Chen
7beb8b78fe
Merge pull request #6325 from MSOpenTech/wp8-3.0-update
...
Wp8 3.0 update:
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
2014-04-25 10:41:58 +08:00
Huabing.Xu
f65973d9f0
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCActionInterval.cpp
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCLabelBMFont.cpp
tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
2014-04-23 14:46:14 +08:00
袁全伟
56f9def298
Update AppDelegate.cpp
...
use getInstance replace :)
2014-04-22 13:20:07 +08: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
Dale Stammen
617982cbe5
added missing projects. Fixed property sheets
2014-04-19 10:09:53 -07: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