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
207e67318d
rolling back tests
2014-05-01 16:55:28 -07:00
32f3fedb37
Moves cocos/2d/Android.mk to cocos/Android.mk
...
Easier to find Android.mk
2014-05-01 14:09:26 -07:00
25213c81f6
linux cmake improvements
...
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
2014-05-01 13:01:51 -07:00
c590bbe547
target is android-10
2014-04-30 13:18:57 -07:00
23ece1a91d
restores project.properties to 10
2014-04-30 13:16:50 -07:00
b5f513ce16
Merge branch 'v3' into improved_directory_structure
2014-04-30 13:15:10 -07:00
16105df503
getNormalize->getNormalized
2014-05-01 01:10:18 +08:00
c722b74e36
Merge branch 'v3' into v3_refactor_normalize
2014-04-30 20:08:37 +08:00
ea4fee2c31
refactor normalize in Vector2
2014-04-30 18:07:05 +08:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
bd93a5cb76
fix bug for renderTexture created which is bigger than screen size
2014-04-29 15:08:44 +08:00
c3f40bdc24
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error
2014-04-28 14:05:08 +08:00
d3670644bf
Fix compile error for Lua
2014-04-28 14:04:37 +08:00
35f83fc40a
fixed compile fail
2014-04-28 11:42:54 +08:00
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07: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
828401a23d
Merge pull request #6302 from zifter/FixParticle
...
closed #4880 : Particle systems loading incorrectly in CocosBuilder
2014-04-25 14:15:44 +08:00
06d9187783
Merge pull request #6270 from andyque/feature4783
...
closed #4783 , add outline shader files
2014-04-25 13:50:44 +08:00
037c57ef96
Merge branch 'develop' into perf-callback
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-25 12:07:48 +08:00
cd6fe294b8
Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer
...
closed #4771 : Move PhysicsWorld to Layer
2014-04-25 11:52:32 +08:00
328408d792
Merge pull request #6263 from Mazyod/develop-cpp11-http-client
...
closed #4702 : Update HTTPClient to use C++11 callbacks
2014-04-25 11:06:06 +08:00
477fc9f0e0
Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-04-25 10:59:11 +08: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
c2da6727be
fix compile warning after merge
2014-04-24 17:00:28 +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
cd2a8e90d2
Remove the comments for ClippingNodeTest
2014-04-22 13:52:52 +08:00
6b34239d75
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
2014-04-22 13:48:00 +08:00
771ce05d95
fix the bugs of SpriteTest that the Sprite created by passing rect display error
2014-04-22 13:41:10 +08:00
560d24545a
3.0hotfix: Node: Clipping->RawStencilTest4-6
2014-04-22 10:58:42 +08:00
582e961f2a
Replace getContentSize with getVirtualRendererSize related with Button in the CocoStudioGuiTest
2014-04-21 18:28:05 +08:00
7a38050e09
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-21 17:47:34 +08:00
b3ac3b2324
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
2014-04-21 17:13:34 +08:00
b313b4ce74
Comment the last three test cases
2014-04-21 17:09:44 +08:00
440702aa06
Enable depth test in test case : TilemapTest->TMXOrthoVertexZ.
2014-04-21 15:26:57 +08:00
0a5b92c56f
Merge pull request #6305 from samuele3hu/developAudio
...
fix the bug that exit layer can’t end the SimpleAudioEngine
2014-04-21 14:40:40 +08:00
710fe9d940
closed #4771 : modify test.
2014-04-21 13:32:47 +08:00
a75432ec35
Merge pull request #6262 from Mazyod/develop-editbox-mac-enhancements
...
Mac Editbox Text Font and Placeholder features
2014-04-21 11:18:07 +08:00
3930beda40
input event refactor. console enabled for wp8
2014-04-19 10:10:44 -07:00
467ededeff
enabled console for wp8
2014-04-19 10:08:01 -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
d8d847bd65
Merge pull request #6319 from boyu0/bug4903_build_libcurl_with_openssl
...
closed #4903 : Build libcurl.a with openssl
2014-04-18 17:10:53 +08:00
9756709473
closed #4903 : change HttpClientTest get test 3 to https protocol.
2014-04-18 17:03:06 +08:00
7e81f32016
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into devRichText
2014-04-18 11:55:30 +08:00
914516a4e0
fix the compile error about luabindings and add the `RichText` test cases.
2014-04-18 11:54:57 +08:00
ed4fcd5d1a
Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes
2014-04-17 14:23:08 +08:00
19f6526ef8
Widget supports contentsize
2014-04-17 14:08:25 +08:00
1331fff62c
fix the bug that exit layer can’t end SimpleAudioEngine
2014-04-17 10:36:08 +08:00
James Chen