andyque
cbcc1bbbcf
let ios project compile correct
2014-03-11 18:48:26 +08:00
James Chen
fd44277e7c
lua-tests works again for Win32.
2014-03-10 17:05:35 +08:00
James Chen
6deadf34b8
lua-tests works again for Android.
2014-03-10 16:04:46 +08:00
James Chen
705ab115b8
Reuse the resources in cpp-tests.
2014-03-10 15:40:48 +08:00
James Chen
69bbda688b
lua-tests works ok for iOS / Mac, luabindings has its own project.
2014-03-10 15:32:48 +08:00
James Chen
2e473027c1
Re-add xcode 'scheme' files.
2014-03-10 11:58:33 +08:00
James Chen
ab1b10169e
Compilation error fixes for Linux and Android.
2014-03-10 11:54:26 +08:00
James Chen
218dc822e1
Updates win32 project configuration.
2014-03-10 11:23:35 +08:00
James Chen
11dc78a57b
cocos2d_tests -> cocos2d_samples
2014-03-10 10:46:44 +08:00
James Chen
f9ecaa3274
Deletes xcode xcschemes temporarily.
2014-03-10 10:30:48 +08:00
James Chen
4475209277
Renames 'cocos2d_tests.xcodeproj' to 'cocos2d_samples.xcodeproj'
2014-03-10 10:27:16 +08:00
CaiWenzhi
62dfe630c7
Add custom widget
2014-03-07 15:36:45 +08:00
CaiWenzhi
8b7a5c3141
Add RichText sample
2014-03-06 20:52:29 +08:00
CaiWenzhi
5e84c15812
Add RichText
2014-03-05 23:03:49 +08:00
CaiWenzhi
ad85d2c800
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-05 21:20:26 +08:00
CaiWenzhi
4f9dfdbef8
Fixed build error except Windows
2014-03-05 21:18:51 +08:00
minggo
db4d163806
update android build script since it only has testcpp now
2014-03-05 20:36:37 +08:00
CaiWenzhi
7a4ba91f29
Modify project file
2014-03-05 17:08:59 +08:00
CaiWenzhi
ab47cafb31
Merge branch 'develop' into develop_nutty_modify_framework_for315
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/gui/UIButton.cpp
cocos/gui/UIButton.h
cocos/gui/UIWidget.h
2014-03-05 16:52:31 +08:00
Ricardo Quesada
4fe3b16287
Updates to latest version of kazmath
2014-03-04 16:33:00 -08:00
CaiWenzhi
4a2dc4a607
Add custom widget and reader
2014-03-04 16:51:35 +08:00
James Chen
b2cebebbaf
issue #4129 : Remove unused references in Xcode project.
2014-02-28 15:40:03 +08:00
James Chen
801e981286
issue #4116 : Updates iOS / Mac projects.
2014-02-26 22:27:38 +08:00
James Chen
e4837e7f94
issue #4116 : Removes script-bindings codes.
2014-02-26 21:34:06 +08:00
samuele3hu
a765178a5f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
2014-02-24 09:38:08 +08:00
James Chen
c5bf3950bc
closed #4107 : Director::setAnimationInterval could not work on Mac platform. Also removed unused files (CCDirectorCaller.h/.mm).
2014-02-21 11:55:37 +08:00
samuele3hu
555ef20202
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
...
Conflicts:
cocos/scripting/lua/bindings/LuaBasicConversions.h
cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp
2014-02-21 10:10:20 +08:00
samuele3hu
3532665520
issue #3956:Change tolua_fix.c to tolua_fix.cpp and modify the toluafix_pushusertype_ccobject function to get real type of object
2014-02-21 09:45:33 +08:00
James Chen
450d30b164
Merge pull request #5040 from martell/mingwclang
...
closed #3809 : Added clang support for Windows
2014-02-20 20:24:36 +08:00
James Chen
0d8846d876
closed #4097 : Adds a macro to disable inserting script binding relevant codes.
2014-02-20 16:40:46 +08:00
James Chen
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
Dhilan007
dfc6522f5c
update XCode project for add miss file on Mac and IOS.
2014-02-19 17:11:28 +08:00
andyque
f16b0022a3
move CCActionEaseEx content to CCActionEase
2014-02-18 14:22:13 +08:00
andyque
895b2a0055
move CCActionEaseEx and CCTweenFunction to core engine
2014-02-18 14:22:12 +08:00
James Chen
297fe597e1
Updates mac / iOS project.
2014-02-18 11:08:27 +08:00
James Chen
78163e604e
Merge pull request #5358 from dumganhar/merge5343
...
closed #4037:Exposed the missing data structures of Spine to JS
2014-02-14 11:17:38 +08:00
James Chen
a5aa547c7b
Merge pull request #5316 from natural-law/ScenarioTest
...
closed #3738 : Add performance test case on game scenario.
2014-02-14 11:12:01 +08:00
James Chen
9d764718f9
issue #4037 : Removes unused files from Xcode setting.
2014-02-14 10:26:27 +08:00
James Chen
acefa4e237
Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343
2014-02-14 09:33:42 +08:00
James Chen
fb4699359d
Merge pull request #5326 from Dhilan007/develop_label
...
issue #3821 : Moving platform-dependent codes of LabelTTF from cocos2d::Image to cocos2d::Device.
2014-02-14 09:24:11 +08:00
James Chen
c8ec90781c
Merge pull request #5351 from heliclei/xcode-scheme
...
share xcode build schemes to support xcodebuild command line build
2014-02-14 09:09:07 +08:00
Dhilan007
0d5c702708
move labelttf's platform-dependent code from CCImage to CCDevice
2014-02-13 21:08:43 +08:00
heliclei
1154c28516
share xcode build schemes to support xcodebuild command line build
2014-02-13 18:11:24 +08:00
ucchen
2c961bdfbf
add spine manual binding;
2014-02-13 11:01:54 +08:00
James Chen
a255478127
[Linux] Installs libssl-dev package.
2014-02-13 10:08:03 +08:00
Éloi Rivard
79e3c05ef1
Minor debugging messages and guards.
...
Dependencies installation is skipped on linux distributions that does not use .deb package format.
2014-02-13 01:25:23 +01:00
Éloi Rivard
3fb2b61591
Linux local storage support. Depends on libsqlite3-dev
2014-02-13 00:53:51 +01:00
Ricardo Quesada
1836375468
schemes are no longer shared
2014-02-12 08:26:22 +08:00
zhangbin
89cc82c332
Merge branch 'develop' into ScenarioTest
2014-02-10 14:26:31 +08:00
zhangbin
926f84d385
issue #3738 , Add game scenario performance test case.
2014-02-10 11:42:15 +08:00
Ricardo Quesada
24f655f9b1
Better 'vertices drawn'
2014-02-09 19:31:45 -08:00
Ricardo Quesada
ceba63db8b
Merge branch 'develop' into fast_tmx
2014-02-08 09:08:33 -08:00
Ricardo Quesada
616feadda1
More fixes and "tiles" is an uint32 (GID)
2014-02-07 18:11:17 -08:00
heliclei
e081ea2dc4
add xcode shared schemes
2014-02-07 14:46:36 +08:00
Ricardo Quesada
9a53f5a9f5
Testing a new TMX renderer
...
faster
2014-02-04 17:59:21 -08:00
James Chen
bed6777673
issue #3828 : Don't package Test_info.plist for `TestJavascript Mac` target.
2014-02-01 12:20:38 +08:00
James Chen
a4e7d2b658
issue #3828 : Icon resources should be packaged. Only XXX_info.plist should not be packaged. If it was packaged, it would cause problem of running on simulator.
2014-02-01 12:18:22 +08:00
James Chen
d0a44cd57e
issue #3828 : Don't copy resources in test-xxx/proj.ios(mac)/xxx.png(.plist) in project configuration. This will fix the issue that application installed to iOS simulator can't be launched.
2014-02-01 11:55:46 +08:00
Ricardo Quesada
e77d22a58f
samples -> tests
2014-01-31 14:09:28 -08:00
Ricardo Quesada
5fde81d1e2
cocos2d-samples -> cocos2d-tests
2014-01-31 11:13:48 -08:00
Ricardo Quesada
5691829b72
Linux with #ifdef
2014-01-30 17:10:18 -08:00
Ricardo Quesada
7da8c84a75
Renames EGLView -> GLView
2014-01-30 16:51:43 -08:00
Ricardo Quesada
862500f99a
Renames EGLView -> GLView
2014-01-30 15:40:56 -08:00
Ricardo Quesada
4ed2e0d9d2
Merge branch 'develop' into glview_improvements
...
Conflicts:
CHANGELOG
cocos/2d/platform/linux/CCApplication.cpp
samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp
samples/Cpp/HelloCpp/Classes/AppDelegate.cpp
samples/Cpp/HelloCpp/Classes/AppMacros.h
samples/Cpp/HelloCpp/proj.ios/AppController.mm
samples/Cpp/HelloCpp/proj.mac/main.cpp
samples/Cpp/SimpleGame/Classes/AppDelegate.cpp
samples/Cpp/SimpleGame/proj.ios/AppController.mm
samples/Cpp/SimpleGame/proj.mac/main.cpp
samples/Cpp/TestCpp/Classes/AppDelegate.h
samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
samples/Javascript/CocosDragonJS/proj.ios/AppController.mm
samples/Javascript/CocosDragonJS/proj.mac/main.cpp
samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
samples/Javascript/CrystalCraze/proj.ios/AppController.mm
samples/Javascript/CrystalCraze/proj.mac/main.cpp
samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp
samples/Javascript/MoonWarriors/proj.ios/AppController.mm
samples/Javascript/MoonWarriors/proj.mac/main.cpp
samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp
samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm
samples/Javascript/WatermelonWithMe/proj.mac/main.cpp
samples/Lua/HelloLua/Classes/AppDelegate.cpp
samples/Lua/HelloLua/proj.ios/AppController.mm
samples/Lua/HelloLua/proj.mac/main.cpp
2014-01-28 11:32:25 -08:00
James Chen
6988d48d08
issue #3828 : Updates win32 projects.
2014-01-28 15:49:23 +08:00
James Chen
ffd8970996
issue #3828 : Updates android build.
2014-01-28 15:33:23 +08:00
James Chen
ebe22aaeec
issue #3828 : Fix a mistake in android-build.py.
2014-01-28 15:17:34 +08:00
James Chen
5d67d53393
issue #3828 : Updates android build.
2014-01-28 15:14:27 +08:00
James Chen
d1d447b52e
issue #3828 : Updates iOS & Mac projects. And update JS-Tests.
2014-01-28 12:55:06 +08:00
Ricardo Quesada
b96c4f1ad0
Only compile iOS files on iOS
2014-01-27 16:44:10 -08:00
Ricardo Quesada
efaec7b7ec
Merge branch 'develop' into glview_improvements
...
Conflicts:
samples/Lua/HelloLua/Classes/AppDelegate.cpp
template/multi-platform-lua/Classes/AppDelegate.cpp
2014-01-27 10:52:35 -08:00
James Chen
6a302735d8
Removes unused files.
2014-01-26 17:54:13 +08:00
andyque
96af336780
issue #3859 . update description of android-build.py
2014-01-26 16:22:09 +08:00
andyque
7f3a0216c2
issue #3859 . improve the prompt of android-build scripts
2014-01-26 16:10:51 +08:00
samuele3hu
cf684bc3f4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
2014-01-26 15:16:02 +08:00
minggo
b7d5d430a4
Merge pull request #5225 from dumganhar/iss3853-jsb-crash-debug-mode
...
closed #3853 : Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform.
2014-01-25 20:37:31 -08:00
samuele3hu
9b514927f5
issue #3837:Make `HelloLua` support to debug by the ZeroBrane Studio
2014-01-26 11:55:02 +08:00
James Chen
5b9f1697d3
closed #3853 : Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform. Don’t define `DEBUG` macro in our projects since all third party libraries(e.g. Spidermonkey) were built in RELEASE mode.
2014-01-26 11:16:25 +08:00
James Chen
7069a5afa9
Merge pull request #5218 from Dhilan007/develop_crash
...
fix get_num_of_cpu on win32.
2014-01-24 21:26:32 -08:00
Dhilan007
3a09cdfe2e
fix get_num_of_cpu on win32.
2014-01-24 18:34:02 +08:00
samuele3hu
58eab72d26
issue:Add luasocket's support for lua
2014-01-24 17:24:10 +08:00
Ricardo Quesada
8ecaf49f93
GLView improvements
...
it is not longer a singleton
it is possible to specify the size
2014-01-23 15:36:55 -08:00
Ricardo Quesada
6b8781241c
code is cleaner
2014-01-22 13:51:01 -08:00
Ricardo Quesada
83f16e25e3
merge from develop
2014-01-22 11:44:48 -08:00
Ricardo Quesada
1b6dfcda40
Merge branch 'develop' into cceglview_in_desktop
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-01-22 11:21:16 -08:00
Dhilan007
4095ab36b6
update xcode project.
2014-01-22 15:22:46 +08:00
James Chen
32572e257e
issue #3677 : File rename. PerformanceEventDispatcher.h/.cpp -> PerformanceEventDispatcherTest.h/.cpp.
2014-01-22 14:10:42 +08:00
James Chen
cecb20f824
issue #3677 : Adds EventDispatcher performance test.
2014-01-22 13:33:40 +08:00
James Chen
0ab5ec742a
closed #3808 : Removes unused files for MAC platform after using glfw3 to create opengl context
2014-01-22 10:16:34 +08:00
Ricardo Quesada
1113587f47
mac/CCEGLView moved to desktop/
2014-01-21 17:52:30 -08:00
Ricardo Quesada
06be466f29
Removed unused code and files.
...
Making the mac platform easier to mantain
2014-01-21 16:25:29 -08:00
Ricardo Quesada
98d23d30a6
First step in simplifying the mac platform
2014-01-21 15:44:01 -08:00
minggo
4833810c6e
Merge pull request #5132 from minggo/iss3713-replace_CCObject
...
remove Object::_autoReleaseCount
2014-01-21 02:26:40 -08:00
minggo
6378d10d5d
issue #3713:add test case for autorelease pool
2014-01-21 17:47:59 +08:00
James Chen
ccecaeb94f
Merge pull request #5125 from Dhilan007/develop_label
...
close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.
2014-01-21 00:58:21 -08:00
minggo
a6ec66c340
Merge pull request #5126 from liang8305/use_multiple_build_process
...
get number of cpu, using multiple concurrent job processes;
2014-01-19 19:50:48 -08:00
Dhilan007
9f9e289f8c
update xcode project.
2014-01-20 11:30:35 +08:00
liang8305
bf99e10c10
get number of cpu, using multiple concurrent job processes;
2014-01-20 10:37:01 +08:00
Ricardo Quesada
5fcbf42356
GlobalZOrder is used for render priority...
...
...and not vertexZ
Node::setGlobalZOrder() is used to change that.
Node::setZOrder() -> Node::setLocalZOrder();
2014-01-18 11:38:06 -08:00
James Chen
d309ae76d0
issue #3628 : Adds missing files for iOS and Mac.
2014-01-17 11:13:40 +08:00
James Chen
4302f3886d
issue #2789 : Adds performance test for Vector and CCArray.
2014-01-17 10:02:12 +08:00
Huabing.Xu
21d586d4ca
Merge branch 'develop' into develop_renderer_tileMapTest
...
* develop: (24 commits)
Update CHANGELOG [ci skip]
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
More renderer optimizations
[AUTO] : updating submodule reference to latest autogenerated bindings
Update CHANGELOG [ci skip]
Sprite: removed _hasChildren
Compilation fix: Updates cocos_files.json and removes unused in template.
use data.isNull() instead of !data.getBytes()
Update VS project file.
Updates CHANGELOG
SpriteBatchCommand and ParticleBatchCommand use the BatchCommand
Updates Xcode, Android and Linux project
fixes #3720
Renderer performance fixes
Console::log(format, va_args) is private
fix compiling error
Relieve inherit from LabelProtocol
closed #3688 , Solve the bug : LabelAtlas set a shorter string than before, the effect will be wrong.
add check data valid in getStringFromFile
...
2014-01-16 12:47:32 +08:00
Ricardo Quesada
65602a4574
Updates Xcode, Android and Linux project
...
with new BatchCommand
2014-01-15 16:06:47 -08:00
Huabing.Xu
19705fcf37
issue #3640 : add performance test->renderer LargeTileMap test
2014-01-15 11:27:57 +08:00
martell
66caa13550
Added clang support for Mingw64
2014-01-11 13:26:04 +00:00
James Chen
f5ae2bbacc
Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
...
issue #3401 : physical lua binding
2014-01-06 23:48:47 -08:00
boyu0
cf146b32cf
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/CCLuaStack.cpp
cocos/scripting/lua/script/Cocos2d.lua
cocos/scripting/lua/script/Cocos2dConstants.lua
2014-01-07 10:16:44 +08:00
Ricardo Quesada
d15768d630
Removes RELASE_NOTES
2014-01-06 16:28:24 -08:00
chengstory
b4118a7ccc
fixed #3582
...
1. add #include "cocostudio/CCComBase.h" into CocoStudio.h
2014-01-05 03:55:10 +08:00
chengstory
aae6d27c74
fixed #3582
...
1. revert ComRender::create(cocos2d::Node *node, const char *comName).
2014-01-05 03:11:32 +08:00
chengstory
bac600ab9f
fixed #3582
...
1. create Component By component Factory.
2014-01-05 02:22:32 +08:00
James Chen
052f24cceb
[ci skip] Updates TestLua project for iOS and Mac.
2014-01-04 17:33:21 +08:00
James Chen
4c3fa3da49
Merge pull request #4865 from dumganhar/testjs-bugfix
...
Some fixes for TestJavascript
2014-01-03 23:34:08 -08:00
James Chen
046384ca1f
Uses blue folder for iOS & Mac resources to prevent adding new resources.
2014-01-04 14:22:57 +08:00
James Chen
9bb558ad46
Removes wrong resource in TestJavascript project.
2014-01-04 13:54:25 +08:00
James Chen
e65c6b8e53
Merge pull request #4841 from dumganhar/template-container-unit-test
...
Template container unit test
2014-01-03 20:01:25 -08:00
James Chen
5072e63f89
issue #3577 : Updates project file for mac and ios.
2014-01-04 11:41:06 +08:00
chengstory
7f8224b621
Merge branch 'develop' into #3480
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
2014-01-03 19:36:22 +08:00
Dhilan007
8e2c51d31e
update vs project for split spine binding.
2014-01-03 15:29:50 +08:00
samuele3hu
07a3efb585
Update the lua test cases about the GUI
2014-01-03 10:39:19 +08:00
chengstory
77dca5958f
issue #3480 upload Samples resources.
2014-01-03 02:03:05 +08:00
samuele3hu
d802518413
Rename Cocos2dStudio.lua to CocoStudio.lua
2014-01-02 15:51:25 +08:00
samuele3hu
a2b706c87c
Rename some common script files to keep consistent
2014-01-02 15:18:32 +08:00
samuele3hu
b8d4010ae5
Develop branch adds lua trigger for CocoStudio
2014-01-02 12:00:37 +08:00
boyu0
0a06d93328
issue #3401 : physical lua banding script and auto script
2014-01-02 11:45:11 +08:00
CaiWenzhi
81bdfac795
Modify class name Label LabelBMFont LabelAtlas
2013-12-31 16:36:33 +08:00
heliclei
7696a5f2cc
move ghprb.py to tools/jenkins-scripts/
2013-12-30 21:40:28 +08:00
jiusheng
0cf0ad26d2
add github pull request builder for Jenkins
2013-12-30 21:11:32 +08:00
chengstory
8ae7ecff33
Merge branch 'develop' into #3457
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSGUIReader.h
2013-12-26 12:55:52 +08:00
James Chen
444389e92d
[GUI] Updates Mac project.
2013-12-26 10:44:41 +08:00
chengstory
8afdf88d25
Test triiger 3.0
2013-12-26 01:17:04 +08:00
CaiWenzhi
96279c12dc
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-25 18:32:15 +08:00
yinkaile
d72c9d94d7
upload trigger code.
2013-12-25 17:40:54 +08:00
samuele3hu
45cfe00ec4
Modify iOS project set and some manual lua binding
2013-12-25 13:47:22 +08:00
CaiWenzhi
2ae8576e0f
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-25 10:40:05 +08:00
chengstory
e4e22b52cb
Merge branch 'develop' into #3456
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCDataReaderHelper.cpp
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSSceneReader.cpp
2013-12-24 22:05:13 +08:00
chengstory
64f0987fea
issue #3456 ios test rapidjson.
2013-12-24 21:23:24 +08:00
James Chen
0305ff15db
Merge pull request #4625 from dabingnn/develop_NewClippingNode
...
Develop new clipping node
2013-12-23 23:20:38 -08:00
James Chen
451d76f6b0
Merge pull request #4611 from dumganhar/spine-test
...
Merge PR #4572 , Spine JS test support.
2013-12-23 22:55:58 -08:00
Huabing.Xu
e7facf9f85
remove NewClippingNode feature function into ClippingNode
2013-12-24 14:08:57 +08:00
Huabing.Xu
24ac743a3c
remove class NewSpriteBatchNode
2013-12-24 11:03:59 +08:00
CaiWenzhi
6dd55921aa
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-24 10:44:57 +08:00
Huabing.Xu
8d58e43ad2
remove Class NewSprite
2013-12-24 09:40:00 +08:00
James Chen
05f6a5b09b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test
2013-12-23 22:05:20 +08:00
James Chen
8c0f6ba80e
Adds `SpineTest` to iOS, Mac projects.
2013-12-23 21:13:23 +08:00
James Chen
cafebe7295
Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00
Huabing.Xu
1dd2c1c20c
remove NewTextureAtlas
2013-12-23 20:11:50 +08:00
Huabing.Xu
487e0b21af
update Xcode project file& android.mk
2013-12-23 18:03:08 +08:00
CaiWenzhi
a19000b49f
Add samples
2013-12-23 15:35:35 +08:00
CaiWenzhi
9aa85d2bd6
Remove NodeRGBA inherit
2013-12-23 15:02:52 +08:00
Dhilan007
d1972b3d17
support generate APK by script in template project and unify help message for usage.
2013-12-22 17:48:35 +08:00
Ricardo Quesada
fd8c7e9a5d
Removes CCCamera
...
Not needed anymore.
2013-12-20 19:24:56 -08:00
James Chen
0db2067f97
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-spine
2013-12-20 20:11:41 +08:00
byeonggee.seo
d5ea2d22a5
undo my mistake
2013-12-20 19:45:50 +09:00
byeonggee.seo
ef1709bc3d
Add SpineTest to TestJavascript 1
2013-12-20 19:20:13 +09:00
byeonggee.seo
0a30a9a604
spine simple JS binding supported
2013-12-20 16:10:15 +09:00
Huabing.Xu
d51ad36613
Merge branch 'develop' into develop_gridNode
...
* develop: (67 commits)
Adds const in ShaderTest2.h
Skew works again!
[AUTO] : updating submodule reference to latest autogenerated bindings
[AUTO] : updating submodule reference to latest autogenerated bindings
Reverts submodule.
Updates submodule of bindings-generator.
Adds `std::for_each` test in invocation
Reverts bindings-generator.
fixed not render
iterator in Sprite fixes
update vs project for removes unneeded files
getNodeToParentTransform fixes
Node cleanup
[AUTO] : updating submodule reference to latest autogenerated bindings
Improves SpriteTest
[AUTO] : updating submodule reference to latest autogenerated bindings
Android and Linux fixes
removes `using namespace std` from header file
Removes unneeded files
change play arguments
...
Conflicts:
cocos/2d/CCNode.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-19 17:20:22 +08:00
byeonggee.seo
e673bd80bb
new spine runtime applied
2013-12-19 10:50:37 +09:00
Ricardo Quesada
903844c7bd
Removes unneeded files
...
New functionality is merged into the 'official' classes
2013-12-18 11:44:45 -08:00
Ricardo Quesada
33c4f891a0
Adds 'CC' to renderer files
2013-12-17 18:41:09 -08:00
Huabing.Xu
25fc3d3c2a
Merge branch 'develop' into develop_gridNode
...
* develop: (105 commits)
update armature to new render
iOS & Mac project fix.
[AUTO] : updating submodule reference to latest autogenerated bindings
use size_t replace unsigned int for record redeque::size returned value.
issue #2171 : Updates CMakeLists.txt.
issue #2171 : Binds New renderer classes, ignores NewTextureAtlas.
issue #2171 : Adds header files of renderer in cocos2d.h.
issue #2171 : Reorder renderer files for iOS & mac project.
issue #2171 : small fix in ccTypes.h
issue #2171 : Don’t ‘using namespace std;’ in header file.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #2171 : Ignores Director::getFrustum.
issue #2171 : Fixing compilation errors for Linux port.
issue #2171 : NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
issue #2171 : [New Renderer] Fixing compilation errors for Android.
[Win32] fix argument type. - argument of interface is ssize_t.
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
Add mouse scrolling support for extension test
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
...
Conflicts:
cocos/2d/CCNode.cpp
cocos/2d/cocos2d.vcxproj.filters
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-17 18:16:05 +08:00
James Chen
d3a4dbab08
iOS & Mac project fix.
2013-12-17 16:34:05 +08:00
James Chen
5d248ef77a
issue #2171 : Reorder renderer files for iOS & mac project.
2013-12-17 15:40:17 +08:00
Huabing.Xu
6aa2908c13
rename:
...
1. class: GridNode->NodeGrid
2. function: setNodeGrid->setGrid getNodeGrid->getGrid setGridTarget->setTarget
3. file: CCGridNode.h&cpp->CCNodeGrid.h&cpp
2013-12-16 14:21:05 +08:00
Huabing.Xu
2be1a640fa
update Xcode project file
2013-12-13 10:58:31 +08:00
Ricardo Quesada
3b66d09bf5
Merge branch 'develop' into newRenderer
2013-12-10 11:10:55 -08:00
Ricardo Quesada
aa00137fde
Merge branch 'develop' into newRenderer
2013-12-09 11:10:00 -08:00
James Chen
8b69994d5c
issue #2790 : Removes CCBValue.
2013-12-09 17:55:56 +08:00
James Chen
d8061477c1
issue #2790 : Removes CCSort.h/.cpp from projects.
2013-12-07 14:21:01 +08:00
Ricardo Quesada
97fb43b8d7
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-06 11:19:12 -08:00
Ricardo Quesada
73b1e3bb9e
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCSprite.cpp
2013-12-06 09:37:08 -08:00
Ricardo Quesada
dcf4eacd92
update project
2013-12-05 22:24:51 -08:00
minggo
19c86c0e4f
Merge pull request #4434 from martell/msys2
...
Msys2 and Mingw added fixed x64 cocos/audio on Windows for MSVC and MinGW
2013-12-05 22:23:45 -08:00
Ricardo Quesada
e699a3b765
Uses MV in Quad Command
2013-12-05 19:04:01 -08:00
Nite Luo
42de943662
Fix Bug for Sprite performance test
2013-12-05 14:25:45 -08:00
Ricardo Quesada
f68dcd9969
Merge branch 'develop' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/Classes/tests.h
2013-12-05 11:47:46 -08:00
James Chen
b0af2667f8
Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole
...
Conflicts:
cocos/scripting/auto-generated
2013-12-05 12:48:32 +08:00
minggo
ba62c88682
Merge pull request #4420 from dumganhar/iss2790-template-container
...
[ci skip]issue #2790 : (ONLY FOR REVIEW NOW)Template Containers for Reference counted classes, Value for Pure Data
2013-12-04 20:06:24 -08:00
martell
e5ada6f377
added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors
2013-12-05 03:37:27 +00:00
Ricardo Quesada
f42aef0af8
Moves CCConsole.* to base/
2013-12-04 18:09:23 -08:00
James Chen
3649530f97
issue #2790 : Moves CCValue.h/.cpp to base folder.
2013-12-04 16:02:54 +08:00
James Chen
3136ffc3dd
issue #2790 : Adds CCValue.h/.cpp.
2013-12-04 16:02:51 +08:00
James Chen
d2bddee11e
issue #2790 : Adds CCMap.h.
2013-12-04 16:01:56 +08:00
James Chen
80004548c8
issue #2790 : Adds CCVector.h to Xcode project. int —> long
2013-12-04 15:56:08 +08:00
boyu0
98779b0a9f
issue #2771 : move CC_USE_PHYSICS from project definition to ccConfig.h
2013-12-04 14:36:32 +08:00
Ricardo Quesada
a34352cef7
Console is working!
2013-12-03 18:46:54 -08:00
Nite Luo
6862d59bb2
Add NewRenderTexture to convert RenderTexture to use new renderer
2013-12-02 17:23:52 -08:00
Nite Luo
fbadb3329a
Merge branch 'develop' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-02 10:55:31 -08:00
Ricardo Quesada
dbcae0af1e
Merge branch 'develop' into console
2013-12-02 09:57:53 -08:00
martell
1a94e393af
Setup for testing for every windows user
2013-11-30 09:36:22 +00:00
boyu0
cfe522283c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into upgrade_box2d_to_2.3.0
2013-11-28 12:19:07 +08:00
boyu0
1c55c207bf
update project setting
2013-11-28 11:55:18 +08:00
boyu0
72f2d68edd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-27 17:47:37 +08:00
boyu0
2b43e72e7c
issue #2771 : fix vs compile errors, change project setting
2013-11-27 17:33:33 +08:00
Huabing.Xu
ea46e1c658
change test case
2013-11-27 14:30:38 +08:00
Ricardo Quesada
534fd9600e
Adds CCConsole.
...
it doesn't work... just the skeleton
2013-11-26 18:58:36 -08:00
Huabing.Xu
3da196ea43
add Frustum culling to new Sprite
2013-11-27 10:35:12 +08:00
Nite Luo
92b57c79ba
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCClippingNode.h
cocos/2d/CCLayer.h
2013-11-26 11:56:03 -08:00
minggo
6c7cb0bf23
Merge pull request #4359 from Dhilan007/androdi_build
...
[ci skip]add proceed java compilation and generate apk.
2013-11-26 01:47:14 -08:00
boyu0
99d904363a
issue #2771 : delete all the box2d implementation in physics parts.
2013-11-26 13:47:42 +08:00
Dhilan007
881d43fe3b
add proceed java compilation and generate apk.
2013-11-26 11:58:01 +08:00
Nite Luo
19b8ba89e2
Merge branch 'develop' into newRenderer
2013-11-25 10:21:02 -08:00
boyu0
e55c81c9b6
upgrade box2d from 2.2.1 to 2.3.0
2013-11-25 14:50:11 +08:00
boyu0
f2dabe77ec
issue #2771 : add some method implements with box2d in PhysicsWorld
2013-11-25 10:08:52 +08:00
Nite Luo
b67ec6618f
Finish converting LayerColor start working on particle system
2013-11-22 17:14:24 -08:00
samuele3
3a69ee301b
issue #3228 : Resolve TestLua and HelloLua test samples compile error on the Xcode 4.6.2 when choose Mac platform
2013-11-22 14:06:48 +08:00
Nite Luo
f438e83104
Merge branch 'develop' into newRenderer
2013-11-20 11:14:28 -08:00
Ricardo Quesada
0d750cdbaf
Adds virtual destructors on Interfaces
...
Classes with at least one virtual function needs a virtual destructor.
This patch adds virtual destructors to Interface classes
And also enables 'warn on missing virtual destructors'
2013-11-19 16:57:23 -08:00
Nite Luo
e5ebcb2845
Merge branch 'develop' into newRenderer
2013-11-18 10:22:16 -08:00
Dhilan007
8b14575d7e
bind gui and studio.
2013-11-18 16:54:52 +08:00
Nite Luo
c5f9434331
Merge branch 'develop' into newRenderer
2013-11-15 11:33:38 -08:00
Nite Luo
566767da60
Add NewDrawNode
2013-11-15 11:29:11 -08:00
samuele3
ec9bc0069f
Modify template of lua ios_mac config and some bugs
2013-11-15 13:48:34 +08:00
Nite Luo
a70cad8c97
Merge branch 'develop' into newRenderer
2013-11-14 10:36:43 -08:00
Nite Luo
4f1858fa8a
Crate NewClipping Node
2013-11-14 10:35:28 -08:00
Nite Luo
f17af1f319
Add group command
2013-11-13 17:31:12 -08:00
samuele3
26c3266711
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-13 10:15:24 +08:00
Nite Luo
37d3601fd0
Merge branch 'develop' into newRenderer
2013-11-12 11:56:17 -08:00
Nite Luo
ab8b61aaec
Create NewSpriteBatchNode to use NewRender
2013-11-12 11:18:49 -08:00
Dhilan007
d43bc3f75d
remove unnecessary print
2013-11-12 17:53:23 +08:00
Dhilan007
e182328d51
fix incomplete copy resource
2013-11-12 16:25:39 +08:00
samuele3
cfb1cfdf65
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.h
2013-11-12 15:30:36 +08:00
Ricardo Quesada
a5eeff4f4f
fixes for android create
...
improves the message.
fixes some grammar errors
2013-11-11 16:09:32 -08:00
Nite Luo
a28f3f6f03
Merge branch 'develop' into newRenderer
2013-11-11 12:04:28 -08:00
minggo
b868c3f1dc
Merge pull request #4173 from minggo/remove-makefile
...
[ci skip]remove makefiles
2013-11-11 02:19:16 -08:00
minggo
1e15071dc7
remove makefiles
2013-11-11 17:29:48 +08:00
samuele3
7cfe890d5d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-11 17:04:37 +08:00
samuele3
06c7d3e96d
issue #2868:Add ccd lua test samples
2013-11-11 17:03:43 +08:00
James Chen
20b350a58b
Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp).
2013-11-11 16:45:44 +08:00
James Chen
4fba832fb1
Return non-zero if ndk build fails.
2013-11-09 21:05:17 +08:00
Nite Luo
fa9d8fe077
Add CustomCommand
2013-11-08 12:06:39 -08:00
Nite Luo
be71eb8626
Merge branch 'develop' into newRenderer
...
Conflicts:
.gitignore
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/2d/CCDirector.cpp
2013-11-07 17:24:57 -08:00
samuele3
16d572c04f
issue #2868:Add manual lua binding files
2013-11-07 23:22:11 +08:00
Nite Luo
3108d499e5
use placeholder logic to generate material id
2013-11-06 14:24:56 -08:00
CaiWenzhi
7a207431cd
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
...
Conflicts:
cocos/gui/UIHelper.h
2013-11-06 16:13:10 +08:00
CaiWenzhi
e0aa82da13
Merge master branch to develop branch
2013-11-06 16:04:06 +08:00
James Chen
c364c4f083
issue #3113 : Updating CMakeLists.txt, Improve Copying files.
2013-11-06 10:57:36 +08:00
samuele3
b9e5d4bc91
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-05 17:37:54 +08:00
samuele3
61d8f9673c
issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd'
2013-11-05 17:34:25 +08:00
samuele3
b76865c692
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-05 15:11:05 +08:00
samuele3
b445f0824a
issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples
2013-11-05 15:09:51 +08:00
Ricardo Quesada
2f0a19c7a3
Enables more warnings in Xcode project
2013-11-04 16:30:00 -08:00
Ricardo Quesada
ab6d620b3d
Disables arm64 for the moment
2013-11-04 15:11:20 -08:00
Ricardo Quesada
8fb5fad20d
Merge branch 'develop' into arm64
2013-11-04 15:02:35 -08:00
Ricardo Quesada
0350ac7021
arm64 support
2013-11-04 11:53:40 -08:00
Nite Luo
e4ffd250cb
Simple implementation of RenderCommand and RenderQueue
2013-11-04 09:14:22 -08:00
James Chen
bc251bcc95
[cmake] Update make-all-linux-projects.sh.
2013-11-04 21:03:09 +08:00
James Chen
733197fa65
[cmake] copy resources works.
2013-11-04 21:03:08 +08:00
James Chen
e560de6e4e
HelloCpp works.
2013-11-04 21:03:07 +08:00
minggo
b5838b800d
use python script to build template android projects
2013-11-04 16:48:17 +08:00