4ce297458f
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-10 03:58:12 +00:00
63c7c6a05c
Updates template files
2014-05-09 18:41:12 -07:00
fec1b82c0a
Shader files use STRINGIFY
2014-05-09 16:45:42 -07:00
808561705a
new files for template
2014-05-09 15:40:48 -07:00
224b0910c9
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-09 05:42:30 +00:00
7ef529b1c4
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-08 10:35:12 +00:00
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
fb0094e0b7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-08 07:30:48 +00:00
9e45b4be3a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-08 06:00:35 +00:00
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
7fb79c2a52
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-07 09:43:30 +00:00
21aa7058e3
:= -> +=
2014-05-07 14:35:43 +08:00
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
12ba2b178e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-06 11:20:46 +00:00
12daf49900
added missing Assets folder
2014-05-05 13:48:31 -07:00
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
897b3c61ce
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-05 05:40:36 +00:00
dd8d932c0a
Upgrade build_native.py to take variable number of arguments
2014-05-05 12:48:51 +09:00
e32647ec88
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-04 17:37:16 +00:00
8cbcf17163
issue #4674 : Re-added deleted source files.
2014-05-04 14:37:55 +08:00
3b3c1c4dbb
issue #4674 : Removed large files and updated .gitignore
2014-05-04 14:36:16 +08:00
db68b9ca31
Lua and C++ compiles for linux
2014-05-01 15:23:20 -07:00
74d377eb70
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-01 21:14:53 +00:00
32f3fedb37
Moves cocos/2d/Android.mk to cocos/Android.mk
...
Easier to find Android.mk
2014-05-01 14:09:26 -07:00
2247086111
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-01 00:55:27 +00:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
9b3f456f80
Merge pull request #6393 from Dhilan007/v3
...
template work on wp8 now
2014-04-28 14:08:06 +08:00
698657a6ab
template work on wp8 now
2014-04-28 14:04:52 +08:00
e6f7854225
clean for kazmath in project file
2014-04-28 13:14:22 +08:00
62fbf3ff7c
template for linux cpp
2014-04-28 11:24:58 +08:00
aa3859eddb
template work on IOS/Mac now
2014-04-28 11:10:55 +08:00
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
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
679f8c7750
[AUTO][ci skip]: updating cocos2dx_files.json
2014-04-25 03:05:26 +00:00
617ccbb4fa
[AUTO][ci skip]: updating cocos2dx_files.json
2014-04-25 02:43:56 +00:00
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
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
7a38050e09
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-21 17:47:34 +08:00
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
617982cbe5
added missing projects. Fixed property sheets
2014-04-19 10:09:53 -07:00
a2fa6ef2d5
Fix lua project template crash on iOS5.1 device
2014-04-18 18:02:40 -07:00
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
0f61481c40
add android runtime
2014-04-18 14:12:34 +08:00
2a9c99ff66
Merge pull request #25 from cocos2d/develop
...
update cocos2d-x
2014-04-18 11:45:53 +08:00
a9e697523e
amend comment
2014-04-18 11:40:51 +08:00
2914f60fcf
fixed xiaomi show ip error
2014-04-17 16:50:11 +08:00
95cb7721f6
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCSprite.cpp
tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
2014-04-15 22:21:04 +08:00
7f61639541
replace Point with Vector2 in tests, extension folder
2014-04-15 18:23:40 +08:00
cb807e61c2
closed #4607 : Fixed project created by template crashes on iOS5.1 device.
2014-04-15 11:56:50 +08:00
CocosRobot