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
dcf4eacd92
update project
2013-12-05 22:24:51 -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
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
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
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
boyu0
99d904363a
issue #2771 : delete all the box2d implementation in physics parts.
2013-11-26 13:47:42 +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
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
566767da60
Add NewDrawNode
2013-11-15 11:29:11 -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
Nite Luo
ab8b61aaec
Create NewSpriteBatchNode to use NewRender
2013-11-12 11:18:49 -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
Nite Luo
a28f3f6f03
Merge branch 'develop' into newRenderer
2013-11-11 12:04:28 -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
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
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
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
boyu0
04c8e9f34e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-02 00:12:14 +08:00
boyu0
6d37aa8cd5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-01 17:39:09 +08:00
James Chen
c754e1b64f
Merge pull request #4035 from darkdukey/mousewheel_mac
...
issue #3099 : Adding MouseEvent and MouseListener, Adding Mouse Support For Desktop Platform.
2013-11-01 02:33:28 -07:00
James Chen
ed10b92a60
Fix of including wrong include files.
2013-11-01 15:19:10 +08:00
samuelhu
4031556398
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
2013-10-31 21:57:24 +08:00
boyu0
dec749a692
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-31 18:20:32 +08:00
boyu0
2efef34144
issue #2771 : fix vs compile errors
2013-10-31 18:18:02 +08:00
samuelhu
faf3b30e9b
issue #3069:Add LuaObjectCBridge and related test sample
2013-10-31 15:20:53 +08:00
Nite Luo
fe04448c8d
Merge folder changes from develop
2013-10-30 23:19:36 -07:00
samuelhu
70082ddc29
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-29 17:54:35 +08:00
James Chen
b4eb970589
[JSB] Fixing compilation errors for iOS and Mac projects.
2013-10-25 10:50:03 +08:00
samuelhu
0cffe51219
fix libluajia.a search path bug
2013-10-18 18:08:05 +08:00
samuelhu
4ccb13f5d0
fix libluajia.a search path bug
2013-10-18 17:37:04 +08:00
minggo
5f65cdc3c0
fix xcode compiling error and simplify android.mk
2013-10-18 15:39:09 +08:00
minggo
8f9756f030
issue #2905:TestJavascript build ok on Android
2013-10-17 11:28:57 +08:00
Ricardo Quesada
28de91d965
more Xcode fixes
2013-10-16 11:45:58 -07:00
James Chen
b5233fc18d
issue #2905 : [iOS Mac] Updating project configurations.
2013-10-16 17:27:30 +08:00
James Chen
225738ecc5
issue #2905 : [iOS Mac] HelloLua and TestLua work now.
2013-10-16 17:19:02 +08:00
James Chen
6fba0dd5db
issue #2905 : [iOS Mac] TestJavascript works now.
2013-10-16 15:43:59 +08:00
James Chen
039a2c93e1
issue #2905 : [iOS Mac]Removing 'include' folder in 'external' group. Otherwise, it will find wrong included file.
2013-10-16 11:30:56 +08:00
James Chen
65f33461bc
issue #2905 : [iOS, Mac] Updating project configuration, TestCpp works now.
2013-10-16 11:19:42 +08:00
Ricardo Quesada
8cad67a3e1
small fixes for the Xcode projects
2013-10-15 13:36:03 -07:00
James Chen
16c88363f5
issue #2905 : Updating project configuration for SimpleGame.
2013-10-14 17:16:39 +08:00
James Chen
438fe70287
issue #2905 : [iOS, Mac] HelloCpp works now.
2013-10-14 15:53:14 +08:00
minggo
4313c46e93
issue #2905:adjust folder structure
2013-10-12 11:22:05 +08:00