heliclei
514cd031b3
Merge remote-tracking branch 'upstream/develop' into fix-console-windows-crash
2014-02-25 11:09:58 +08:00
heliclei
786aae2199
add touch move support
2014-02-25 11:04:59 +08:00
boyu0
7a28f93fbf
issue #4118 : fix bit mask bug
2014-02-25 10:24:20 +08:00
andyque
f88e4be4ce
rollback gui filename change
2014-02-25 10:18:45 +08:00
andyque
8359ddd4d4
fix lua bindings error
2014-02-25 10:18:45 +08:00
andyque
f92301a872
fix jsb munaul bindings error
2014-02-25 10:18:45 +08:00
andyque
bf81591b48
fixed #3829 . change namespace gui to ui
2014-02-25 10:18:44 +08:00
James Chen
64ec1611a5
compilation error fix for win32.
2014-02-25 09:45:10 +08:00
Ricardo Quesada
18c3a8dd02
little fixes for sprite
2014-02-24 15:18:07 -08:00
James Chen
21fe4f234b
Merge pull request #5382 from boyu0/iss4039_tilemap_objectgroup_fix
...
closed #4039 : fix bug: tilemap <object> x, y, width and height value parse incorrect.
2014-02-24 22:23:05 +08:00
James Chen
dfde6938d2
Merge pull request #5452 from dabingnn/develop_CC_SPRITE_DEBUG_DRAW
...
closed #3818 : fix CC_SPRITE_DEBUG_DRAW feature
2014-02-24 21:51:24 +08:00
James Chen
b5b9c7f938
Merge pull request #5451 from Dhilan007/develop_movePDC
...
closed #4123:fixed thread deadlock if new functions are added in callback.
2014-02-24 21:43:37 +08:00
Dhilan007
387bd544bf
closed issue#4123:fixed thread deadlock if new functions are added in callback.
2014-02-24 21:08:05 +08:00
boyu0
d15009c510
issue #4039 : delete name "converted_x", "converted_y", "converted_width", "converted_height".
2014-02-24 20:14:46 +08:00
James Chen
81e7cec98f
Merge pull request #5385 from boyu0/refactor_tilemap_xml_format_index
...
refactor tilemap xml format index count.
2014-02-24 20:09:11 +08:00
Huabing.Xu
f20d487ade
closed #3818 : fix CC_SPRITE_DEBUG_DRAW feature
2014-02-24 20:02:48 +08:00
heliclei
82935b3309
replace write() with send()
2014-02-24 18:02:13 +08:00
heliclei
2f4e96527b
remove unused declare
2014-02-24 17:50:40 +08:00
heliclei
115d3e4a3b
Merge remote-tracking branch 'upstream/develop' into fix-console-windows-crash
2014-02-24 17:03:28 +08:00
James Chen
1b91234325
Merge pull request #5283 from seemk/director_cleanup_fix
...
closed #4099 : Fixed crashing when calling CCDirector's end() on win32.
2014-02-24 16:58:34 +08:00
heliclei
9777c6e2a5
use closesocket insteadof close on windows
2014-02-24 16:51:08 +08:00
boyu0
1082f3cad4
issue #4039 : change name “position_x”, “position_y”, “size_width”, “size_height” to "converted_x", "converted_y", "converted_width", "converted_height".
2014-02-24 16:39:15 +08:00
boyu0
46abf08a1d
issue #4118 : add PhysicsBody::setResting()
2014-02-24 16:29:14 +08:00
boyu0
a4cc0edb4a
issue #4118 : refactor physics update
2014-02-24 16:17:42 +08:00
James Chen
2898909130
Merge pull request #5444 from samuele3hu/developDynamic
...
issue #3956:Modifyt the mechanism of toluafix_pushusertype_ccobject to pass the real typename to lua
2014-02-24 15:29:23 +08:00
heliclei
5956c3a380
fix compile on windows
2014-02-24 15:05:20 +08:00
James Chen
b6a474b832
Merge pull request #5446 from Dhilan007/develop_movePDC
...
fix compiling error cause by using 'fmaxf'.
2014-02-24 14:48:29 +08:00
heliclei
4a2633933e
remove early cleanup
2014-02-24 14:28:19 +08:00
heliclei
02230add0c
use closeSocket() on windows
2014-02-24 14:24:14 +08:00
heliclei
be45047b6b
use send/recv to replace write/read
2014-02-24 12:01:04 +08:00
Dhilan007
b54607bfc9
only using std::max for window.
2014-02-24 11:54:58 +08:00
Dhilan007
d6cd2eb05f
fix compiling error cause by using 'fmaxf'.
2014-02-24 11:38:03 +08:00
samuele3hu
82ee8a4abd
Add some omitted modifications about “cc.ref”
2014-02-24 10:28:55 +08:00
samuele3hu
8fa8eaf64d
issue #3956:Remove some unrelated modification
2014-02-24 10:08:00 +08:00
samuele3hu
ac88d70d58
issue #3956:Update the related compile file
2014-02-24 10:01:00 +08:00
samuele3hu
a765178a5f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
2014-02-24 09:38:08 +08:00
samuele3hu
8cbe22b12b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developFix
2014-02-23 20:57:45 +08:00
samuele3hu
5f28e6bd72
Replace “cc.object” with “cc.ref” for lua binding
2014-02-23 20:56:49 +08:00
Ricardo Quesada
902b93185e
Merge pull request #5441 from ricardoquesada/api_fixed_for_3d
...
little performance improvements in culling
2014-02-23 02:03:14 -08:00
Ricardo Quesada
f77b92f1d7
performance improvements in culling
2014-02-23 02:02:28 -08:00
CocosRobot
e306c53d21
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-23 09:21:10 +00:00
Ricardo Quesada
04460750b8
culling working for both 2d and 3d projections
2014-02-23 01:09:52 -08:00
Ricardo Quesada
fe1160cd8c
changes in API to support 3D
2014-02-22 19:16:42 -08:00
Ricardo Quesada
f37c606c4e
removes unsued function
...
keeps the code cleaner
2014-02-22 17:55:03 -08:00
Ricardo Quesada
8ca746af17
Implements AABB culling for sprites
2014-02-22 17:47:56 -08:00
heliclei
92571ebe04
merge upstream/develop
2014-02-22 22:58:24 +08:00
heliclei
5376b6333e
fix CCConsole crashed on windows, windows use send/recv(winsock) instead of read/write in unix to do socket i/o, create socketWrite/socketRead to wrap socket i/o function
2014-02-22 22:37:12 +08:00
James Chen
e9c1335084
Merge pull request #5434 from Dhilan007/develop_label
...
closed #3758:fixed character will not aligned on the the baseline when label using distance field.
2014-02-21 18:29:47 +08:00
Dhilan007
821c8a73bc
closed #3758:fixed character will not aligned on the the baseline when label using distance field.
2014-02-21 18:09:52 +08:00
samuele3hu
293ea66401
issue #3956:Remove the usage of “tolua.cast”
2014-02-21 16:22:35 +08:00
James Chen
3885772e5f
Merge pull request #5263 from boyu0/iss2920_voice_recognition_input_crash_on_ios7
...
closed #2920 : fix bug: voice recognition input crash on ios7
2014-02-21 13:46:31 +08:00
James Chen
ac59006ee5
Merge pull request #5431 from dumganhar/develop
...
closed #4107 : Director::setAnimationInterval could not work on Mac platform
2014-02-21 11:58:36 +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
CocosRobot
2eadbefaeb
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-21 03:48:50 +00:00
James Chen
1ce8f0ed82
Merge pull request #5428 from dumganhar/iss4106-vector-eraseObject
...
closed #4106 : Object which isn't in Vector would also be released when invoking Vector::eraseObject.
2014-02-21 11:37:12 +08:00
James Chen
d92e995f8c
Merge pull request #5361 from Dhilan007/develop_label
...
issue #3821 : LabelBMFont re-implemented as a wrapper of Label.
2014-02-21 11:36:23 +08:00
James Chen
b300cfa1d2
issue #4106 : Updates comments for 'Vector::eraseObject'
2014-02-21 11:30:55 +08:00
James Chen
c6b2b86fe5
closed #4106 : Object which isn't in Vector would also be released when invoking Vector::eraseObject.
...
Also refactored 'Vector::eraseObject':
1) Removed 'toRelease' parameter, Vector class should manage reference count.
2) Added 'removeAll' parameter to decide wether to remove all elements with the same value or just the first occurrence .
3) Added relevant UnitTest for 'Vector::eraseObject'.
2014-02-21 11:24:37 +08:00
James Chen
2eb1c1bb73
issue #4106 : Ref class's constructor should be protected.
2014-02-21 11:21:08 +08:00
samuele3hu
e436aa4022
issue #3956:Replace Object with Ref
2014-02-21 10:22:03 +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
Dhilan007
d0e640d966
remove CC prefix.
2014-02-21 09:59:43 +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
Dhilan007
54f48b23e6
LabelBMFont re-implemented as a wrapper of Label.
2014-02-20 22:33:52 +08:00
James Chen
0e154a2bec
Merge pull request #5425 from dumganhar/develop
...
closed #2535 : TouchScriptHandlerEntry will release twice lua reference
2014-02-20 21:59:33 +08:00
James Chen
68eaa746ea
closed #2535 : TouchScriptHandlerEntry will release twice lua reference
2014-02-20 21:58:20 +08:00
James Chen
7277046ba8
Merge pull request #5423 from dumganhar/develop
...
closed #4104 : Crash if invoking Array::initWithObjects()
2014-02-20 21:45:51 +08:00
James Chen
23082c0d6c
closed #4104 : Crash if invoking Array::initWithObjects()
2014-02-20 21:44:40 +08:00
James Chen
30d100296a
Merge pull request #5422 from dumganhar/develop
...
Added virtual and override keywords to Scene::init() method
2014-02-20 21:37:46 +08:00
James Chen
0b6858bdde
Added virtual and override keywords to Scene::init() method
2014-02-20 21:37:01 +08:00
CocosRobot
6f2f35ab7a
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-20 13:11:20 +00:00
James Chen
0658355772
Merge pull request #4415 from HoGarfield/WsThreadHelper
...
closed #4103 : Potential crash when websocket connection closes
2014-02-20 20:44:55 +08:00
James Chen
95143da782
Merge pull request #4990 from daltomi/debug
...
closed #4102 : Uses 'cbegin/cend', 'const std::string' where it's reasonable.
2014-02-20 20:29:56 +08:00
James Chen
e9fa65b6f4
closed #4101 : No callback is invoked when websocket connection fails
2014-02-20 19:29:53 +08:00
James Chen
dc6839d692
Merge commit 'refs/pull/5232/head' of git://github.com/cocos2d/cocos2d-x into merge5232
2014-02-20 19:27:17 +08:00
James Chen
787dade5b0
Merge pull request #5408 from dumganhar/iss4097-disable-script
...
closed #4097 : Adds a macro to disable inserting script binding relevant codes.
2014-02-20 17:57:46 +08:00
CocosRobot
9e061b751a
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-20 09:52:15 +00:00
James Chen
7970e37bf5
closed #4097 : Adds missing include.
2014-02-20 17:23:22 +08:00
samuele3hu
e2596bce8b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
...
Conflicts:
tools/tojs/cocos2dx.ini
tools/tolua/cocos2dx.ini
2014-02-20 17:20:51 +08:00
James Chen
b1e44a7ed6
issue #4097 : Enables script bindings by default.
2014-02-20 17:02:20 +08:00
James Chen
a218369ecd
issue #4097 : fix linking error of missing functions.
2014-02-20 17:01:13 +08:00
boyu0
6f7dde3a99
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
2014-02-20 16:51:21 +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
62e0deaf35
Merge pull request #5384 from wefiends/s3tc_nomipmaps
...
closed #4096 : s3tc compressed textures with no mipmaps fail to be loaded.
2014-02-20 15:58:13 +08:00
James Chen
dd74add195
Merge pull request #5386 from heliclei/console-command
...
add more console commands: resume, pause, stopanimation and startanimation
2014-02-20 15:46:59 +08:00
CocosRobot
01bd61839b
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-20 07:38:05 +00:00
James Chen
e2cb0e3ba5
Reverts auto-generated submodule.
2014-02-20 15:14:55 +08:00
James Chen
0af0ce9032
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1
...
Conflicts:
cocos/scripting/auto-generated
2014-02-20 15:13:40 +08:00
James Chen
4cf4e15ba6
issue #4058 : Adds CCStdC.h.
2014-02-20 15:12:35 +08:00
samuele3hu
7b85ffcb82
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-20 15:11:56 +08:00
samuele3hu
514112921f
close #4094:Add deprected support for EGLView and EGLViewProtocol on the lua binding
2014-02-20 15:10:34 +08:00
minggo
196ab2caff
Merge pull request #5401 from natural-law/issue3540
...
Solve the bug: Sometimes RenderTexture not drawn after a background/foreground
2014-02-20 14:46:26 +08:00
zhangbin
9b2c5f71af
closed #3540 , Solve the bug: Sometimes RenderTexture not drawn after a background/foreground.
2014-02-20 14:43:07 +08:00
James Chen
e3d14608df
issue #4058 : Uses 'void*' instead of 'Ref*' as target of Scheduler. Any class could response scheduler callback now.
2014-02-20 14:11:47 +08:00
Nick Barrios
d9cbc5625c
CCImage.cpp: If dds header reports 0 mipmaps, force _numberOfMipmaps to 1 to enable software decoding. Set _renderFormat just once for both hardware and software decoding (moved out of "load mipmaps" loop).
2014-02-20 00:48:09 -05:00
James Chen
f7c8eb8de2
Merge pull request #5394 from samuele3hu/developEventTrigger
...
issue #3229:The second param of glGetProgramiv which was called in the tolua_Cocos2d_glGetUniformfv00 was wrong
2014-02-20 12:44:53 +08:00
James Chen
2c5f791e03
issue #4058 : Scheduler:: scheduleUpdateForTarget is a template function now. And it works perfect.
2014-02-20 11:57:04 +08:00
CocosRobot
66906c3f66
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-20 03:38:12 +00:00
heliclei
d5bef1ca35
merge pause, resume, stopanimation, startanimation into director command
2014-02-20 11:15:29 +08:00
Nick Barrios
45d751caa7
CCImage.cpp: initWithS3TCData() - When there is s3tc hardware support, set PixelFormat before loading mipmaps, to allow for textures with no mipmaps.
2014-02-19 22:13:12 -05:00
James Chen
9436173039
issue #4058 : typedef Ref Object; and deprecate it.
2014-02-20 10:58:37 +08:00
James Chen
0ea27d8543
issue #4058 : CCObject.cpp -> CCRef.cpp for all platform projects.
2014-02-20 10:56:25 +08:00
James Chen
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
Dhilan007
fd528b389d
fix warning
2014-02-20 10:24:35 +08:00
Dhilan007
ddd02b463c
optimize label:
...
1.remove unnecessary API
2.reduces object-creation and function calls.
2014-02-19 20:26:14 +08:00
Dhilan007
f086f39319
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label
2014-02-19 17:00:26 +08:00
samuele3hu
e1387f40eb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-19 16:57:18 +08:00
CocosRobot
1f45dd4349
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-19 08:27:37 +00:00
samuele3hu
d7b0efd6d7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-19 16:27:08 +08:00
samuele3hu
ce1656fa8d
fix: The lua binding of getPropertiesForGID would lead to compile error
2014-02-19 15:47:45 +08:00
boyu0
810196d25b
closed #2920 : add a variable to save shared director.
2014-02-19 14:23:41 +08:00
boyu0
49cb2ce9d5
closed #2920 : fix compile error after merge.
2014-02-19 14:12:57 +08:00
samuele3hu
52a0b906da
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-19 13:58:15 +08:00
CocosRobot
4ecd7ba58d
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-19 05:58:15 +00:00
samuele3hu
d28e8485ec
issue #3229:Lua version of GLGetUniformTest raise error on iOS when calling glGetUniformfv
2014-02-19 13:56:06 +08:00
James Chen
e1a256d6f1
Merge pull request #5319 from samuele3hu/developDynamic
...
issue #3956:Add the conversional functions which are used in the templates of lua binding-generator
2014-02-19 13:52:08 +08:00
boyu0
0b07d376f6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
2014-02-19 13:42:02 +08:00
heliclei
dd9f072429
add more commands: resume, pause, stopanimation and startanimation
2014-02-19 11:19:29 +08:00
boyu0
8be6932863
refactor tilemap xml format index count.
2014-02-19 10:41:12 +08:00
boyu0
50cdc67191
issue #4039 : set tilemap <object> x and y value to original, and add “position_x”, “position_y”, “size_width” and “size_height” value.
2014-02-18 17:44:05 +08:00
James Chen
58d3311da0
Merge pull request #5342 from heliclei/console-user-command
...
closed #4063 :revise CCConsole to support more easily for adding custom command.
2014-02-18 16:54:56 +08:00
Dhilan007
5361413383
replace [auto] with [const auto&] in FOR loop.
2014-02-18 16:41:01 +08:00
CocosRobot
97ff6c5bdf
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-18 08:04:14 +00:00
James Chen
ee4972ae96
Merge pull request #5371 from andyque/refactorActionEase
...
closed #3620 : Merge cocostudio/CCActionXxx to CCAction。
2014-02-18 15:58:49 +08:00
Dhilan007
2ad81b0edb
closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture.
2014-02-18 14:30:51 +08:00
andyque
143f5975a6
fix cross-platform comiple error
...
details:
remove CCActionEaseEx dependency
fix compile errors on android platform
fix a few inproper decalare
fix linux compile error
fix win32 compile error
2014-02-18 14:22:15 +08:00
andyque
6d392766a2
refactor easeIn, easeOut and easeInOut, elastic, bounce, back, quartic etc with free tween functions
...
finish refactor all ease action with tween functions
2014-02-18 14:22:14 +08:00
andyque
bcfa32f4e9
remove unused std::function declare
2014-02-18 14:22:14 +08:00
andyque
68b1c9f2c1
change CCTweenFunction class to tweenfunc namespace
2014-02-18 14:22:13 +08:00
andyque
838c71b135
refactor EaseIn with CCTweenFunction
2014-02-18 14:22:13 +08:00
andyque
ab11147eeb
rename namespace of CCTweenFunction to cocos2d and fix some compile errors
2014-02-18 14:22:13 +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
samuele3hu
5acb556c74
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-18 13:46:21 +08:00
samuele3hu
8cb424b535
close #3593:Add more test cases about SceneReader of cocoStudio
2014-02-18 13:44:11 +08:00
heliclei
8bad243903
remove redudant prompt
2014-02-18 12:00:23 +08:00
James Chen
19205e3db8
Merge pull request #5365 from natural-law/issue3964
...
closed #3964 : Solve the bug of Image::saveImageToPNG().
2014-02-18 11:49:09 +08:00
James Chen
34f8f0a308
Uses `malloc` instead of `new[]`, keep malloc/free matching.
2014-02-18 11:14:02 +08:00
James Chen
b4121f47fc
[Android] Don't free BitmapDC::_data in BitmapDC's destructor. Remove unused BitmapDC::env.
2014-02-18 11:07:58 +08:00
zhangbin
650331769a
closed #3964 , Use GL methods instead in function RenderTexture::newImage()
2014-02-18 10:47:14 +08:00
heliclei
007d2c507c
use local variable to reduce coupling
2014-02-18 10:32:32 +08:00
James Chen
905443d17c
new[] free mismatching after PR #5326 .
2014-02-18 10:11:04 +08:00
heliclei
7283e9fdc1
fix console hang
2014-02-17 23:29:09 +08:00
James Chen
f67f324378
Merge commit 'refs/pull/5289/head' of git://github.com/cocos2d/cocos2d-x into merge5289
...
Conflicts:
cocos/2d/platform/win32/CCImage.cpp
2014-02-17 22:10:45 +08:00
James Chen
01b9d9be56
Merge pull request #5369 from Dhilan007/develop_labttfMultiline
...
closed #4048:fixed LabelTTFMultiline test case show nothing on mac.
2014-02-17 21:45:24 +08:00
James Chen
19b1945efb
closed #4054 : Removing child from TMXLayer may cause crash.
2014-02-17 21:15:26 +08:00
heliclei
35ae3702f4
fix console readline
2014-02-17 16:49:57 +08:00
Dhilan007
4f94064242
closed #4048:fixed LabelTTFMultiline test case show nothing on mac.
2014-02-17 14:35:49 +08:00
xingsenma
1ec2d35631
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_20140103
2014-02-17 10:12:49 +08:00
zhangbin
e02f488224
Merge branch 'develop' into issue3964
2014-02-16 11:01:07 +08:00
heliclei
daf9c3f868
delete un-used code
2014-02-14 14:57:12 +08:00
heliclei
2ec75919c0
use stl map to oprate command
2014-02-14 14:54:26 +08:00
CocosRobot
a5a8ff2d87
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-14 06:22:19 +00:00
James Chen
c7b1ab4525
Merge pull request #5362 from ucchen/develop
...
closed #4037 : fix copy-paste error, all spxxx_to_jsval use lower case;
2014-02-14 14:17:33 +08:00
ucchen
185ed86214
fix copy-paste error, all spxxx_to_jsval use lower case and add missing data structs getAttachment;
2014-02-14 13:24:56 +08:00
CocosRobot
104e0b4b29
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-14 03:24:11 +00: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
32012ee72a
Adds missing files for vs.
2014-02-14 10:53:30 +08:00
James Chen
79e7d218cb
Updates Android.mk
2014-02-14 10:37:50 +08:00
James Chen
2078f6de57
Updates CMakeLists.
2014-02-14 10:34:28 +08:00
James Chen
bc222774d8
Merge pull request #5354 from CocosRobot/updategeneratedsubmodule_1392341386
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-14 09:44:22 +08:00
James Chen
8700d0f64e
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5343
2014-02-14 09:44:06 +08:00
James Chen
1693ea0ef6
Typo fix in CCDevice.mm.
2014-02-14 09:41:06 +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
CocosRobot
498a5e5b47
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-14 01:29:48 +00:00
Dhilan007
0d5c702708
move labelttf's platform-dependent code from CCImage to CCDevice
2014-02-13 21:08:43 +08:00
James Chen
933ecc4f4c
Merge pull request #5350 from bagobor/patch-1
...
Code format fix and small optimizations.
2014-02-13 20:53:58 +08:00
heliclei
05e5af7f5f
use realloc to avoid memory leaks
2014-02-13 17:15:47 +08:00
James Chen
4837b2dd2d
issue #3990 : setTotalParticles works as expected. _emissionRate has to be updated in setTotalParticles.
2014-02-13 17:01:38 +08:00
Denis
deb4666e27
-fixed formating and small optimizations
2014-02-13 11:39:53 +03:00
CaiWenzhi
cffd1e0cc5
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-02-13 16:32:57 +08:00
zhangbin
8ae5d2a049
closed #3964 , Solve the bug of logic code in method Image::saveImageToPNG().
2014-02-13 16:22:41 +08:00
heliclei
391768007b
do not allow adding same commands
2014-02-13 14:07:12 +08:00
xingsenma
4eecc7e56b
#3947 Simulate 'setTimeout' and 'setInterval' in JSB.
2014-02-13 13:54:05 +08:00
heliclei
9befe56a7e
update unit test
2014-02-13 11:10:23 +08:00
James Chen
67630311f2
Adds 'ParticleSystemQuad::updateTexCoords' method.
2014-02-13 11:03:35 +08:00
James Chen
c0b8460aef
closed #3990 : ParticleSystemQuad::setTotalParticles() can't set a value larger than the initialized value.
2014-02-13 11:03:34 +08:00
ucchen
2c961bdfbf
add spine manual binding;
2014-02-13 11:01:54 +08:00
heliclei
7c11657242
simplify add custom command
2014-02-13 10:40:57 +08:00
James Chen
4146ce69da
Merge pull request #5339 from azmeuk/jsb-linux
...
closed #3895 : Linux javascript bindings support.
2014-02-13 09:51:45 +08:00
Éloi Rivard
8adca38efa
Linux javascript bindings support.
...
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
2014-02-13 01:42:14 +01:00
Ricardo Quesada
2108ae0c35
Merge pull request #5324 from heliclei/develop
...
set prompt for async console commands
2014-02-13 08:05:07 +08:00
Éloi Rivard
4272d4fa61
Linux websockets support.
2014-02-13 00:53:51 +01:00
Éloi Rivard
3fb2b61591
Linux local storage support. Depends on libsqlite3-dev
2014-02-13 00:53:51 +01:00
Ricardo Quesada
61e4ffbc3c
quick fix for positioning the FPS on non HD
2014-02-13 04:10:23 +08:00
Ricardo Quesada
200eb9713c
Merge branch 'develop' into droid_fonts
2014-02-12 20:23:40 +08:00
James Chen
cd4478f17c
Merge pull request #5327 from chuanweizhang2013/jsruntime
...
issue #3984 : Adds JS runtime and project-creator supports creating JS runtime.
2014-02-12 18:51:30 +08:00
Ricardo Quesada
0a2d701e9f
Update verts and calls every frame
2014-02-12 08:41:32 +08:00
Ricardo Quesada
07764d03f9
Uses Droid Sans Console font for FPS and more
...
* Uses Droid Sans Console: Size 10
* Don't scale up font even if content scale factor is bigger (not needed for FPS)
* Adds better labels in FPS console
2014-02-12 06:58:34 +08:00
chuanweizhang2013
d5aee5eb04
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into jsruntime
2014-02-11 18:08:14 +08:00
boyu0
ea6edd5417
closed #3988 : fix bug Node::setRotation() moves opposite when node has a physics body.
2014-02-11 17:10:27 +08:00
heliclei
60faacab02
remove redundant return
2014-02-11 17:05:10 +08:00
heliclei
c39d9f57c8
add return
2014-02-11 17:00:09 +08:00
heliclei
f925bb17cf
add back prompts
2014-02-11 16:57:30 +08:00
heliclei
a0c3cbe054
Merge branch 'develop' of https://github.com/heliclei/cocos2d-x into develop
2014-02-11 16:50:39 +08:00
heliclei
c15fdc3161
Merge pull request #1 from cocos2d/develop
...
merge upstream/develop
2014-02-11 16:41:41 +08:00
heliclei
e7679a62b0
fix console prompt
2014-02-11 16:41:12 +08:00
heliclei
4a2fd2b52d
fix console prompt
2014-02-11 16:14:49 +08:00
CocosRobot
29bae34bc3
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-11 06:34:17 +00:00
heliclei
30942e9fba
set prompt for async console commands
2014-02-11 10:48:18 +08:00
Ricardo Quesada
ff802ed753
Merge pull request #5279 from edba/develop
...
Added getPropertiesForGID that assings value instead of returning it.
2014-02-10 12:19:47 -08:00
chuanweizhang2013
e9dd3d828a
issue #3498 : commit jsruntime
2014-02-10 18:15:30 +08:00
samuele3hu
67a48c2a85
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
2014-02-10 17:41:06 +08:00
samuele3hu
ba73217667
issue #3956:Add the conversional functions which are used in the templates of lua binding-generator
2014-02-10 15:03:53 +08:00
CocosRobot
12b5fba628
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-10 06:42:10 +00:00
James Chen
51ba0cbb17
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268
2014-02-10 14:09:57 +08:00
James Chen
6f81e7f304
Merge pull request #5256 from Dhilan007/develop_label
...
Label::reduce unnecessary calculation amount.
2014-02-10 14:08:49 +08:00
CocosRobot
4f54b36127
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-10 05:58:44 +00:00
James Chen
a05cd6fbb2
Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5311
2014-02-10 12:53:08 +08:00
Dhilan007
47e16728cc
reduce unnecessary calculation amount.
2014-02-10 12:38:32 +08:00
Dhilan007
6a662a6330
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
2014-02-10 11:47:05 +08:00
Ricardo Quesada
68143d3093
re-add missing assert
2014-02-09 19:39:56 -08:00
James Chen
99c20c4e30
Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268
...
Conflicts:
tests/test-javascript/tests
2014-02-10 11:38:56 +08:00
Ricardo Quesada
907446d8d0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices
2014-02-09 19:32:35 -08:00
Ricardo Quesada
24f655f9b1
Better 'vertices drawn'
2014-02-09 19:31:45 -08:00
Dhilan007
e12c1f57ac
Label::reduce unnecessary calculation amount.
2014-02-10 11:21:54 +08:00
James Chen
3b57f897d9
Merge pull request #5310 from dumganhar/event-disp-typo
...
Some case sensitivity fixes in EventDispatcher. e.g. xxxlisteners -> xxxListeners.
2014-02-10 11:19:45 +08:00
James Chen
9a02568eca
Some case sensitivity fixes in EventDispatcher. e.g. xxxlisteners -> xxxListeners.
2014-02-10 11:15:56 +08:00
James Chen
eda4c9a420
Merge pull request #5302 from Pisces000221/improve-label-chinese
...
closed #3933 :A string which only contains CJK characters can't make a line-break when it's needed
2014-02-10 11:03:03 +08:00
Ricardo Quesada
1c4321304c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices
2014-02-09 19:01:55 -08:00
Dhilan007
a8387a12f0
Merge branch 'improve-label-chinese' of https://github.com/Pisces000221/cocos2d-x into develop
2014-02-10 10:09:56 +08:00
James Chen
3420e9bd55
Merge pull request #5305 from hbbalfred/develop
...
close #2128 : remove the redundant check when load a file in ccbreader.
2014-02-10 09:51:50 +08:00
Ricardo Quesada
a1a914faa9
Merge branch 'develop' into fast_tmx
2014-02-08 21:30:47 -08:00
Ricardo Quesada
337271cc46
Event more improvements in the console
...
Much better help system
2014-02-08 21:29:39 -08:00
Ricardo Quesada
560abe77c8
better Console support
...
* Arguments are passed as std::string
* Adds `resolution` and `projection` command
* `texture` and `fileutils` supports the `flush` argument
2014-02-08 12:46:44 -08:00
Ricardo Quesada
13aa3ad2b5
Adds new commands to Console
...
* resolution
* projection
2014-02-08 12:35:11 -08:00
Ricardo Quesada
c7a999335c
Console. Less error prone, easier to use, more documentation
2014-02-08 10:20:12 -08:00
Ricardo Quesada
ceba63db8b
Merge branch 'develop' into fast_tmx
2014-02-08 09:08:33 -08:00
hbb
f5d4dd4afe
remove the redundant check
...
ccbreader can load file without the owner setting
2014-02-08 19:12:33 +08:00
Pisces000221
c9e4944321
Fix one character disappears when breaking line
2014-02-08 15:18:18 +08:00
Pisces000221
da2a58ccc9
Improved formatting when using both CJK and ASCII
2014-02-08 15:05:36 +08:00
Pisces000221
7484286f25
Rename ischinese_unicode as iscjk_unicode
2014-02-08 14:52:59 +08:00
Pisces000221
b5e9a4a00a
Rename ischinese_unicode as iscjk_unicode
2014-02-08 14:52:10 +08:00
Ricardo Quesada
61c8bf23b6
optimized draw
2014-02-07 22:19:03 -08:00
Pisces000221
7aebdd89a5
Added ischinese_unicode function
2014-02-08 14:15:42 +08:00
CocosRobot
c775681767
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-08 06:09:04 +00:00
Pisces000221
ae8057b933
Added ischinese_unicode function
2014-02-08 14:07:18 +08:00
James Chen
d1a0dd395c
Merge pull request #5300 from dumganhar/iss3900-sp-v27
...
closed #3900 : Upgrades spidermonkey to Firefox v27.
2014-02-08 14:04:53 +08:00
Ricardo Quesada
82700339c0
Adds a way to print the renderer vertices
2014-02-07 19:37:44 -08:00
James Chen
bca9bba8c5
A typo fix: GL::VERTEX_ATTRIB_FLAT_NONE -> GL::VERTEX_ATTRIB_FLAG_NONE.
2014-02-08 10:41:02 +08:00
James Chen
5163f1f78d
issue #3900 : Updates debugger codes to Firefox v27. 'step into' works now. congratulations! ;)
2014-02-08 10:35:03 +08:00
Ricardo Quesada
78fdabe926
more cleanup in TMX code
2014-02-07 18:33:30 -08:00
Ricardo Quesada
616feadda1
More fixes and "tiles" is an uint32 (GID)
2014-02-07 18:11:17 -08:00
Ricardo Quesada
f2836e627b
Code is cleaner
2014-02-07 17:33:27 -08:00
James Chen
6cc22ac0b0
issue #3900 : Fixes wrong include.
2014-02-07 17:26:28 +08:00
James Chen
f0418a17d3
issue #3900 : Include fix. jsapi.h and jsfriendapi.h should be included before cocos2d.h, otherwise it will cause char16_t redefinition on windows.
2014-02-07 17:04:44 +08:00
James Chen
c25787e575
issue #3900 : Removes the definition of DEBUG. Windows uses _DEBUG .
2014-02-07 16:01:57 +08:00
Ricardo Quesada
e33baac396
iso almost working
2014-02-06 22:20:28 -08:00
James Chen
03292f44e2
issue #3900 : TestJavascript could run on Mac platform with spidermonkey v27.
2014-02-07 13:09:38 +08:00
boyu0
20ee1d2666
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
2014-02-07 11:37:01 +08:00
CaiWenzhi
c1cfa1cce2
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-02-07 11:26:46 +08:00
James Chen
e4366e3e00
issue #3900 : JSBool -> bool, JS_TRUE -> true, JS_FALSE -> false.
2014-02-07 11:16:13 +08:00
James Chen
408c3fdda9
issue #3900 : JSBool -> bool, JS_TRUE -> true, JS_FALSE -> false.
2014-02-07 11:15:05 +08:00
Ricardo Quesada
ad7b54eb0e
iso almost working 100% ok
2014-02-06 18:47:45 -08:00
Ricardo Quesada
cf08d0b3f9
isometric kind of working
2014-02-06 16:19:46 -08:00
Ricardo Quesada
02af5059bf
code cleanup
2014-02-05 22:43:06 -08:00
Ricardo Quesada
314d3955b6
working!!
2014-02-05 22:36:03 -08:00
Ricardo Quesada
d3aed1124a
what is happening here?
2014-02-05 20:09:04 -08:00
Ricardo Quesada
3560227d09
sort of working
2014-02-05 19:51:24 -08:00
Ricardo Quesada
9a53f5a9f5
Testing a new TMX renderer
...
faster
2014-02-04 17:59:21 -08:00
Ricardo Quesada
822f141748
log() in win32 doesn't add extra \n
2014-02-04 08:59:56 -08:00
Maks
72ede55ac7
fix string size check and assert condition
...
1. std::string::size() return size_t (is never < 0)
2. "event must be larger than 0" and 'event' has unsigned int type
2014-02-03 22:12:03 +02:00
Maks
33a12a594e
fix timeout getting status of sockets in Console::loop()
...
'016000' - is octal constants, 016000 == 7168
http://msdn.microsoft.com/en-us/library/00a1awxf.aspx
2014-02-03 00:24:58 +02:00
James Chen
3026e6d5ca
Removes unused variable (GLViewProtocol::_delegate) and relevant method (GLViewProtocol::setTouchDelegate).
2014-02-02 20:46:15 +08:00
Siim Kallas
881757a792
Fixed crashing when calling CCDirector's end().
2014-02-01 22:10:00 +02:00
edba
4da6b97786
Added getPropertiesForGID that assings value instead of returning it.
2014-01-31 14:57:26 -08:00
Ricardo Quesada
28a6626852
Updates Windows project
2014-01-30 21:30:51 -08:00
Ricardo Quesada
924951d3b5
glview uses rect instead of size
...
this is because it could be needed if you want to create a view
inside a window in an specific position
2014-01-30 20:16:40 -08:00
CocosRobot
3198bd85ef
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-31 03:37:29 +00:00
Ricardo Quesada
c9dc113fa2
Fixes compilation issues on Android and Linux
2014-01-30 17:28:12 -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
d19a1012a4
Adds the possibility to create EAGLView with an EAGLView
2014-01-30 15:11:37 -08:00
Ricardo Quesada
f1af117a1c
code follows c++ guidelines
2014-01-30 15:11:11 -08:00
Ricardo Quesada
43a4c1937f
Add `else` to `if`
2014-01-30 15:10:52 -08:00
boyu0
3c94caa9a8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3716_refactor_physicscontact
2014-01-29 11:39:11 +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
boyu0
a5863aafb3
closed #3716 : edit lua support
2014-01-28 17:06:37 +08:00
James Chen
6a3e9d7c13
Merge pull request #5222 from martell/dutch3
...
closed #3879 : Added Dutch Language support for 3.x branch.
2014-01-28 00:30:53 -08:00
boyu0
1917ffe8b9
issue #3716 : refactor physics contact
2014-01-28 14:59:34 +08:00
boyu0
9cf659bb0a
Merge branch 'physics_event' of https://github.com/edwardzhou/cocos2d-x into iss3716_refactor_physicscontact
...
Conflicts:
cocos/physics/CCPhysicsContact.h
2014-01-28 14:35:29 +08:00
Ricardo Quesada
20346499ab
Continue with the refactoring
2014-01-27 19:16:09 -08:00
Ricardo Quesada
b96c4f1ad0
Only compile iOS files on iOS
2014-01-27 16:44:10 -08:00
Ricardo Quesada
67b62224b4
restore it to platform=10
2014-01-27 12:39:24 -08:00
Ricardo Quesada
3bb74c08ca
Merge branch 'glview_improvements' of github.com:ricardoquesada/cocos2d-x into glview_improvements
2014-01-27 10:53:12 -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
boyu0
23d2d586ed
closed #2920 : fix bug voice recognition input crash on ios7
2014-01-27 18:08:34 +08:00
CocosRobot
a2fc1cf970
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-27 09:50:08 +00:00
James Chen
fa995c27fb
Merge pull request #5257 from dumganhar/iss3871-stop-propagation-fix
...
closed #3871 : event->stopPropagation can't work for EventListenerAllAtOnce. And add relevant test case.
2014-01-27 00:35:04 -08:00
James Chen
8141397bbd
closed #3871 : event->stopPropagation can't work for EventListenerAllAtOnce. And add relevant test case.
2014-01-27 16:30:20 +08:00
Dhilan007
35cf49c26d
close #3861:fixed NativeActivity issue ANR on android 2.3 when press hardware button.
2014-01-27 15:37:36 +08:00
James Chen
abc6488b75
Merge pull request #5254 from Dhilan007/develop_label
...
close #3869:fixed Font::setCurrentGlyphCollection not saved the settings
2014-01-26 21:59:22 -08:00
Dhilan007
cb9330dfd6
close #3869:fixed Font::setCurrentGlyphCollection not saved the settings
2014-01-27 13:53:57 +08:00
James Chen
6c69626a4f
closed #3867 : "Testing empty labels" in LabelTest crashes on Linux platform.
2014-01-27 10:31:24 +08:00
samuele3hu
1ad43e676e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
2014-01-26 22:31:57 +08:00
samuele3hu
46ce35c0bd
fix:Resolve the compile error of the cast_type on vs
2014-01-26 22:30:26 +08:00
samuele3hu
d3824c9592
issue #3863:Rename the lua binding of the `registerScriptHandler` and `unregisterScriptHandler` of the SkeletonAnimation
2014-01-26 22:27:37 +08:00
James Chen
2c4faeefe0
Merge pull request #5244 from dumganhar/memory-leak-new-label
...
closed #3862 : [New Label] Memory leak in FontFreeType::createFontAtlas()
2014-01-26 06:06:45 -08:00
James Chen
1e50a93bb7
A compilation error fix in lua_cocos2dx_manual.cpp.
2014-01-26 21:54:00 +08:00
James Chen
a1b02b24ae
Merge pull request #5245 from Dhilan007/develop_label
...
fix mistake of label's transparency.
2014-01-26 05:39:56 -08:00
James Chen
75dddf390b
unsigned short int * -> unsigned short* , remove unneeded `int`.
2014-01-26 21:33:22 +08:00
James Chen
f2981adf1f
unsigned short int * -> unsigned short* , remove unneeded `int`.
2014-01-26 21:32:21 +08:00
Dhilan007
710b614680
fix mistake of label's transparency.
2014-01-26 21:19:40 +08:00
James Chen
2ee58c913c
NewLabel memory leak fix.
2014-01-26 20:53:55 +08:00
James Chen
77538c53e9
Merge pull request #5241 from dumganhar/develop
...
Some fixes:
Updates JS Test to the latest version
Remove unused files cocos/2d/cocos2dx.mk
Don't define CC_ENABLE_CHIPMUNK_INTEGATION in extension project for android.
Don't check whether CC_ENABLE_CHIPMUNK_INTEGATION is defined in CCPhysicSprite.h and CCPhysicDebugNode.h, check it in source file.
2014-01-26 04:08:05 -08:00
James Chen
551f95b83c
The implementation of Object::release was moved to cpp source file.
2014-01-26 18:34:48 +08:00
James Chen
6a302735d8
Removes unused files.
2014-01-26 17:54:13 +08:00
samuele3hu
d2cc2d4065
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
2014-01-26 17:22:49 +08:00
samuele3hu
2d66419394
close #3802 : Add the createWithTTF(text, ...) lua binding to support 3.0beta0
2014-01-26 17:21:36 +08:00
CocosRobot
8fa44baa2e
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-26 09:12:47 +00:00
James Chen
351ac4a5d7
[LUA] Adds missing cc prefix for lua classes.
2014-01-26 17:05:35 +08:00
James Chen
a4a010465c
Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071
2014-01-26 16:41:35 +08:00
CocosRobot
4862bbbd86
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-26 08:30:04 +00:00
Raymond Xie
d8b1f78039
Update WebSocket.cpp
...
bufix: when connecting fail, libwebsocket_client_connect() will return NULL, and onSocketCallback() will not be called, so we need trigger WS_MSG_TO_UITHREAD_ERROR here.
2014-01-26 15:59:14 +08:00
samuele3hu
cf684bc3f4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
2014-01-26 15:16:02 +08:00
CocosRobot
8260a2a5c1
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-26 06:56:11 +00:00
James Chen
d2893c1e1e
Merge pull request #5229 from dumganhar/iss3858-jsclass-log-fix
...
closed #3858 : Pure JS class which is inherited from cc.Class will trigger an irrelevant log.
2014-01-25 22:46:56 -08:00
James Chen
6ecc8d37c5
Fix a typo, this._is_nativeObj -> this.__nativeObj.
2014-01-26 14:45:45 +08:00
James Chen
26125f4e26
closed #3858 : Pure JS class which is inherited from cc.Class will trigger an irrelevant log.
...
Please refer to http://www.cocos2d-x.org/issues/3858 .
2014-01-26 14:41:27 +08:00
James Chen
6f45d9ca27
Merge pull request #5227 from dumganhar/iss3856-remote-debug-crash-mac
...
closed #3856 : Crash when Firefox connects to JSB application.
2014-01-25 21:55:34 -08:00
James Chen
04f2cc48a2
closed #3856 : Crash when Firefox connects to JSB application.
2014-01-26 13:54:48 +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
boyu0
682a6819cb
issue #3401 : change getContactData function return value back to pointer.
2014-01-26 12:02:42 +08:00
samuele3hu
48498f726e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
...
Conflicts:
cocos/scripting/lua/bindings/CCLuaStack.cpp
2014-01-26 11:59:54 +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
Dhilan007
c7e9cee835
updated vs project[Lua]:
...
1.add files of socket
2.fixed miss include path
3.fixed miss lib for release
2014-01-26 10:25:49 +08:00
samuele3hu
e6b1df3388
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
2014-01-26 09:46:41 +08:00
samuele3hu
7a8ecb108c
issue #3837:Add the debug support for Mac
2014-01-26 09:42:07 +08:00
martell
609ee3db2b
Added Dutch for 3.x branch
2014-01-25 20:38:15 +00:00
James Chen
98215dd4e4
Merge pull request #5221 from Dhilan007/develop_vs
...
fix link error on vs.
2014-01-25 03:43:53 -08:00
Dhilan007
b6cd40521e
fix link error on vs.
2014-01-25 19:41:20 +08:00
Ricardo Quesada
8c62fcb7ba
Merge branch 'develop' into glview_improvements
2014-01-24 14:22:25 -08:00
Ricardo Quesada
ed299202b6
Android works again
2014-01-24 13:43:46 -08:00
James Chen
f95a862718
Merge pull request #5220 from dumganhar/develop
...
Fixes two mistakes 1) Color4B(const Color3B& color), 2) A comment typo in CCObject.h
2014-01-24 06:36:44 -08:00
James Chen
8efa186649
Fixes a comment typo in CCObject.h.
2014-01-24 22:34:14 +08:00
James Chen
04d91f7e1d
Fix a mistake in Color4B(const Color3B& color).
2014-01-24 22:33:43 +08:00
James Chen
7a8f24a313
Merge pull request #5219 from dabingnn/develop_hotFix
...
3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest
2014-01-24 06:20:53 -08:00
Huabing.Xu
52ca254ecf
3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest
2014-01-24 18:39:26 +08:00
minggo
68dc82c217
Merge pull request #5203 from dumganhar/iss3713-ref-patch
...
issue #3713 : Object::release() of debug version will check whether the object was in autorelease pool.
2014-01-24 02:04:15 -08:00
minggo
cdae60b6c8
Merge pull request #5212 from samuele3hu/developBug
...
Add luasocket's support for lua
2014-01-24 02:00:15 -08:00
James Chen
b6932d580d
issue #3713 : Modifies the scope of DEBUG macro in CCAutoreleasePool.h , contains(Object* obj) should be valid in RELEASE version too.
2014-01-24 17:57:36 +08:00
James Chen
6e704b6843
issue #3713 : Adds AutoreleasePool::isClearing() for easily debugging memory issues. It only valid in DEBUG mode.
2014-01-24 17:51:36 +08:00
CocosRobot
8c3af04b72
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-24 09:48:11 +00:00
minggo
7c53586f1f
Merge pull request #5210 from Dhilan007/develop_label
...
close #3835:fix TMXMapInfo::startElement insert property to properties fail.
2014-01-24 01:32:22 -08:00
samuele3hu
e2325924e4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
2014-01-24 17:24:46 +08:00
samuele3hu
58eab72d26
issue:Add luasocket's support for lua
2014-01-24 17:24:10 +08:00
Dhilan007
6655ad79d7
use const ValueMap& for setters.
2014-01-24 16:05:38 +08:00
CocosRobot
e19c6e2caa
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-24 07:38:34 +00:00
Dhilan007
43ef9051a3
close #3835:fix TMXMapInfo::startElement insert property to properties fail
2014-01-24 15:37:32 +08:00
James Chen
3aedb8ec43
issue #3713 : Object::release() of debug version will check whether the object was in autorelease pool.
2014-01-24 14:46:06 +08:00
Dhilan007
771ed300c4
close #3642:fix bounding box of new label is incorrect.
2014-01-24 14:04:08 +08:00
James Chen
27ff8f3c68
Merge pull request #5195 from dumganhar/iss3833-ccs-scenetest-crash
...
closed #3833 : SceneTest of CocoStudio crashes
2014-01-23 20:04:43 -08:00
James Chen
2e75a86431
Merge pull request #5185 from hanjukim/develop
...
closed #3832 : color and opacity settings are invalid when alignText.
2014-01-23 19:56:45 -08:00
James Chen
c6e7093270
closed #3833 : SceneTest of CocoStudio crashes
2014-01-24 11:50:58 +08:00
James Chen
5f71d320c3
Merge pull request #5189 from samuele3hu/developNewEventDispacther
...
close #3822:Use the new event-dispatcher to update some lua test cases which used the old event-dispatcher
2014-01-23 19:41:09 -08:00
andyque
43ff0c42cf
fix a potential bug of CCSkin. It will cause the display of CCSkin wrongly.
2014-01-24 11:05:34 +08:00
Ricardo Quesada
2b92ba75b4
more fixes for new GLView API
2014-01-23 16:04:11 -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
samuele3hu
6b927fb6b0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewEventDispacther
2014-01-23 22:28:05 +08:00
samuele3hu
402d0cf7b1
issue #3822:Update the test cases which are related with touch using the `EventListenerTouchAllAtOnce` or `EventListenerTouchOneByOne`
2014-01-23 22:26:14 +08:00
Hanju Kim
1a34a6ff84
remove unused header
...
remove CC Prefix
2014-01-23 18:55:51 +09:00
James Chen
41c63e2f4d
Merge pull request #5183 from dumganhar/iss3823-fullscreen-glfw
...
closed #3823 : Fullscreen support for desktop platforms (windows, linux, mac).
2014-01-23 01:41:41 -08:00
Hanju Kim
0d05db2326
Merge remote-tracking branch 'remotes/upstream/develop' into develop
2014-01-23 18:40:07 +09:00
Hanju Kim
c042c5f3db
updateColor should be called after updating quads on alignText
2014-01-23 17:27:28 +09:00
minggo
636205147f
Merge pull request #5184 from minggo/update-version
...
update version
2014-01-23 00:26:35 -08:00
minggo
c1f503bed0
update version
2014-01-23 16:25:38 +08:00
samuele3hu
a91d9161c7
issue #3822:Update the KeypadTest using the new event-dispatcher
2014-01-23 16:17:24 +08:00
James Chen
8a6e5c1904
issue #3823 : Updates desktop/CCEGLView.h/.cpp to support fullscreen. Use EGLView::initWithFullScreen() to initialize a window with full screen.
2014-01-23 15:56:12 +08:00
Hanju Kim
d0319fea2c
Syncing develop
2014-01-23 16:43:52 +09:00
Hanju Kim
4773fd0937
Merge develop
2014-01-23 16:20:42 +09:00
Hanju Kim
39904e304d
Merge remote-tracking branch 'remotes/upstream/develop' into develop
...
Conflicts:
cocos/2d/CCLabel.cpp
2014-01-23 15:57:25 +09:00
CocosRobot
5edc28c849
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-23 05:58:35 +00:00
James Chen
49efe0acc2
Merge pull request #5177 from Dhilan007/develop_label
...
Label:Change the default parameters of TextHAlignment and let setString method do a single function
2014-01-22 21:50:22 -08:00
Dhilan007
bd97394ccc
1.Label:Change the default parameters
...
2.Label:let setString method do a single function
2014-01-23 13:42:27 +08:00
CocosRobot
b0c828b471
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-23 03:56:45 +00:00
James Chen
9292d92f63
Merge pull request #5143 from pandamicro/develop
...
closed #3806 : SAXParser was supported with manual binding in JSB
2014-01-22 19:50:15 -08:00
James Chen
aba15dfc2d
Merge pull request #5172 from dumganhar/use-unified-cceglview
...
Using unified 'desktop/CCEGLView.h/cpp' for Windows platform too.
2014-01-22 19:23:44 -08:00
James Chen
ce28972269
Updates cocos/2d/cocos2d.vcxproj.
2014-01-23 10:36:44 +08:00
James Chen
19062d716d
Updates includes path to 'desktop/CCEGLView.h'. And added windows relevant codes.
2014-01-23 10:27:42 +08:00
James Chen
9b02f97217
Updates windows project to use the unified 'desktop/CCEGLView.h/.cpp'.
2014-01-23 09:58:12 +08:00
minggo
a1729fa1b4
Merge pull request #5159 from natural-law/develop
...
Add test case for issue 2572
2014-01-22 17:49:56 -08:00
Ricardo Quesada
c48415ef3c
Merge pull request #5163 from dabingnn/develop_improve_renderer
...
Develop improve renderer
2014-01-22 17:04:19 -08:00
Ricardo Quesada
dceb9cb1b9
compiles on Linux
2014-01-22 14:17:32 -08:00
Ricardo Quesada
6b8781241c
code is cleaner
2014-01-22 13:51:01 -08:00
Ricardo Quesada
7249d3ca76
Unified CCEAGLView on Linux and Mac
2014-01-22 13:05:37 -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
pandamicro
913360e526
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-22 22:32:44 +08:00
pandamicro
d6df71cc11
Fixed #3806 : Change parameters to const &
2014-01-22 22:31:26 +08:00
James Chen
45bbbca8c6
Merge pull request #5164 from Dhilan007/develop_label
...
close #3642:fix bounding box of new label is incorrect.
2014-01-22 06:23:39 -08:00
Huabing.Xu
159f44a5dc
issue #3812 : performance improvement, 1. add vector reserve 2. use C++11 range loop
2014-01-22 18:24:23 +08:00
CocosRobot
e900504e8b
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-22 10:03:04 +00:00
Dhilan007
ec297a2c31
close #3642:fix bounding box of new label is incorrect.
2014-01-22 18:01:37 +08:00
Dhilan007
a2f5146731
close #3642:fix bounding box of the new label is a bit off.
2014-01-22 17:45:56 +08:00
James Chen
351814c0be
Merge pull request #5158 from Dhilan007/develop_label
...
Label:remove unused code and optimization performance.
2014-01-22 01:24:48 -08:00
James Chen
1b89a058fa
Merge pull request #5160 from samuele3hu/developBugFix
...
fix:Update the some test cases for lua
2014-01-22 01:21:50 -08:00
James Chen
292c5a17c6
Merge pull request #5161 from pyrasis/develop
...
[Win32] fix localStorageGetItem crash when column text is NULL.
2014-01-22 01:17:32 -08:00
samuele3hu
e1476c8d60
fix:Replace cc.TextureCache:getInstance() —> cc.Director:getInstance():getTextureCache()
2014-01-22 17:09:33 +08:00
Huabing.Xu
cc39ca4f16
issue #3812 : rename convertToWorldCoordiantes->convertToWorldCoordinates
2014-01-22 17:09:13 +08:00
CocosRobot
f9615d891e
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-22 08:57:36 +00:00
minggo
9c6a65baba
Merge pull request #5156 from minggo/deprecate-function
...
deprecated some functions in Object
2014-01-22 00:51:50 -08:00
Lee, Jae-Hong
e5d45583b7
[Win32] fix localStorageGetItem crash when column text is NULL.
2014-01-22 17:37:29 +09:00
Huabing.Xu
7ea9a4f025
issue #3812 : remove member variable _lastCommand
2014-01-22 16:03:04 +08:00
Huabing.Xu
5bbd48a9bf
issue #3812 : remove member variable _firstCommand, remove comment codes
2014-01-22 15:52:00 +08:00
samuele3hu
e848167b25
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix
2014-01-22 15:44:33 +08:00
samuele3hu
c4d2f1d83c
fix:Add the deprecated function for the “dumpCachedTextureInfo” and update the related test case
2014-01-22 15:41:46 +08:00
zhangbin
3c2ef04f2b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-22 15:39:28 +08:00
zhangbin
3007f34240
issue #2572 , Add test case for issue 2572.
2014-01-22 15:38:59 +08:00
Huabing.Xu
5397618aab
Merge branch 'develop' into develop_refactor_culling
...
* develop: (127 commits)
issue #3677 : Wrong include fix.
issue #3677 : File rename. PerformanceEventDispatcher.h/.cpp -> PerformanceEventDispatcherTest.h/.cpp.
issue #3677 : Updates Windows project to add PerformanceEventDispatcherTest.
issue #3677 : Updates Android.mk and CMakeLists.txt.
issue #3677 : Adds EventDispatcher performance test.
[AUTO] : updating submodule reference to latest autogenerated bindings
Update CHANGELOG [ci skip]
Update CHANGELOG [ci skip]
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3713 : every autorelease will cause a release operation
do not mix github access token with jenkins job trigger token
issue #3781 , Update travis-scripts, llvm-installing parts no need now.
issue #3713 : use reference in loop
issue #3781 , Minor fix & update submodule.
closed #3808 : EditBox on Mac works again.
issue #3713:fix memory leak of autoreleas pool
closed #3808 : Removes unused files for MAC platform after using glfw3 to create opengl context
global Z order uses floats
ActionsProgress test include fixes
Removed unused code and files.
...
Conflicts:
cocos/2d/renderer/CCRenderer.cpp
2014-01-22 15:37:25 +08:00
Dhilan007
4095ab36b6
update xcode project.
2014-01-22 15:22:46 +08:00
Huabing.Xu
cf6785ffcf
issue #3812 : using std::vector<QuadCommand*> to hold current batched command
2014-01-22 15:18:27 +08:00
Dhilan007
65c2e03721
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label
2014-01-22 15:08:05 +08:00
Dhilan007
df21bbf7df
1.remove unused code
...
2.reduce calculation amount.
3.reduces expenses of function calls
2014-01-22 14:57:11 +08:00
minggo
4381685a9d
deprecated some functions in Object
2014-01-22 13:47:29 +08:00
Hanju Kim
64ab0c0e35
Merge remote-tracking branch 'remotes/upstream/develop' into develop
...
Conflicts:
cocos/2d/CCFontDefinition.cpp
2014-01-22 14:15:21 +09:00
CocosRobot
97b473731d
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-22 04:20:57 +00:00
CaiWenzhi
88ef4e1cc5
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-01-22 11:58:59 +08:00
minggo
63543b0f32
Merge pull request #5151 from minggo/iss3713-replace_CCObject
...
fix memory leak of autorelease pool
2014-01-21 19:52:47 -08:00
CocosRobot
4efb5bd686
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-22 03:41:19 +00:00
minggo
562d10c89f
issue #3713 : every autorelease will cause a release operation
2014-01-22 11:40:07 +08:00
James Chen
3aac0b32a2
Merge pull request #5142 from Dhilan007/develop_label
...
close #3805:fix wrap error and alignment error.
2014-01-21 19:35:45 -08:00
minggo
c906075017
issue #3713 : use reference in loop
2014-01-22 11:03:06 +08:00
minggo
9ffcef4982
issue #3713:fix memory leak of autoreleas pool
2014-01-22 10:17:42 +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
94ea94a113
global Z order uses floats
2014-01-21 16:36:19 -08:00
Ricardo Quesada
b51b04f315
ActionsProgress test include fixes
2014-01-21 16:28:52 -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
Ricardo Quesada
e402f35e7f
BatchCommand API fixes
...
don't pass Texture Id.
Instead fetch it from the `TextureAtlas`
2014-01-21 11:13:21 -08:00
Ricardo Quesada
7a8707cb08
Merge branch 'develop' into local_z_Order_fixes
...
Conflicts:
cocos/2d/CCNode.cpp
cocos/2d/CCNode.h
2014-01-21 10:10:50 -08:00
Ricardo Quesada
f1444a26a1
Improves documentation with local z order
2014-01-21 09:26:58 -08:00
James Chen
2343d0f9cb
Merge pull request #5141 from samuele3hu/developBugFix
...
fix:Add the “setZOrder” and “getZOrder” deprecated functions of the Node class in the lua’s script and update the related test cases
2014-01-21 06:40:18 -08:00
pandamicro
30f07ccdea
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-21 18:40:10 +08:00
minggo
4833810c6e
Merge pull request #5132 from minggo/iss3713-replace_CCObject
...
remove Object::_autoReleaseCount
2014-01-21 02:26:40 -08:00
pandamicro
3de7ed93f9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
cocos/scripting/javascript/bindings/cocos2d_specifics.cpp
2014-01-21 18:18:32 +08:00
pandamicro
a467fe3244
Fixed #3806 : SAXParser supported with manual binding in JSB
2014-01-21 18:12:12 +08:00
Dhilan007
697b0289c7
close #3805:fix wrap error and alignment error.
2014-01-21 17:55:49 +08:00
samuele3hu
77b5d4c772
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix
2014-01-21 17:52:13 +08:00
James Chen
b647659c9e
Merge pull request #5138 from natural-law/develop
...
closed #2572 , Amend the arithmetic of child's position in ParallaxNode::addChild().
2014-01-21 01:51:57 -08:00
samuele3hu
2338d773dc
fix:Add the “setZOrder” and “getZOrder” deprecated functions of the Node class in the lua’s script and update the related test cases
2014-01-21 17:51:49 +08:00
minggo
6378d10d5d
issue #3713:add test case for autorelease pool
2014-01-21 17:47:59 +08:00
James Chen
b9e5484e57
Merge pull request #5139 from samuele3hu/developPerf
...
closed #3802:Add some manual lua-binding functions for the cocos2d::Lable and update the related test cases
2014-01-21 01:11:53 -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
samuele3hu
88be8606b9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerf
2014-01-21 16:46:28 +08:00
samuele3hu
da8e208f47
close #3802 : Add some manual lua-binding functions for the Lable and update the related test cases
2014-01-21 16:36:29 +08:00
zhangbin
6c0ccea547
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-21 16:33:53 +08:00
zhangbin
89c8e7e2fb
closed #2572 , The arithmetic of child's position in ParallaxNode::addChild() is wrong.
2014-01-21 16:25:35 +08:00
Hanju Kim
09579abac9
Merge remote-tracking branch 'remotes/upstream/develop' into develop
2014-01-21 17:24:07 +09:00
James Chen
12fb55a291
Merge pull request #5137 from Dhilan007/develop_crash
...
fix crash cause by string(null).
2014-01-20 21:59:38 -08:00
minggo
5fd35c3bab
Merge https://github.com/cocos2d/cocos2d-x into iss3713-replace_CCObject
2014-01-21 13:46:40 +08:00
Dhilan007
b8adba4c64
fix crash cause by string(null).
2014-01-21 11:59:43 +08:00
James Chen
8af2ac76df
Merge pull request #5136 from dumganhar/iss3789-dispatcher-global-z
...
closed #3789 : EventDispatcher supports sorting listeners by global Z and local Z order. And adds relevant test case.
2014-01-20 18:54:51 -08:00
Dhilan007
f22e4d474f
move some method to FontFreeType that only relating to FontFreeType from Font.
2014-01-21 10:36:32 +08:00
James Chen
0f9c3fa59c
closed #3789 : EventDispatcher supports sorting listeners by global Z and local Z order. And adds relevant test case.
2014-01-21 10:23:05 +08:00
minggo
ee06a5908c
issue #3713:invoke static member function to destroy singleone object
2014-01-21 10:14:00 +08:00
Dhilan007
d0e3a81d18
fix compiling error cause by undefined ssize_t on vs.
2014-01-21 09:52:43 +08:00
James Chen
1c31871543
Compilation fixes in LocalStorage. include localStorage.h.
2014-01-20 23:01:44 +08:00
James Chen
e5f723774d
Updates jsbindings and localStorage.
2014-01-20 22:45:40 +08:00
James Chen
8b6763a6ac
LocalStorage: const char* —> const std::string&.
2014-01-20 22:31:56 +08:00
James Chen
43b2217fcf
Include fix: CCFileUtils.h —> platform/CCFileUtils.h
2014-01-20 21:30:32 +08:00
James Chen
432534d857
#include “cocos2d.h” was FORBIDDEN in cocos modules. Reduces the dependence when header file changes.
2014-01-20 17:31:12 +08:00
CaiWenzhi
7d6dda5727
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-01-20 17:14:45 +08:00
minggo
3e5fbb2422
issue #3713 : remove Object::_autoReleaseCount
2014-01-20 17:08:22 +08:00
James Chen
9f793f8a9b
Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int
2014-01-20 15:03:30 +08:00
Hanju Kim
a8f21761a7
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
cocos/2d/CCFontAtlas.cpp
cocos/2d/CCFontDefinition.cpp
cocos/base/CCConsole.cpp
2014-01-20 16:03:16 +09:00
James Chen
0468a1234b
A typo fix in EventDispatcher, DirtyFlag::FIXED_PRITORY —> DirtyFlag::FIXED_PRIORITY.
2014-01-20 14:22:30 +08:00
CaiWenzhi
000d68b8b7
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-01-20 13:46:33 +08:00
CaiWenzhi
223857398d
Add "override"
2014-01-20 13:44:44 +08:00
CaiWenzhi
f10e1ee04c
optimize scissor clipping
2014-01-20 13:38:13 +08:00
James Chen
f97b40187c
closed #2789 : Adds a macro ‘’USE_STD_UNORDERED_MAP” for switching the implementation of Map<K, V> between using std::unordered_map and std::map.
2014-01-20 12:01:40 +08:00
CaiWenzhi
a3f9a636e2
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-01-20 11:54:11 +08:00
Dhilan007
802fc092be
fix compiling error cause by miss include header file.
2014-01-20 11:43:13 +08:00
Dhilan007
7d44da43c4
fix compiling error cause by include a non-existent file.
2014-01-20 11:34:31 +08:00
Dhilan007
b8943da99e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label
2014-01-20 11:24:42 +08:00
James Chen
0d4d4c53f4
issue #2789 : Improves performance for Map<K,V>::keys.
2014-01-20 11:13:29 +08:00
James Chen
5018c9ba6c
Removes unused cast in CCTMXTiledMap.cpp.
2014-01-20 11:13:29 +08:00
Dhilan007
a0b86abcf4
close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.
2014-01-20 10:32:12 +08:00
CocosRobot
47c8243812
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-18 19:53:43 +00: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
Ricardo Quesada
069a4fb170
Renderer: Don't sort z=0 Commands
...
If Command has z==0, then those elements won't be sorted.
Only Z !=0 will be sorted, and it will use `sort` instead of `stable_sort`
for z!=0, since it is faster
2014-01-17 23:10:04 -08:00
edwardzhou
86e102ab16
fix namespace in spine lua manual binding
2014-01-18 10:58:17 +08:00
James Chen
3c74044929
Merge pull request #5117 from samuele3hu/test-rebase
...
close #3626:Add the “override “ keyword
2014-01-17 18:49:33 -08:00
Ricardo Quesada
8931d968c0
Renderer uses a float as a key
...
Instead of using a 64-bit int key with viewport, opaque and depth,
it only uses a 32-bit float with only the depth.
Saves time in:
- No need to convert the 32-bit float into 24-bit int
- keys are shorter
2014-01-17 16:08:29 -08:00
samuele3hu
9d040ff09c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into test-rebase
2014-01-17 22:23:57 +08:00
samuele3hu
85539e7548
issue #3626:Add the “override “ keyword
2014-01-17 22:20:21 +08:00
CocosRobot
d485ade977
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-17 14:14:30 +00:00
James Chen
8eca8e25cb
Merge pull request #5099 from samuele3hu/test-rebase
...
close #3626:Make lua bindings-generator support the namespace binding
2014-01-17 06:07:45 -08:00
CaiWenzhi
a33465638d
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-01-17 15:24:23 +08:00
CaiWenzhi
f33064a2fc
Fixed bug of label
2014-01-17 15:22:59 +08:00
James Chen
0a6316a2f3
Merge pull request #5105 from Dhilan007/develop_label
...
close #3678:fix incorrect spacing between characters
2014-01-16 23:18:44 -08:00
James Chen
805e2ad2ba
Merge pull request #5107 from CocosRobot/updategeneratedsubmodule_1389939079
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-16 22:34:53 -08:00
Ricardo Quesada
feec6a1e8a
Adds some Asserts in the renderer
...
Linux still has a bug, but I can't reproduce it all the time.
Hoping that these asserts will help me find it
2014-01-16 22:29:25 -08:00
CaiWenzhi
58ed383c01
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-01-17 14:12:19 +08:00
CocosRobot
0c777b0d85
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-17 06:11:22 +00:00
Dhilan007
db4dc28c1a
close #3678:fix incorrect spacing between characters
2014-01-17 14:04:52 +08:00
Ricardo Quesada
1b5b9da102
compiles on Android
...
compiles on Android
2014-01-16 21:58:14 -08:00
Ricardo Quesada
cfbceb0e22
Fixes compilation issues on Linux
2014-01-16 21:49:14 -08:00
Ricardo Quesada
a74a524eaa
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into header_dependency_fixes
2014-01-16 21:36:22 -08:00
Ricardo Quesada
d0dbf34319
removes "include "cocos2d.h" from cocos2d files
2014-01-16 21:35:58 -08:00
CaiWenzhi
233faea690
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-17 13:11:29 +08:00
CaiWenzhi
bea46fa290
Add clone method to LayoutParameter
2014-01-17 13:10:04 +08:00
CaiWenzhi
602133a071
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-17 11:25:38 +08:00
samuele3hu
cf857aade2
issue #3626:Modify some files that skipped some modifications because of merge
2014-01-17 11:22:03 +08:00
James Chen
31199183b2
Merge commit 'refs/pull/5086/head' of git://github.com/cocos2d/cocos2d-x into new-label-atlas
2014-01-17 11:10:04 +08:00
James Chen
09f56f3a8b
Merge pull request #5047 from btspoony/develop
...
closed #3750 : Fix long string will be cut off by function “cc_utf8_to_utf16”.
2014-01-16 19:06:39 -08:00
samuele3hu
d086f7a259
issue #3626:Add the deprecated support for the tolua.cast
2014-01-17 10:19:57 +08:00
samuele3hu
31339d10e5
issue #3626:Add the deprecated support for the WebSocket and the XMLHttpRequest in the script
2014-01-17 10:19:57 +08:00
samuele3hu
d49e28610b
issue #3626:Resolve the error that the lua binding of the EventListenerAcceleration and the EventListenerCustom have been bound two times
2014-01-17 10:19:56 +08:00
samuele3hu
35d031ea06
issue #3626:Make the lua binding of the WebSocket and the XMLHttpRequest used in lua in the “cc” module
2014-01-17 10:19:56 +08:00
samuele3hu
de698aaea7
issue #3626:Add lua binding for ScollView and TableView classes in the cocos2d::extension namespace and the related test cases
2014-01-17 10:19:55 +08:00
samuele3hu
811aa69d39
issue #3626:Add namespace’s support for manual lua binding functions for classes related OpenGL and update the related test cases
2014-01-17 10:19:55 +08:00
samuele3hu
fdac224a7b
issue #3626:Add namespace’s support for manual lua binding functions for classes in the cocostudio and cocos2d::gui namespace
2014-01-17 10:19:55 +08:00
samuele3hu
510fce7b12
issue #3626:Add namespace’s support for manual lua binding of functions about physics
2014-01-17 10:19:55 +08:00
samuele3hu
b72f309076
issue #3626:Add namespace’s support for manual lua binding of classes in the cocos2d::extension and cocosbuilder namespace and update the related test cases
2014-01-17 10:19:54 +08:00
James Chen
4302f3886d
issue #2789 : Adds performance test for Vector and CCArray.
2014-01-17 10:02:12 +08:00
Dhilan007
f5afa09de1
remove unneeded empty line.
2014-01-17 09:46:59 +08:00
Ricardo Quesada
cb9761125b
Renderer: When not using VAOs, call...
...
... glBufferData() to update the contents, and not glBufferSubData()
since the performance is better
2014-01-16 15:02:39 -08:00
Ricardo Quesada
ce633b44ab
Adds GL::activeTexture()
...
`GL::activeTexture()` is the cached version of `glActiveTexture`
All code must use it.
2014-01-16 13:44:18 -08:00
Luis Parravicini
3210e12e1c
fixes #3734
2014-01-16 14:23:52 -03:00
Dhilan007
53be67c653
update project file.
2014-01-16 18:12:53 +08:00
Dhilan007
671b008f3d
fix compiling error cause by sprintf_s.
2014-01-16 17:50:09 +08:00
Dhilan007
a765e5e7e1
closed #3628:Integrate LabelAtlas with new Label
2014-01-16 16:37:29 +08:00
James Chen
21dc91bf78
Merge pull request #5082 from Dhilan007/develop_label
...
closed #3726:Fix crash when using unknown character.
2014-01-16 00:10:53 -08:00
James Chen
d000d9739d
Merge pull request #5084 from andyque/develop
...
closed #3683 . fixed convertToWorldSpaceAR of CCSkin returning error coordinate. This PR fixes that TestColliderDetector not working
2014-01-15 23:33:45 -08:00
andyque
4a6e137389
fixed #3683 . fixed convertToWorldSpaceAR of CCSkin returning error coordinate
2014-01-16 15:00:35 +08:00
Dhilan007
18bd978480
1.add label crash test
...
2.fix lose char when label have unknown character.
2014-01-16 14:37:07 +08:00
minggo
91b89fc647
Merge pull request #5083 from natural-law/android_bugs
...
Solve some bugs on android
2014-01-15 22:04:54 -08:00
James Chen
8dd999309b
Merge pull request #5070 from hbbalfred/develop
...
closed #3725 : Crash if file doesn't exist when using FileUtils::getStringFromFile
2014-01-15 20:01:15 -08:00
zhangbin
e7b584908e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into android_bugs
2014-01-16 11:58:49 +08:00
James Chen
ae0993bc06
Merge pull request #5072 from natural-law/develop
...
closed #3688 , LabelAtlas set a shorter string than before, the effect will be wrong.
2014-01-15 19:54:01 -08:00
Dhilan007
afe49b3a2b
1.Fix crash bug when using unknown character
...
2.Fix text align mistake
2014-01-16 11:47:06 +08:00
zhangbin
3c816c3c85
closed #3723 , Make sure the init method of Cocos2dxHelper only invoked once.
2014-01-16 11:26:23 +08:00
Ricardo Quesada
2f53cd4483
Merge pull request #5081 from ricardoquesada/renderer_optimizations
...
More renderer optimizations
2014-01-15 19:11:59 -08:00
Ricardo Quesada
3b20ad5ab7
More renderer optimizations
2014-01-15 19:10:40 -08:00
James Chen
3dddfa885e
Merge pull request #5079 from CocosRobot/updategeneratedsubmodule_1389840190
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-15 18:47:54 -08:00
CocosRobot
beb7015d7e
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-16 02:43:13 +00:00
Ricardo Quesada
f6ad3a9971
Merge pull request #5078 from ricardoquesada/sprite_fixes
...
Sprite: removed _hasChildren
2014-01-15 18:38:04 -08:00
James Chen
2e7516c582
Merge pull request #5041 from Dhilan007/develop_label
...
closed #3630:Uses a struct of TTF configuration for Label::createWithTTF to reduce parameters and make this interface more easily to use.
2014-01-15 18:37:40 -08:00
Ricardo Quesada
9b490a9124
Sprite: removed _hasChildren
...
_hasChildren has been replaced with !_children.empty()
2014-01-15 18:37:07 -08:00
hbb
5ef9eef0ae
use data.isNull() instead of !data.getBytes()
2014-01-16 10:09:04 +08:00
Dhilan007
a410c38e54
Update VS project file.
2014-01-16 09:55:13 +08:00
Ricardo Quesada
9388253606
SpriteBatchCommand and ParticleBatchCommand use the BatchCommand
...
BatchCommand is being used by SpriteBatchCommand and ParticlesBatchCommand
This improves performance in batches
2014-01-15 16:07:38 -08:00
Ricardo Quesada
65602a4574
Updates Xcode, Android and Linux project
...
with new BatchCommand
2014-01-15 16:06:47 -08:00
Ricardo Quesada
f8dc8f0b38
Renderer performance fixes
...
QuadCommand no longer stores a copy of the quads.
Instead it just stores a reference and the MV matrix.
Later, the Renderer when it copies the Quads to the queue, it will
convert the Quads to world coordinates
2014-01-15 14:35:26 -08:00
Ricardo Quesada
4278f024b8
Console::log(format, va_args) is private
...
log(format, va_args) -> static _log(format, va_args)
in order to prevent possible resolution errors with overloaded
functions.
2014-01-15 11:17:21 -08:00
CaiWenzhi
1c4399de36
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-15 20:08:50 +08:00
CaiWenzhi
fdf5a4c0b5
Fixed bug of reader.
2014-01-15 20:06:49 +08:00
Dhilan007
68eddf3cd7
fix compiling error
2014-01-15 17:29:07 +08:00
Dhilan007
629f111f7d
Relieve inherit from LabelProtocol
2014-01-15 17:21:08 +08:00
zhangbin
04d8c7514c
closed #3688 , Solve the bug : LabelAtlas set a shorter string than before, the effect will be wrong.
2014-01-15 16:35:08 +08:00
boyu0
a5c26b7da9
issue #3401 : add physics action and pump test for lua.
2014-01-15 13:52:24 +08:00
hbb
8fac676a82
add check data valid in getStringFromFile
...
so far no check would be crashed when getData faild.
maybe return an empty string is better.
2014-01-15 12:39:56 +08:00
zhangbin
60009a818e
closed #3712 , Add relative path for CCFileUtils.h in CCConsole.cpp.
2014-01-15 12:05:17 +08:00
CaiWenzhi
fc05002a77
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-15 11:11:41 +08:00
Ricardo Quesada
226054e810
Merge pull request #5067 from ricardoquesada/compile_error_fix
...
ooops
2014-01-14 18:55:34 -08:00
Ricardo Quesada
f0537f17da
ooops
2014-01-14 18:55:14 -08:00
CocosRobot
3b208337fe
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-15 02:39:20 +00:00
edwardzhou
3f62a87ef7
remove the workaround cast
2014-01-15 09:46:41 +08:00
CocosRobot
82797d8434
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-15 01:37:15 +00:00
Ricardo Quesada
2efeb32352
Merge pull request #5063 from ricardoquesada/performance_test_fixes
...
Performance Test fixes
2014-01-14 17:24:49 -08:00
Ricardo Quesada
c267c479db
Performance Test fixes
...
* SpritePerfTest: 3 new tests added
* SpritePerfTest: random() always use the same seed
* SpritePerfTest: Fixed tests 8 and 9 on retina display machines
* Console: Added 3 new commands: 'config', 'fileutils dump', 'textures'
2014-01-14 17:22:45 -08:00
Nite Luo
a18788ff0a
Fix artifects when VBO is full
2014-01-14 16:45:40 -08:00
edwardzhou
a71367a7de
fix compile error
2014-01-14 19:37:07 +08:00
edwardzhou
b9a7031f92
refactor PhysicsContact inherits from EventCustom; simplify emitting collision events
2014-01-14 19:21:09 +08:00
boyu0
de30a9cfea
issue #3401 : add lua physics slide test, add more banding code, and fix some bugs.
2014-01-14 15:48:44 +08:00
James Chen
cd1c408e6b
Merge pull request #5054 from dumganhar/iss3698-retina-mac
...
closed #3698 : Wrong display when dragging window through retina and non-retina screen.
2014-01-13 23:02:49 -08:00
CaiWenzhi
4d665bc96a
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-14 15:01:24 +08:00
CaiWenzhi
9ecc1309d9
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-14 14:52:29 +08:00
James Chen
7e1fd18f76
FLT_MIN —> FTL_EPSILON.
2014-01-14 14:38:34 +08:00
CaiWenzhi
fdfa84ce20
Fixed bugs.
2014-01-14 14:37:31 +08:00
Dhilan007
92d345156b
un-define clash with the existing macro definition in platform/win32/CCStdC.h
2014-01-14 14:20:22 +08:00
James Chen
83a42dc760
closed #3698 : Wrong display when dragging window through retina and non-retina screen.
2014-01-14 13:59:00 +08:00
Dhilan007
a1d8e8bdb1
fix compiling error cause by macro define on window platform.
2014-01-14 12:28:24 +08:00
CocosRobot
c49aa1f125
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-13 23:07:44 +00:00
Ricardo Quesada
6eed3a2b27
Adds missing copyright headers in some files
2014-01-13 14:48:12 -08:00
Ricardo Quesada
f2c3d2f3ae
Camera and Node fixes
...
OrbitCamera: added getters (public). Setters moved from `protected` to `public
: Improved API. Instead of using "out" parameters for getters, it returns a `kmVec3`
: Setters receives `kmVec3` as well. Old API is still supported
Node: `setAdditionalTransform` doesn't get `dirty` on the next frame.
Instead, once the additional transform is set, in order to remove it the user needs to pass
the identity matrix
2014-01-13 12:52:07 -08:00
BoydTang
565288f587
- fix long string will be cut off by function “cc_utf8_to_utf16” ( “cc_utf8_strlen” returns long )
2014-01-13 22:54:26 +08:00
Hanju Kim
567455dd38
convert tab to space
2014-01-13 21:28:42 +09:00
Hanju Kim
b45abf3f2d
Bug fixes for new label
2014-01-13 21:14:50 +09:00
Hanju Kim
4bbcd91bdf
Fix for compiling error for windows
2014-01-13 20:51:56 +09:00
Dhilan007
fd481d64a0
1.update lua binding configuration for label.
...
2.recover old method[createWithTTF]
2014-01-13 16:32:35 +08:00
Dhilan007
d11bfeb8d4
fix compiling error on win
2014-01-12 11:02:48 +08:00
Dhilan007
69c004108b
issue#3630:Adjust some method for more easily create and change type.
2014-01-11 22:33:07 +08:00
CocosRobot
b10783972f
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-11 04:39:03 +00:00
Ricardo Quesada
f4a99d0627
Removes DirectorDelegate
2014-01-10 20:26:15 -08:00
CocosRobot
f76fcf7f2a
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-11 04:06:53 +00:00
Ricardo Quesada
b870180af6
Mmmm... what?
...
removing useless debug message
2014-01-10 19:26:03 -08:00
Ricardo Quesada
c88f81481b
JSB compiles OK
2014-01-10 19:22:04 -08:00
Ricardo Quesada
dbcf5021a6
Compiles on Linux
2014-01-10 19:10:35 -08:00
Ricardo Quesada
9386866d56
cocos2d::log() moved to CCConsole
...
Unified console code since it is 90% similar to all platforms
2014-01-10 19:04:07 -08:00
Ricardo Quesada
c68ad76bfe
don't send "unknown command".
...
... if the command is an empty command
2014-01-10 18:11:35 -08:00
Ricardo Quesada
2316e4d55f
Debug messages are forward to the console
2014-01-10 17:58:54 -08:00
Ricardo Quesada
2a6b9fe08e
Console is a property of Director.
...
By doing this, the console lives as much as the Director.
And the Console is not started until the method "listenOnPort" is
called.
2014-01-10 17:11:14 -08:00
minggo
a013565420
Merge pull request #5023 from dabingnn/develop_layerColorBugForShaderChange
...
fix layerColor bug for shader change
2014-01-10 06:26:49 -08:00
CaiWenzhi
4e2d6143af
Fixed bug of reader
2014-01-10 17:02:16 +08:00
CaiWenzhi
af6c76c242
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-10 16:05:26 +08:00
CaiWenzhi
3f4db26a2b
Fixed bugs
2014-01-10 16:02:23 +08:00
James Chen
0088399d94
Merge pull request #5016 from akof1314/develop
...
Support MinGW with CMake for TestCpp
2014-01-09 23:13:19 -08:00
WuHuan
16367b7594
solve conflicted with math.h isnan
2014-01-10 14:20:00 +08:00
CocosRobot
8b350cb20a
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-10 03:14:18 +00:00
CaiWenzhi
ca5667cb7c
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-10 10:46:30 +08:00
Huabing.Xu
a1629a09e8
fix layerColor bug for shader change
2014-01-10 10:03:47 +08:00
Ricardo Quesada
1dc169b19f
Camera is working again
...
Projection is passed in the shader.
Since P is in the shader, QuadCommand uses `Vec3Transform` instead of `Vec3TransformCoord` since it is faster.
2014-01-09 14:26:22 -08:00
WuHuan
f87af9e998
fix linux build
2014-01-09 19:49:11 +08:00
CaiWenzhi
c3b7a9645a
Fixed bugs of "anchor point" and "update"
2014-01-09 19:00:47 +08:00
WuHuan
2f4b094598
Merge pull request #4 from cocos2d/develop
...
update
2014-01-09 02:56:21 -08:00
CaiWenzhi
13f1fdd79d
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
2014-01-09 18:45:49 +08:00
James Chen
2e4c76a5d7
closed #3644 : Keyboard pressed events are being repeatedly fired before keyboard is released.
2014-01-09 18:34:35 +08:00
James Chen
2ce23dca2a
Merge pull request #5015 from samuele3hu/developNewUI
...
closed #3643:Lua websocket can't receive more than 64 bytes of data
2014-01-09 02:12:49 -08:00
WuHuan
4dbb0ee1e8
mingw console
2014-01-09 17:48:37 +08:00
samuele3hu
8826659cf1
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-09 17:24:37 +08:00
samuele3hu
2cbe502113
issue #3643:Lua websocket can't receive more than 64 bytes of data
2014-01-09 17:23:22 +08:00
CaiWenzhi
c3b2a99be6
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
2014-01-09 17:17:52 +08:00
CocosRobot
c60681c556
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-09 09:17:11 +00:00
James Chen
2133c0e566
Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode
...
Conflicts:
cocos/2d/CCDrawNode.h
2014-01-09 17:03:08 +08:00
James Chen
3bb1fae660
Merge pull request #5010 from boyu0/fix_texture2dtest_crash_bug
...
closed #3638 : Fix Image crashes when load tga file.
2014-01-09 00:40:09 -08:00
boyu0
e34ef0d38f
change initialization _data from 0 to nullptr.
2014-01-09 16:33:31 +08:00
CaiWenzhi
1ca7642976
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
2014-01-09 15:51:24 +08:00
CaiWenzhi
19f0e55464
fixed bug of layout
2014-01-09 15:43:18 +08:00
boyu0
e063755596
fix Image crashes in mac when load tag file
2014-01-09 15:26:05 +08:00
James Chen
2c8c7a7a9d
Merge pull request #5008 from dumganhar/iss3605-websocket-4k
...
Merge PR #5003 : fix WebSocket cannot send/receive more than 4096 bytes of data
2014-01-08 23:23:42 -08:00
James Chen
f8d369248b
closed #3605 : Websocket doesn't support send/receive data which larger than 4096 bytes, renames member variables to follow cocos2d-x coding guide line.
2014-01-09 15:18:06 +08:00
CocosRobot
ce0b86e7fe
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-09 06:56:48 +00:00
Zhe Wang
a5130633c6
Merge pull request #5005 from walzer/remove_UICCLabelAtlas
...
Hide default constructor of LabelAtlas into protected, and modify related invokes.
2014-01-08 22:50:59 -08:00
walzer
1ad14340bf
issue #3627 , remove Hungarian Notation in LabelAtlas
2014-01-09 14:26:34 +08:00
walzer
8da4879560
issue #3627 , remove lua/js doxygen mark from LabelAtals constructor & destructor.
2014-01-09 14:21:43 +08:00
James Chen
b0f6ae8c42
Merge commit 'refs/pull/5003/head' of git://github.com/cocos2d/cocos2d-x into websocket-test
2014-01-09 14:16:44 +08:00
walzer
d15874fdf7
fixed #3627 , an extra benefit from adding LabelAtlas::create() is that we can hide its default constructor into protected.
2014-01-09 14:16:26 +08:00
edwardzhou
480a9277da
fix WebSocket cannot send/receive more than 4096 bytes of data
2014-01-09 13:29:56 +08:00
CocosRobot
2945322b97
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-09 04:50:38 +00:00
walzer
7055340ace
fixed #3627 . There're no UICCLabelAtlas any more.
2014-01-09 12:43:57 +08:00
walzer
2d8fcb2c00
issue #3627 , remove UICCLabelAtlas, add LabelAtlas::create() for GUI module
2014-01-09 12:40:51 +08:00
James Chen
ac547cedca
Merge pull request #4999 from CocosRobot/updategeneratedsubmodule_1389238661
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-08 19:38:18 -08:00
CocosRobot
746a360176
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-09 03:37:44 +00:00
James Chen
23dec543b3
Merge pull request #4995 from Dhilan007/develop_crash
...
amendment incorrect use of macro
2014-01-08 19:30:29 -08:00
CaiWenzhi
4cadcca497
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
2014-01-09 11:01:47 +08:00
CocosRobot
e66468025d
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-09 02:59:53 +00:00
CaiWenzhi
dc443e36d3
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
2014-01-09 09:59:39 +08:00
CaiWenzhi
e3667a2894
Fixed bugs.
2014-01-09 09:58:27 +08:00
Dhilan007
fe7d5cbdfb
update If Construct
2014-01-09 09:46:17 +08:00
Dhilan007
d18da42695
fix addImageAsync bad judgment of generate image for the first ImageFile.
2014-01-08 23:42:54 +08:00
WuHuan
1cd68accc1
Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop
2014-01-08 17:03:44 +08:00
WuHuan
954ee61022
testcpp mingw
2014-01-08 16:58:36 +08:00
WuHuan
668c4b83ef
Merge pull request #3 from cocos2d/develop
...
update
2014-01-08 00:44:40 -08:00
James Chen
eb8f621ab0
closed #3597 : Uses !xxx.empty() instead of xxx.size() > 0.
2014-01-08 10:47:27 +08:00
James Chen
685b80796b
Merge commit 'refs/pull/4846/head' of git://github.com/cocos2d/cocos2d-x into iss3597-particle-plist
2014-01-08 10:36:51 +08:00
Daniel T. Borelli
939e94d568
const correctness
2014-01-07 22:09:43 -03:00
Daniel T. Borelli
bf5515d936
unnecessary assignment
2014-01-07 21:27:20 -03:00
Daniel T. Borelli
50faabe4be
fix typo CCGeometry private function
2014-01-07 20:28:59 -03:00
Daniel T. Borelli
1d435a3e8e
const correctness: use cbegin/cend, const std::string
2014-01-07 18:02:31 -03:00
minggo
6529380b77
Merge pull request #4988 from dumganhar/develop
...
If this.ctor was not found, output a log.
2014-01-07 06:41:53 -08:00
James Chen
65b5a7c031
If this.ctor was not found, output a log.
2014-01-07 22:39:14 +08:00
James Chen
20f2f7255e
Merge pull request #4986 from CocosRobot/updategeneratedsubmodule_1389104844
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-07 06:28:04 -08:00
CocosRobot
a650ddf88b
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-07 14:27:34 +00:00
minggo
ac8a7b4ce1
Merge pull request #4983 from dabingnn/develop_layerColorBug
...
fix layerColor occlude sprite bug on android
2014-01-07 06:25:59 -08:00
samuele3hu
a61f9fce27
Fix:Resolve the pLengthSQ’s error in the Cocos2d.lua
2014-01-07 22:16:07 +08:00
Huabing.Xu
b1d9d5e55e
fix layerColor occlude sprite bug on android
2014-01-07 22:08:00 +08:00
James Chen
01745f5ba6
Merge pull request #4980 from CocosRobot/updategeneratedsubmodule_1389101321
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-07 05:46:08 -08:00
James Chen
1d852788e2
[Spine] Saves old transform matrix in Skeleton::draw, uses it in ::onDraw.
2014-01-07 21:40:06 +08:00
CocosRobot
6fd72db513
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-07 13:28:43 +00:00
James Chen
9387e516be
[JSB] Fix for SpineTest didn’t show anything. Skeleton uses new renderer.
2014-01-07 21:19:51 +08:00
James Chen
c7639319ee
Fix Armature::init() crashes
2014-01-07 20:53:44 +08:00
James Chen
e90f35daa6
Merge pull request #4975 from chengstory/fix_UIAction_play_error
...
fixed UIAction play error.
2014-01-07 03:17:41 -08:00
zhangcheng
bf8187fee2
fixed UIAction play error.
2014-01-07 19:04:18 +08:00
James Chen
54cbfe938b
Merge pull request #4973 from CocosRobot/updategeneratedsubmodule_1389091226
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-07 02:41:53 -08:00
CocosRobot
ab84228037
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-07 10:40:28 +00:00
James Chen
18963b46f5
Merge pull request #4971 from Dhilan007/develop_crash
...
update liblua vs project for add miss file.
2014-01-07 02:31:58 -08:00
Dhilan007
ba4833e070
update liblua vs project for add miss file.
2014-01-07 18:30:12 +08:00
James Chen
ac3697db19
fix for jsval_to_ssize and ssize_to_jsval, it only supports 32 bits now. Otherwise, (string).toFixed(0) will fails. Do we need 64 bit for JS?
2014-01-07 18:28:46 +08:00
James Chen
5391024399
Adds override keyword.
2014-01-07 18:27:04 +08:00
James Chen
26efb4bf5c
long —> ssize_t for some classes.
2014-01-07 18:26:31 +08:00
CocosRobot
6967caeff9
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-07 09:47:05 +00:00
CocosRobot
7e142d79f7
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-07 09:05:07 +00:00
James Chen
44a02ba466
Merge pull request #4958 from edwardzhou/rename_UIHelper
...
rename UIHelper to Helper for consistency
2014-01-07 00:57:35 -08:00
minggo
feb4ac1cdb
Merge pull request #4959 from minggo/actionprogress-fade-tint
...
ActionProgress has fade and tint effect
2014-01-07 00:32:43 -08:00
minggo
1275d03c77
add override
2014-01-07 16:30:12 +08:00
minggo
6bb4f9822a
ActionProgress has fade and tint effect
2014-01-07 16:23:58 +08:00
edwardzhou
e1c21aa9cb
rename UIHelper to Helper for consistency
2014-01-07 16:22:18 +08:00
James Chen
d733556270
Merge pull request #4955 from CocosRobot/updategeneratedsubmodule_1389081296
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-07 00:00:19 -08:00
James Chen
49ca35fc3d
Merge pull request #4956 from dumganhar/move-temp-obj
...
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build' folder.
2014-01-06 23:58:42 -08:00
CocosRobot
f8e7f570f3
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-07 07:54:58 +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
James Chen
2a3481f20c
Moves temp files to CURRENT_BINARY_DIR.
2014-01-06 23:44:36 -08:00
Ricardo Quesada
aa2168f66f
RenderQuad with bigger size
...
It uses 18 bits for texture id
and 10 bits for shader id
This is a temporal fix
2014-01-06 23:41:01 -08:00
James Chen
2eb8691f6a
Merge pull request #4946 from dumganhar/linux-template-fix
...
Linux template update
2014-01-06 20:57:28 -08:00
Zhe Wang
9b6027d284
Merge pull request #4947 from walzer/develop
...
udpate copyrights for the new year 2014 and Chukong.
2014-01-06 19:50:18 -08:00
James Chen
b4da4071e7
Merge pull request #4943 from CocosRobot/updategeneratedsubmodule_1389065122
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-06 19:48:36 -08:00
walzer
d4c1aa92d5
add copyrights for 2014, in folders other then 2d.
2014-01-07 11:47:11 +08:00
minggo
49d314363f
Merge pull request #4945 from dabingnn/develop_label_shaderBug
...
fix label fnt bug for wrong shader
2014-01-06 19:44:06 -08:00
Huabing.Xu
6c6da4cf77
fix label fnt bug for wrong shader
2014-01-07 11:39:55 +08:00
James Chen
c965131a08
Uses relative path for kazmath/CMakeLists.txt and physics/CMakeLists.txt.
2014-01-06 19:33:28 -08:00
CocosRobot
641255e3ef
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-07 03:25:39 +00:00
walzer
64af0de648
update copyrights for 2014, in cocos/2d/ folder
2014-01-07 11:25:07 +08:00
boyu0
f7c88a8134
issue #3401 : update cmake project set
2014-01-07 11:09:40 +08:00
minggo
721181632b
Merge pull request #4930 from Dhilan007/develop_crash
...
fix error for load spriteFrames from plist in CCAnimationCache class.
2014-01-06 18:57:47 -08:00
James Chen
465b33f162
Merge pull request #4941 from samuele3hu/developNewUI
...
Fix:Resolve the release version of lua test sample compile error
2014-01-06 18:29:38 -08:00
boyu0
8e64ef6d6d
issue #3401 : add physics lua auto generate to android.mk
2014-01-07 10:20:59 +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
samuele3hu
c553fd2b73
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-07 10:10:17 +08:00
samuele3hu
01013195d3
Fix:Resolve the release lua test sample compile error
2014-01-07 10:08:58 +08:00
CaiWenzhi
8cfc6fcafb
Remove useless samples
2014-01-07 09:47:46 +08:00
boyu0
eaa3041a97
issue #3401 : physical lua banding script, add testlua->physics test
2014-01-06 22:19:40 +08:00
Dhilan007
aec4045797
fix error for load spriteFrames from plist in CCAnimationCache class.
2014-01-06 20:23:45 +08:00
James Chen
559e5b771f
Merge pull request #4928 from dumganhar/more-warning-fix
...
More warning fixes
2014-01-06 04:18:22 -08:00
James Chen
75804ac8a2
Warning fix in ccUTF8.cpp/h
2014-01-06 20:04:09 +08:00
James Chen
1bd0f90437
Warning fix in js_manual_conversions.cpp/h
2014-01-06 20:02:01 +08:00
James Chen
dd0e157c74
Warning fix in CCTextFieldTTF.cpp.
2014-01-06 20:01:28 +08:00
James Chen
ea60dbb640
Fixing ‘ActionTest->AnimationTest’ crashes. It should return empty ValueMap/ValueVector when Value::asValueVector/Map is invoked in empty Value.
2014-01-06 19:55:59 +08:00
James Chen
2818677795
Merge pull request #4913 from nutty898/develop_nutty_modify_framework_fixedmemleak
...
Develop nutty modify framework fixedmemleak
2014-01-06 00:24:36 -08:00
minggo
9b44e80cf2
Merge pull request #4900 from dabingnn/develop_SpriteBatchNodeShaderBug
...
init shader on construction instead of draw in class CCSpriteBatchNode
2014-01-06 00:11:59 -08:00
CaiWenzhi
60b340f2cd
Modify wrong codes
2014-01-06 15:59:21 +08:00
CaiWenzhi
81836d8aeb
Merge branch 'develop' into develop_nutty_modify_framework_fixedmemleak
2014-01-06 15:57:19 +08:00
James Chen
34bd322a10
Merge pull request #4911 from chengstory/fixesBugs_Develop
...
Fixes bugs on cocos2dx 3.x
2014-01-05 23:13:30 -08:00
CaiWenzhi
4d1d225bd1
Fixed bugs and memory leak
2014-01-06 15:07:04 +08:00
chengstory
e44d28ea7b
replace CC_SAFE_RELEASE to CC_SAFE_RELEASE_NULL
2014-01-06 13:27:19 +08:00
CaiWenzhi
63fbec05e9
Modify wrong codes
2014-01-06 12:19:59 +08:00
CaiWenzhi
2450841a5f
Merge branch 'develop' into develop_nutty_modify_framework_optimizeclipping
2014-01-06 12:13:24 +08:00
minggo
e4bec7d1ef
Merge pull request #4902 from Dhilan007/develop_crash
...
fix TextInput not show IME on android.
2014-01-05 19:50:19 -08:00
Dhilan007
5b317196c8
fix TextInput not show IME on android.
2014-01-06 11:45:18 +08:00
CaiWenzhi
99d842d954
Merge branch 'develop' into develop_nutty_modify_framework_optimizeclipping
2014-01-06 11:39:01 +08:00
Huabing.Xu
381be48c56
init shader on construction instead of draw in class CCSpriteBatchNode
2014-01-06 11:26:00 +08:00
James Chen
d74d21a6f0
Merge pull request #4884 from daltomi/debug
...
Proposal: remove boolean flag, The pointer *atlas == item.second not change in map::erase().
2014-01-05 19:08:37 -08:00
CaiWenzhi
1282debad5
Merge branch 'develop' into develop_nutty_modify_framework_addNode
2014-01-06 11:03:08 +08:00
CaiWenzhi
ad30f8ff96
Fixed bug of clippinglayout
2014-01-06 10:56:33 +08:00
chengstory
e1b36e2e20
Merge branch 'develop' into #3585
2014-01-06 10:43:44 +08:00
chengstory
76f96d0b41
fixed ActionNode memoryleak.
2014-01-06 10:42:17 +08:00
CocosRobot
cc4bee319c
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-05 10:43:05 +00:00
minggo
fcfa6744f4
make TMXLayer::getProperties() return reference
2014-01-05 18:20:29 +08:00
CocosRobot
5f8d4f867c
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-05 05:52:52 +00:00
chengstory
877c6dddf3
fixed #3582
...
1. CCScene -> Scene.
2014-01-05 13:16:23 +08:00
chengstory
4893c561db
Merge branch 'develop' into #3582
2014-01-05 12:43:41 +08:00
chengstory
bd9dc274f8
fixed #3482
...
1. add override to virtual functions.
2. replace std::string::npos to filePath.npos.
3. replace std::string to const std::string& .
2014-01-05 12:42:39 +08:00
James Chen
03200374b0
Merge pull request #4887 from Dhilan007/develop_crash
...
fix crash related to not support the z length modifier for size_t on vs
2014-01-04 20:10:40 -08:00
Dhilan007
49d8b76b9e
fix crash related to not support the z length modifier for size_t on vs
2014-01-05 11:59:32 +08:00
chengstory
10fec47b04
fixed #3582 update libCocoStudio windows project.
2014-01-05 11:38:01 +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
chengstory
7efacc4890
issue #3582 void serialize(void *r) -> bool serialize(void *r)
2014-01-05 01:13:16 +08:00
James Chen
7d2ec6c2c6
Merge pull request #4881 from dumganhar/utf16-to-utf8-error
...
compilation error fix. ssize_t -> int
2014-01-04 06:22:09 -08:00
James Chen
f94221a93b
compilation error fix. ssize_t -> int
2014-01-04 22:21:14 +08:00
CocosRobot
f44775b581
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 14:05:19 +00:00
James Chen
2c47690ebb
Merge pull request #4878 from dumganhar/utf16-to-utf8-error
...
Wrong warning fixes correct in ccUTF8.cpp.
2014-01-04 05:58:18 -08:00
James Chen
3c04d586b0
Wrong warning fixes correct in ccUTF8.cpp.
2014-01-04 21:54:05 +08:00
James Chen
42356e8597
Exchanges order of Sprite::setSpriteFrame(string), Sprite::setSpriteFrame(frame) . It’s needed for bindings-generator to generate correct binding glue codes.
2014-01-04 21:53:03 +08:00
CocosRobot
0b2926cb70
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 11:09:00 +00:00
samuele3hu
362c1dc0ea
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-04 18:37:34 +08:00
samuele3hu
465aba951c
Fix:Remove the ScollView and TableView of extension gui lua binding
2014-01-04 18:36:33 +08:00
Daniel T. Borelli
08dad98592
map:erase() is safe for item.second == FontAtlas*
2014-01-04 07:22:50 -03:00
CocosRobot
c793f2e0fc
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 10:19:07 +00:00
James Chen
6827538802
Adds override keyword for override functions.
2014-01-04 18:12:09 +08:00
James Chen
17be52740a
Removes duplicated file in Android.mk
2014-01-04 16:57:46 +08:00
James Chen
284d845f2f
Merge commit 'refs/pull/4795/head' of git://github.com/cocos2d/cocos2d-x into merge4795
2014-01-04 16:55:40 +08:00
samuele3hu
70ee13e2e1
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-04 15:46:27 +08:00
samuele3hu
0550ec33ad
Fix:Resolve the bugs that some lua test cases can’t run
2014-01-04 15:46:04 +08:00
CocosRobot
ad11468b7b
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 07:40:50 +00: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
98265e7961
Reverts GUIReader definition. it should be inherited from Object to make bindings happy.
2014-01-04 15:17:36 +08:00
James Chen
b2dc16c065
closed #3580 : FileUtilsTest->TextWritePlist crashes
2014-01-04 15:03:46 +08:00
WuHuan
e972c97dcf
support mingw
2014-01-04 14:40:22 +08:00
James Chen
ef5ab1b9be
sharedXXX -> getInstance, purgeXXX -> destroyInstance.
2014-01-04 14:23:40 +08:00
James Chen
43cdf1713b
Merge pull request #4864 from daltomi/test
...
fix bad name variable CCDirector
2014-01-03 21:44:42 -08:00
Daniel T. Borelli
d10992951b
fix bad name variable
2014-01-04 02:22:09 -03:00
James Chen
98346474b8
Merge pull request #4863 from Dhilan007/develop_crash
...
fix compiling error and miss file on vs.
2014-01-03 20:41:19 -08:00
Dhilan007
35246b0810
fix compiling error and miss file on vs.
2014-01-04 12:25:12 +08:00
CocosRobot
e42f721c6b
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 04:22:17 +00:00
James Chen
44105c5d01
Merge pull request #4861 from dumganhar/develop
...
Fixing CocoStudio bindings error.
2014-01-03 20:12:05 -08:00
James Chen
322cf0d233
Fixing CocoStudio bindings error.
2014-01-04 12:11:10 +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
CocosRobot
d29cdb5b52
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 03:58:44 +00:00
James Chen
55e45d44c4
Merge pull request #4810 from chengstory/#3480
...
Update SceneReaderTest Samples
2014-01-03 19:49:28 -08:00
James Chen
9342ae105a
issue #3577 : const_iterator —> iterator for Vector::erase(first, last). Makes android build happy.
2014-01-04 11:41:06 +08:00
James Chen
ebf6d07720
issue #3577 : iterator —> const_iterator since Map::getRandomObject is a const function.
2014-01-04 11:41:05 +08:00
James Chen
f55be38ad8
Merge pull request #4853 from Dhilan007/develop_crash
...
fix label not appear on the screen
2014-01-03 19:00:06 -08:00
CocosRobot
0ed307a583
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 02:58:59 +00:00
Dhilan007
b14999a7a7
fix label not appear on the screen
2014-01-04 10:56:14 +08:00
James Chen
32546b58f9
Merge pull request #4840 from nutty898/develop_nutty_modify_framework_addNode
...
Develop nutty modify framework add node
2014-01-03 18:53:51 -08:00
James Chen
f3eb21e748
Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash
...
closed #3579 : TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
2014-01-03 18:51:16 -08:00
James Chen
61af958976
closed #3579 : Bug fix in setTouchEnabledForLayer for jsbindings.
2014-01-04 10:32:04 +08:00
James Chen
baeacaddfc
closed #3579 : Bug fix in setTouchEnabledForLayer for luabindings.
...
Also fixed lua module error.
2014-01-04 10:30:11 +08:00
James Chen
0082cf3e4d
closed #3579 : TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
2014-01-04 10:28:09 +08:00
Ricardo Quesada
76960ab83a
Merge pull request #4851 from ricardoquesada/node_vertex_z_fix
...
Node vertex Z fix
2014-01-03 17:55:32 -08:00
Ricardo Quesada
5a0284c183
Node vertex Z fix
...
Node correctly sets the Z vertex in getNodeToParentTransform(),
and not in transform().
This is the correct thing to do, and also fixes possible collisions
with the additionalTransform (eg: Camera)
2014-01-03 17:54:07 -08:00
CocosRobot
54ee3392fc
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-04 01:40:17 +00:00
minggo
964d327db9
Merge pull request #4848 from dumganhar/more-warning-fixes
...
More warning fixes.
2014-01-03 17:31:02 -08:00
minggo
93f3545154
Merge pull request #4842 from Dhilan007/develop_crash
...
update js binding for studio change.
2014-01-03 17:29:14 -08:00
James Chen
46153d8c34
More warning fixes.
2014-01-04 09:17:37 +08:00
Ricardo Quesada
a7b33e3ec3
Fixes NodeToWorld
...
Multiplication was in the incorrect order
2014-01-03 14:21:33 -08:00
Dawid Drozd
b7314cd655
Fix for missing field in particle file.
2014-01-03 21:27:08 +01:00
Dawid Drozd
43ce4fa546
Fixed mistake in documentation addImage doesn't support gif format
2014-01-03 21:22:05 +01:00
Dhilan007
e017609fc4
fix compiling error in jsb_cocos2dx_studio_manual.cpp on android.
2014-01-03 23:59:05 +08:00
Dhilan007
b6e676caa4
fix warn and compiling error in jsb_cocos2dx_studio_manual.cpp.
2014-01-03 23:03:48 +08:00
Dhilan007
b4d392dc38
update js binding for studio change.
2014-01-03 21:33:48 +08:00
CaiWenzhi
8c5678a59e
Modify wrong codes.
2014-01-03 20:35:14 +08:00
CaiWenzhi
785e1740e4
Add "addNode" methods
2014-01-03 20:29:16 +08:00
chengstory
20b118739e
Merge branch 'develop' into #3480
2014-01-03 20:20:18 +08:00
CaiWenzhi
24a9f57b8e
Merge branch 'develop' into develop_nutty_modify_framework_optimizewidgets
2014-01-03 20:05:49 +08:00
Liam
0e42c1c369
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
2014-01-03 19:53:23 +08:00
chengstory
7f8224b621
Merge branch 'develop' into #3480
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
2014-01-03 19:36:22 +08:00
CocosRobot
126c315673
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-03 11:32:54 +00:00
chengstory
46c7338008
fixed #3480
...
1. remove unused getnode and setnode interface.
2. add condition test.
3. Modify ComAttribute to support for parse json file.
4. Replace scenereader callback function to C++ 11 implement.
2014-01-03 19:30:47 +08:00
minggo
5ad3414921
Merge pull request #4834 from minggo/bug-fix
...
Put "initxx" functions into protected.
2014-01-03 03:27:55 -08:00
CaiWenzhi
a7f482fbf9
Merge branch 'develop' into develop_nutty_modify_framework_optimizewidgets
2014-01-03 19:17:26 +08:00
CaiWenzhi
3ccb80085f
Fixed bugs of page view
2014-01-03 19:14:17 +08:00
minggo
4fc7ad6e3d
Merge pull request #4791 from dabingnn/develop_clippingNodeMobile
...
fix bug clippingNodetest on mobile
2014-01-03 02:36:52 -08:00
minggo
1d04b42947
Put "initxx" functions into protected.
2014-01-03 18:15:56 +08:00
James Chen
86598edb73
Merge pull request #4829 from CocosRobot/updategeneratedsubmodule_1388738242
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-03 00:39:24 -08:00
CocosRobot
37c8b03253
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-03 08:37:25 +00:00
James Chen
c5ec24195a
Merge pull request #4821 from nutty898/develop_nutty_modify_framework_optimizewidgets
...
optimize button
2014-01-03 00:35:48 -08:00
James Chen
5346677a47
Merge pull request #4825 from samuele3hu/developNewUI
...
Update the lua test cases about the armature
2014-01-03 00:29:24 -08:00
CaiWenzhi
a32976802a
Merge branch 'develop' into develop_nutty_modify_framework_optimizewidgets
2014-01-03 15:50:35 +08:00
CaiWenzhi
767bf81e90
Modify renderers draw order define.
2014-01-03 15:46:42 +08:00
Dhilan007
8e2c51d31e
update vs project for split spine binding.
2014-01-03 15:29:50 +08:00
CaiWenzhi
9c0e669e09
Add "override"
2014-01-03 15:14:48 +08:00
samuele3hu
a72cf0428c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-03 14:53:15 +08:00
samuele3hu
2b19da00df
Update the lua test cases about the armature
2014-01-03 14:51:36 +08:00
CocosRobot
0661d87cdb
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-03 05:02:28 +00:00
James Chen
ac6b72450f
Merge pull request #4816 from samuele3hu/developNewUI
...
Update the lua test cases about the GUI
2014-01-02 20:53:19 -08:00
CaiWenzhi
7d8d645c70
Modify "include"
2014-01-03 12:15:42 +08:00
CaiWenzhi
e734f3ccaf
optimize button
2014-01-03 12:14:21 +08:00
andyque
88efbfc9cc
remove srand function call
2014-01-03 11:56:58 +08:00
andyque
774542a341
fix compile error of getRandomObject in map
...
and add srand to vector and map
2014-01-03 11:53:16 +08:00
samuele3hu
53f2415fcf
Resolve the android compile error
2014-01-03 11:29:56 +08:00
samuele3hu
51e3e3fd1b
Resolve the android and linux compile error
2014-01-03 11:15:46 +08:00
James Chen
4de2f82bd2
Merge pull request #4815 from andyque/fix
...
ix move assignment operator doesn't clear previous content bug
2014-01-02 18:55:41 -08:00
samuele3hu
bfc7441453
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-03 10:51:05 +08:00
samuele3hu
cdc82d6e8c
Add a newline
2014-01-03 10:50:06 +08:00
andyque
67153f816c
remove unused code
2014-01-03 10:44:43 +08:00
samuele3hu
c4588722dd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-03 10:41:03 +08:00
andyque
0e90ef8337
fix move assignment operator doesn't clear previous content bug
2014-01-03 10:39:53 +08:00
samuele3hu
07a3efb585
Update the lua test cases about the GUI
2014-01-03 10:39:19 +08:00
James Chen
04760f2508
[Android] Adds jsb-spine module. TestJavascript now depends on jsb-spine module.
2014-01-03 10:30:55 +08:00
andyque
c68efd7c5c
Merge remote-tracking branch 'upstream/develop' into develop
2014-01-03 09:39:10 +08:00
chengstory
e08e4ce0f8
fixed #3480 add search paths.
2014-01-03 02:21:36 +08:00
chengstory
77dca5958f
issue #3480 upload Samples resources.
2014-01-03 02:03:05 +08:00
chengstory
5903a74bd2
issue #3480
...
1. add getNode and setNode class function to Component.
2. fixes some build error.
2014-01-03 01:42:14 +08:00
chengstory
6892d8cf6a
issue #3480
...
1. add SceneReader Tests.
2. Modify class member name.
2014-01-03 01:14:12 +08:00
James Chen
0fe73f3a5d
Merge pull request #4804 from minggo/android-config
...
don't build spine module when build 2d module
2014-01-02 06:53:15 -08:00
James Chen
831e0b08e0
Merge pull request #4807 from dumganhar/iss3291-xmlhttprequest-error-fix-develop
...
closed #3291 : XMLHttpRequest.status needs to be assigned even when connection fails.
2014-01-02 06:46:25 -08:00
CocosRobot
c120394cae
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-02 14:20:27 +00:00
James Chen
e337fb35fc
closed #3291 : XMLHttpRequest.status needs to be assigned even when connection fails.
2014-01-02 21:59:47 +08:00
minggo
d345139a08
fix compiling errors
2014-01-02 21:53:18 +08:00
minggo
674b38beef
no in header file
2014-01-02 21:43:27 +08:00
minggo
676e25d304
2d module don't denpend on spine
2014-01-02 20:17:11 +08:00
James Chen
602468e3f2
Merge pull request #4802 from dumganhar/develop
...
Fixes two memory leaks in EventDispatcher::removeEventListener(removeEventListeners).
2014-01-02 04:08:22 -08:00
minggo
2b5be1bacf
Merge pull request #4801 from minggo/namespace
...
fix compiling errors because of new namespace of network module
2014-01-02 04:03:03 -08:00
James Chen
05b1be3aeb
Fixes two memory leaks in EventDispatcher::removeEventListener(removeEventListeners).
2014-01-02 19:59:10 +08:00
minggo
9124f189c3
fix compiling errors because of new namespace of network module
2014-01-02 19:44:46 +08:00
CocosRobot
1c5638ad4f
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-02 11:36:25 +00:00
James Chen
b071578541
Merge pull request #4798 from andyque/fixassignment
...
fix missing check self assignment of Vector<T>, Map<K,V>, Value and String
2014-01-02 03:31:39 -08:00
minggo
054972fd3b
Merge pull request #4796 from minggo/deprecated-function
...
use std::function for call back
2014-01-02 03:29:17 -08:00
andyque
961b27eacb
remove move semantic into another pr
2014-01-02 18:32:47 +08:00
andyque
8a7228049a
fixed self assignment error and provide move semantics to pushBack of Vector<T>
2014-01-02 18:31:43 +08:00
andyque
75d5bcfb42
remove const modifier of move semantic
2014-01-02 18:05:22 +08:00
andyque
80adda2ce8
fixed self assignment error and provide move semantics to pushBack of Vector<T>
2014-01-02 17:54:52 +08:00
minggo
ded3e753f3
use std::function for call back
2014-01-02 17:23:00 +08:00
Liam
dd0b22be8d
resolved ui animation easing error for develop branch
2014-01-02 17:18:40 +08:00
Liam
ef76edbd1c
merge from develop branch
2014-01-02 17:02:55 +08:00
minggo
f2b1a3cc83
Merge pull request #4793 from minggo/namespace
...
network -> cocos2d::network
2014-01-02 00:38:50 -08:00
James Chen
c29e328490
Merge pull request #4779 from samuele3hu/DispatcherBak1
...
Develop branch adds lua trigger for CocoStudio
2014-01-02 00:29:30 -08:00
minggo
07600bd46b
network -> cocos2d::network
2014-01-02 16:25:35 +08:00
James Chen
67c5ba8dfb
closed #3565 : Adds missing `lua_pop`to prevent lua stack issues.
2014-01-02 16:21:35 +08:00
Kenneth Chan
80df88d2cf
Add missing bindings to setBlendFunc for various classes
...
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
2014-01-02 16:21:35 +08:00
Huabing.Xu
57b0426994
fix bug clippingNodetest on mobile
2014-01-02 16:19:23 +08:00
samuele3hu
d802518413
Rename Cocos2dStudio.lua to CocoStudio.lua
2014-01-02 15:51:25 +08:00
James Chen
7abeacd86e
HttpClient don't have to be inherited from Object, its a singeton, ok?
2014-01-02 15:47:38 +08:00
samuele3hu
a2b706c87c
Rename some common script files to keep consistent
2014-01-02 15:18:32 +08:00
CocosRobot
c6425172b7
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-02 06:58:15 +00:00
James Chen
91e25bc0b4
Merge pull request #4782 from CocosRobot/updategeneratedsubmodule_1388645344
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-01 22:51:49 -08:00
CocosRobot
ada5eb82ec
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-02 06:49:06 +00:00
James Chen
1480dd99d6
Merge pull request #4777 from 2youyouo2/develop
...
update armature, change interface from "by" to "with"
2014-01-01 22:47:18 -08:00
James Chen
69d681e343
Merge pull request #4781 from dumganhar/js-ui-test
...
Updates JSB gui test
2014-01-01 22:44:25 -08:00
James Chen
dd54e906f0
ccs.XXX —> ccui.XXX for gui js bindings.
2014-01-02 14:21:24 +08:00
James Chen
efc7effac5
Adds override keyword for some override methods in gui::Widget class.
2014-01-02 14:20:52 +08:00
samuele3hu
f1d94b9b7b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1
2014-01-02 12:02:28 +08:00
samuele3hu
b8d4010ae5
Develop branch adds lua trigger for CocoStudio
2014-01-02 12:00:37 +08:00
Lee, Jae-Hong
c44dea5eb8
[Win32] Update project files.
...
- lIbGUI
2014-01-02 12:49:56 +09:00
boyu0
0a06d93328
issue #3401 : physical lua banding script and auto script
2014-01-02 11:45:11 +08:00
yinkaile
1f38fc28a6
change interface
2014-01-02 11:07:31 +08:00
minggo
3a1c5e4f6e
Merge pull request #4759 from Dhilan007/develop_crash
...
fix crash related to not support the z length modifier for size_t on vs
2014-01-01 18:47:21 -08:00
James Chen
0ec2738ce5
Merge pull request #4720 from zarelaky/develop
...
closed #3556 : openal context not destroy correctly on mac and ios
2014-01-01 05:55:03 -08:00
CocosRobot
ff550bf865
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-01 13:49:57 +00:00
James Chen
71d21d2e10
Merge commit 'refs/pull/4761/head' of git://github.com/cocos2d/cocos2d-x into gui-rename
2013-12-31 19:13:59 +08:00
James Chen
8c1c9fef15
Bug fix in cc.VisibleRect
2013-12-31 18:17:20 +08:00
James Chen
74a7f68dc1
[JSB] Adds cc.VisibleRect.
2013-12-31 18:12:42 +08:00
CaiWenzhi
81bdfac795
Modify class name Label LabelBMFont LabelAtlas
2013-12-31 16:36:33 +08:00
Dhilan007
ebf3faadc3
fix crash related to not support the z length modifier for size_t on vs
2013-12-31 16:32:16 +08:00
Huabing.Xu
b2934d32bc
Merge branch 'develop' into develop_RenderTextureBug
...
* develop: (32 commits)
fix align text error in label
Update the JS binding code & samples for latest cocos2d engine.
[AUTO] : updating submodule reference to latest autogenerated bindings
texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
Updates nativeactivity.cpp.
closed #2865 : Deprecates CCNotificationCenter, uses EventDispatcher instead.
remove other non-functional jenkins scripts
[AUTO] : updating submodule reference to latest autogenerated bindings
move ghprb.py to tools/jenkins-scripts/
issue #2050 : commit resources
add github pull request builder for Jenkins
Adds an empty LuaEngine::parseConfig function.
[JSB] Adds trigger bindings for CocoStudio.
update cocos2d-x version string
update describe for support translucency on android
update describe for support translucency on android
update describe for support translucency on android
recover java activity on android.
remove draw increment
migrate ShaderTestSprite to new renderer
...
2013-12-31 14:58:11 +08:00
minggo
a80c9dd625
Merge pull request #4752 from Dhilan007/label_distanceField
...
fix align text error in label
2013-12-30 22:27:55 -08:00
Dhilan007
b51efbd654
fix align text error in label
2013-12-31 14:13:26 +08:00
Huabing.Xu
bf1f5dd0e0
fix rendertexture bug
2013-12-31 11:48:51 +08:00
CocosRobot
2555318c13
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-31 03:36:47 +00:00
minggo
2b54e5e296
Merge pull request #3864 from dumganhar/iss2865-deprecate-ccnotification
...
closed #2865:Deprecates NotificationCenter, uses new EventDispatcher instead.
2013-12-30 19:31:34 -08:00
James Chen
8145bf903e
texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
2013-12-31 11:02:01 +08:00
James Chen
973adc6b2f
Updates nativeactivity.cpp.
2013-12-31 10:55:59 +08:00
James Chen
cf006df9ff
closed #2865 : Deprecates CCNotificationCenter, uses EventDispatcher instead.
2013-12-31 10:54:37 +08:00
CocosRobot
674804f1b4
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-30 13:49:19 +00:00
James Chen
1d8ee016e5
Merge pull request #4596 from boyu0/bug2050_tilemap_firstgid_bug
...
closed #2050 : fix tilemap firstgid bug
2013-12-30 05:42:19 -08:00
Huabing.Xu
a14006bb8f
calculation matrix
2013-12-30 21:24:16 +08:00
James Chen
edb2ad0933
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding
...
Conflicts:
cocos/editor-support/cocostudio/TriggerMng.cpp
2013-12-30 21:06:57 +08:00
James Chen
165e6c2a78
Adds an empty LuaEngine::parseConfig function.
2013-12-30 21:04:00 +08:00
James Chen
1edf748dc3
[JSB] Adds trigger bindings for CocoStudio.
2013-12-30 20:57:46 +08:00
Huabing.Xu
c030553d8c
Fix missed popMatrix
2013-12-30 20:25:25 +08:00
minggo
3680995f0b
Merge pull request #4742 from minggo/develop
...
update cocos2d-x version string
2013-12-30 04:23:41 -08:00
minggo
046d6696bc
update cocos2d-x version string
2013-12-30 20:22:25 +08:00
minggo
c7fd67ee29
Merge pull request #4736 from chengstory/#3474
...
fixed #3474
2013-12-30 02:14:55 -08:00
CaiWenzhi
b8aa9fbf93
Merge branch 'develop' into develop_nutty_modify_framework_testbugfixed
2013-12-30 15:57:41 +08:00
boyu0
0984eafaef
closed #2050 : move autorelease to CLN
2013-12-30 15:32:04 +08:00
chengstory
0488aa6dcb
fixed #3474
...
1. Modify CCLOG, Add classname.
2. change ArmatureMovementDispatcher::addAnnimationEventCallBack to ArmatureMovementDispatcher::addAnimationEventCallBack.
3. remove unused do while(0).
2013-12-30 15:26:51 +08:00
minggo
b474f7ca0e
Merge pull request #4735 from dabingnn/develop_transitionPageTurn
...
migration transition page turn to new renderer
2013-12-29 23:25:38 -08:00
minggo
714af52e0c
Merge pull request #4732 from Dhilan007/update_vs_project
...
fix compiling error on liblua VS 2012 project
2013-12-29 23:24:01 -08:00
Huabing.Xu
1962dfa52d
migration transition page turn to new renderer
2013-12-30 14:43:18 +08:00
CaiWenzhi
e5b0bbad74
Fixed bugs
2013-12-30 14:40:49 +08:00
Dhilan007
30b3a6f8c3
fix compiling error on liblua VS 2012 project
2013-12-30 14:21:32 +08:00
CocosRobot
a269fba371
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-30 05:58:34 +00:00
minggo
0e9b43248c
Merge pull request #4728 from dabingnn/develop_removeCommandPool
...
Develop remove command pool
2013-12-29 21:53:12 -08:00
boyu0
1f72fafd08
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
...
Conflicts:
cocos/2d/CCTMXXMLParser.cpp
cocos/2d/CCTMXXMLParser.h
2013-12-30 12:30:59 +08:00
James Chen
d72a9d2c0d
Merge pull request #4727 from dumganhar/develop
...
Fix of wrong include symbol of CCVector.h
2013-12-29 19:55:58 -08:00
James Chen
c5c03a3b35
Fix of wrong include symbol of CCVector.h
2013-12-30 11:55:01 +08:00
boyu0
a76c59f644
closed #2050 : add tile map xml format test and fix tile property bug.
2013-12-30 11:33:41 +08:00
James Chen
200f07dc34
closed #3290 : [JSB] The order of onEnter and onExit is wrong. For develop branch.
2013-12-30 11:10:02 +08:00
James Chen
31e2b3d5c2
Merge pull request #4715 from SBKarr/develop
...
closed #3542 : AngelCode binary file format support for LabelBMFont.
2013-12-29 18:11:19 -08:00
zarelaky
2822066a5f
openal context not destroy correctly on mac and ios
2013-12-30 08:37:36 +08:00
Roman "SBKarr
93f6d9c4f5
Added test case for binary fnt file
...
Also, fixed nul-termination issue in file parsing
2013-12-28 23:00:07 +04:00
CocosRobot
203b0f183e
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-28 06:59:45 +00:00
James Chen
e509a52551
Small fix for `FREE` wrong variable.
2013-12-28 14:38:13 +08:00
James Chen
b17117a1a1
More warning fixes.
2013-12-28 14:34:52 +08:00
Roman "SBKarr
b0e6b5a43f
AngelCode binary file format support for LabelBMFont
2013-12-27 22:32:07 +04:00
CocosRobot
2051041df7
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-27 13:12:17 +00:00
James Chen
0d16f7bc3b
Merge pull request #4712 from dumganhar/cocostudio-test
...
Merge PR #4672 : We need to replace trigger system by EventDispatcher in future.
2013-12-27 05:05:41 -08:00
James Chen
f4825ec94a
Bug fixes for cocostudio.
2013-12-27 20:54:05 +08:00
minggo
3760cddf49
Merge pull request #4705 from Dhilan007/failed_dispatch_receive
...
fix failed to receive dispatch signal on some android device
2013-12-27 04:33:30 -08:00
James Chen
b03c8259b1
Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test
...
Conflicts:
cocos/scripting/auto-generated
2013-12-27 20:18:58 +08:00
samuele3hu
aa0eb36071
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1
2013-12-27 20:08:09 +08:00
samuele3hu
30439e4689
Improve the coding style
2013-12-27 20:07:00 +08:00
James Chen
9baa64f274
Merge pull request #4688 from walzer/develop
...
make CC_USE_PHYSICS can ACTUALLY be switch off
2013-12-27 04:04:48 -08:00
James Chen
bf881f3ac0
Merge pull request #4691 from samuele3hu/DispatcherBak1
...
Reconstruct the operation of handling lua script event
2013-12-27 03:58:08 -08:00
CaiWenzhi
af563653e2
Merge branch 'develop' into develop_nutty_modify_framework_texturebugfixed
2013-12-27 18:26:30 +08:00
CaiWenzhi
d8a5fd6af4
Modify wrong codes
2013-12-27 18:23:53 +08:00
CocosRobot
0116866e58
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-27 10:16:22 +00:00
CaiWenzhi
6fe49bf6dd
Merge branch 'develop' into develop_nutty_modify_framework_texturebugfixed
2013-12-27 18:12:09 +08:00
Dhilan007
b319cb58ac
fix failed to receive dispatch signal on some android device,such as [HTC EVO 3D X515m].
2013-12-27 18:05:48 +08:00
CaiWenzhi
b2da9d2da5
Fixed bugs
2013-12-27 17:58:00 +08:00
minggo
5ce228e68c
Merge pull request #4703 from CocosRobot/updategeneratedsubmodule_1388138100
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-27 01:57:03 -08:00
minggo
ec3b3ea012
Merge pull request #4696 from dumganhar/warning-fix
...
Some warning fixes on linux.
2013-12-27 01:56:47 -08:00
CocosRobot
68cf83ee7d
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-27 09:55:01 +00:00
chengstory
3f4e4c9684
Merge branch 'develop' into #3457
2013-12-27 17:51:27 +08:00
minggo
0690305398
Merge pull request #4666 from 2youyouo2/develop
...
change play interface name
2013-12-27 01:50:08 -08:00
CaiWenzhi
495e574f44
Fixed bugs
2013-12-27 17:22:51 +08:00
chengstory
faaf6d3f2b
fixed #3457 fixes some bug.
2013-12-27 17:21:13 +08:00
CaiWenzhi
385894548d
Merge branch 'develop' into develop_nutty_modify_framework_addnewreader
2013-12-27 17:19:29 +08:00
James Chen
a47a7075e4
Merge pull request #4699 from boyu0/iss3509_physics_switch_foreground_bug
...
closed #3509 : Sprites with PhysicsBody moves to wrong position when swit...
2013-12-27 00:28:43 -08:00
James Chen
012e7f6618
Merge pull request #4698 from dumganhar/map-fix
...
Removes Map<K, V>::capacity(), adds Map<K, V>::bucketCount/bucketSize/bucket methods.
2013-12-27 00:09:21 -08:00
CaiWenzhi
6123344d9b
Modify location of members define
2013-12-27 16:07:02 +08:00
CaiWenzhi
26fd64c61a
Merge branch 'develop' into develop_nutty_modify_framework_addnewreader
2013-12-27 16:02:38 +08:00
CaiWenzhi
e45c2a8601
Modify manager of some widgets' children
2013-12-27 16:01:03 +08:00
boyu0
1e8e15506d
closed #3509 : Sprites with PhysicsBody moves to wrong position when switch foreground/background.
2013-12-27 15:53:55 +08:00
James Chen
3ee48fc1ca
Map::bucketSize fix.
2013-12-27 15:50:48 +08:00
walzer
ece68aafc2
add Scene::update & addChild into CC_USE_PHYSICS scope, TestCpp compiles and runs successfully when CC_USE_PHYSICS == 0
2013-12-27 15:49:08 +08:00
James Chen
0d4a816e3b
Removes Map<K, V>::capacity(), adds Map<K, V>::bucketCount/bucketSize/bucket methods.
2013-12-27 15:44:23 +08:00
byeonggee.seo
b9d56ae793
CCData bugfix
2013-12-27 16:34:00 +09:00
CaiWenzhi
1a486f22ec
Add "override"
2013-12-27 15:15:11 +08:00
James Chen
febc19ea8d
Some warning fixes on linux.
2013-12-26 23:06:16 -08:00
Dhilan007
861925e752
fix compiling error in vs project on win7.
2013-12-27 14:38:22 +08:00
Huabing.Xu
66e550e5a0
Merge branch 'develop' into develop_removeCommandPool
...
* develop: (33 commits)
fix black screen when back to foreground on android.
Fix set FPS broken.
Update CHANGELOG [ci skip]
Update AUTHORS [ci skip]
Update CCString.cpp
[AUTO] : updating submodule reference to latest autogenerated bindings
Updates Bindings-generator.
Renames: IntValueMap —> ValueMapIntKey
Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
Modify reader
long --> ssize_t for TableView callback.
Generates execute file in cocos root_dir/bin folder for HelloCpp.
Add listview and pageview reader
[AUTO] : updating submodule reference to latest autogenerated bindings
Modify actionnode
[AUTO] : updating submodule reference to latest autogenerated bindings
optimize loop
fix LabelTestNew
Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
Fix box2dView
...
2013-12-27 14:07:04 +08:00
Huabing.Xu
76d07fc76e
remove empty interface releaseToCommandPool
2013-12-27 14:02:17 +08:00
Huabing.Xu
268f2fcc21
adjust comment codes
2013-12-27 13:52:44 +08:00
Huabing.Xu
40af66a7bc
remove commandPool in renderCommand
2013-12-27 13:51:11 +08:00
minggo
ef6295f046
Merge pull request #4693 from Dhilan007/black_screen_android
...
fix black screen when back to foreground on android.
2013-12-26 21:46:18 -08:00
chengstory
4cb227ae0d
fixed #3457 ui action can not play.
2013-12-27 12:45:05 +08:00
zhangcheng
dd4339b0bb
Merge branch ' #3457 ' of git://github.com/chengstory/cocos2d-x into #3457
2013-12-27 12:41:01 +08:00
zhangcheng
1b666d4d41
fixed #3457 scenetest crashed when back to menu.
2013-12-27 12:39:21 +08:00
samuele3hu
ee7aa0f077
Rename EVENT_KEYBOARD_RELEASED and resolve a possible memory leak bug
2013-12-27 12:05:12 +08:00
Dhilan007
f250d24766
fix black screen when back to foreground on android.
2013-12-27 11:56:56 +08:00
James Chen
0d9fe874a3
Fix set FPS broken.
2013-12-26 19:49:54 -08:00
samuele3hu
d51440f62a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1
...
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp
2013-12-27 11:17:11 +08:00
Liam
0cdf2d15fe
merge from develop branch
2013-12-27 10:50:50 +08:00
Liam
2a6c24f8bf
update coco action with correct coding rule
2013-12-27 10:43:49 +08:00
samuele3hu
6d9e865f15
Delete some ScriptEventType only used to Lua 、adjust the event callback mechanism and rename cc.HANDLERTYP_ related to avoid overlong
2013-12-27 10:35:44 +08:00
zhangcheng
6a9fbfbc60
fixed #3457 update libCocosStudio.vcxproj, add trigger code.
2013-12-27 10:24:50 +08:00
luocker
fc655162fa
Update CCString.cpp
...
we can't change _string value after get Array.
2013-12-27 00:26:02 +08:00
walzer
d7704d574a
issue #3517 , enable CC_USE_PHYSICS by default
2013-12-27 00:00:50 +08:00
walzer
c5e95618d9
fixed #3517 , make CC_USE_PHYSICS can be switch off, and bring Scene::update(float), Scene::addChild(...) out of CC_USE_PHYSICS segment
2013-12-26 23:55:05 +08:00
chengstory
7a7d939da0
issue #3457 use C++ 11 auto loop.
2013-12-26 23:51:55 +08:00
chengstory
774e3d8536
issue #3457
...
1. replace UIAction NULL to nullptr.
2. modify class variable name.
2013-12-26 23:40:50 +08:00
chengstory
cfbbb7889b
Merge branch 'develop' into #3457
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
2013-12-26 23:01:34 +08:00
CocosRobot
edeeae4ff9
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-26 14:48:08 +00:00
chengstory
26df681915
fixed #3457 remove jsoncpp.
2013-12-26 22:45:23 +08:00
James Chen
17ff6ef764
Renames: IntValueMap —> ValueMapIntKey
2013-12-26 22:07:20 +08:00
James Chen
a73991dcc1
Merge pull request #4685 from dumganhar/develop
...
Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
2013-12-26 06:03:11 -08:00
boyu0
a19d212f4f
fix bug.
2013-12-26 22:00:52 +08:00
James Chen
a8d93ddf72
Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
2013-12-26 21:49:40 +08:00
boyu0
6bc0a7066f
change CustomCommand variable to class member.
2013-12-26 21:19:12 +08:00
CaiWenzhi
26a7f3474c
Modify reader
2013-12-26 21:02:47 +08:00
CaiWenzhi
a8ab58d8d8
Merge branch 'develop' into develop_nutty_modify_framework_addnewreader
2013-12-26 20:32:50 +08:00
James Chen
93ed5a4f0f
long --> ssize_t for TableView callback.
2013-12-26 04:09:24 -08:00
samuele3hu
756a72cbca
Reconstruct the operation of handling lua script event
2013-12-26 19:43:49 +08:00
boyu0
dec003477c
delete ‘delete ptr’ and add CC_UNUSED_PARAM
2013-12-26 19:25:53 +08:00
boyu0
d32fbbbfca
change GroupCommand variable to class member.
2013-12-26 18:11:23 +08:00
CaiWenzhi
ad535e2fcb
Add listview and pageview reader
2013-12-26 17:53:22 +08:00
chengstory
bd46681867
fixed #3457 continue to fixes failed to build.
2013-12-26 17:37:02 +08:00
CaiWenzhi
f0eb5d28c1
Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles
2013-12-26 17:32:08 +08:00
chengstory
041e78cb54
Fixes failed to build android.
2013-12-26 17:17:02 +08:00
CocosRobot
50a379b8f0
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-26 09:04:04 +00:00
CaiWenzhi
3206727b9c
Modify actionnode
2013-12-26 17:01:31 +08:00
chengstory
91edad5152
Merge branch 'develop' into #3457
2013-12-26 16:56:43 +08:00
yinkaile
891d8c3a38
change comment
2013-12-26 16:48:19 +08:00
CaiWenzhi
a2e873d12a
Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles
2013-12-26 16:45:48 +08:00
Liam
a158e25767
modify coco action with new coding rule
2013-12-26 16:36:21 +08:00
boyu0
2fb0179293
change QuadCommand variable to class member.
2013-12-26 16:36:03 +08:00
Liam
bc54707893
modify coco action with new coding rule
2013-12-26 16:29:59 +08:00
CocosRobot
09996ea82c
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-26 08:20:26 +00:00
yinkaile
f0d4f3f9bf
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-26 16:19:21 +08:00
CaiWenzhi
7b6e022388
Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles
2013-12-26 16:19:12 +08:00
CaiWenzhi
067af2fb93
optimize loop
2013-12-26 16:17:52 +08:00
James Chen
5dfb7f321a
Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
2013-12-26 16:03:30 +08:00
yinkaile
7027587542
fixed armature update
2013-12-26 15:49:20 +08:00
boyu0
f878864794
Specialize GroupCommand and CustomCommand, change generateCommand to new.
2013-12-26 15:41:47 +08:00
yinkaile
c096743325
change comment
2013-12-26 14:57:38 +08:00
CaiWenzhi
530f82ee27
Add refresh layout method
2013-12-26 14:57:30 +08:00
Huabing.Xu
963d637198
use raw new instead of generateCommand
2013-12-26 14:45:44 +08:00
Huabing.Xu
b4c61d5a7c
specialize RenderCommandPool<QuadCommand>
2013-12-26 14:44:21 +08:00
chengstory
ab3cf064d1
fixed #4357 failed to build android.
2013-12-26 13:26:23 +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
CaiWenzhi
946dab0b34
Modify android mk
2013-12-26 12:23:58 +08:00
CaiWenzhi
b1d2aa9b79
Modify CMakeList
2013-12-26 11:25:49 +08:00
CaiWenzhi
581678b6b0
Modify android mk
2013-12-26 11:06:10 +08:00
CocosRobot
e6727ea087
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-26 02:50:37 +00:00
yinkaile
b553828ed2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-26 10:24:33 +08:00
yinkaile
b44090b40b
change std::map to std::unordered_map
2013-12-26 10:23:51 +08:00
chengstory
19d75cee01
fixed #3647 fixes ComAttribute warning.
2013-12-26 02:18:28 +08:00
chengstory
8afdf88d25
Test triiger 3.0
2013-12-26 01:17:04 +08:00
CaiWenzhi
eaef723bd7
Remove C cast
2013-12-25 22:13:19 +08:00
CaiWenzhi
8299e4c494
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-25 22:05:21 +08:00
yinkaile
5eb961b165
fixed warning
2013-12-25 19:46:09 +08:00
CocosRobot
6492f61691
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-25 10:34:46 +00:00
CaiWenzhi
96279c12dc
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-25 18:32:15 +08:00
CaiWenzhi
c516860017
Fixed bugs about color and opacity
2013-12-25 18:30:21 +08:00
samuele3hu
7c3978bdd8
Add missing file for linux lua binding
2013-12-25 17:42:59 +08:00
yinkaile
d72c9d94d7
upload trigger code.
2013-12-25 17:40:54 +08:00
CaiWenzhi
570b6c95a7
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-25 17:29:30 +08:00
samuele3hu
a2c5881699
Add include_directories for spine
2013-12-25 17:22:14 +08:00
samuele3hu
1075a711e0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine
2013-12-25 16:58:19 +08:00
yinkaile
369b4da721
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #3456
2013-12-25 16:55:56 +08:00
yinkaile
ebf9833958
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-25 16:47:14 +08:00
yinkaile
13408e4dc5
change play interface name
2013-12-25 16:46:31 +08:00
samuele3hu
9cf45a292b
Delete some annotated statement about spine and add some reserve manual lua binding functions
2013-12-25 16:42:40 +08:00
James Chen
142b189305
Some warning fixes.
2013-12-25 16:06:39 +08:00
CocosRobot
c71cd5a407
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-25 06:39:38 +00:00
James Chen
55b0ef85d8
Merge pull request #4631 from boyu0/const_char_star_to_std_string
...
Change const char* to const std::string&
2013-12-24 22:34:34 -08:00
boyu0
2c2953abc1
change “string.compare()” to “==“
2013-12-25 14:20:37 +08:00
boyu0
f2e18f32a9
fix android compile error
2013-12-25 13:57:17 +08:00
samuele3hu
9fd64df099
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine
2013-12-25 13:48:10 +08:00
samuele3hu
45cfe00ec4
Modify iOS project set and some manual lua binding
2013-12-25 13:47:22 +08:00
CocosRobot
9aa48cac37
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-25 03:49:23 +00:00
James Chen
538da31773
Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings.
2013-12-25 11:18:14 +08:00
James Chen
6fce4f9061
Don’t use ‘String::createWithFormat’ in our codes, use StringUtils::format() instead.
2013-12-25 11:00:51 +08:00
boyu0
62fc889a54
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
...
Conflicts:
cocos/2d/platform/CCFileUtils.cpp
cocos/2d/platform/CCFileUtils.h
cocos/2d/platform/CCImageCommon_cpp.h
cocos/2d/platform/CCSAXParser.cpp
cocos/2d/platform/CCSAXParser.h
2013-12-25 10:41:37 +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
zhangcheng
2c6f95ecea
issue #3456 replace jsoncpp to rapidjson.
2013-12-24 20:33:55 +08:00
CaiWenzhi
0dac69523c
Remove "_renderer" from widget
2013-12-24 20:22:14 +08:00
James Chen
17a6dbebb6
Compilation error fixes.
2013-12-24 19:05:35 +08:00
zhangcheng
5214965e4f
fixed #3456
2013-12-24 18:33:19 +08:00
James Chen
1f5611ae05
Adds missing ‘)’.
2013-12-24 18:23:36 +08:00
James Chen
0ff85852cc
Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead.
2013-12-24 18:08:40 +08:00
James Chen
f664a72d6e
Merge pull request #4635 from dabingnn/develop_FixClippingNodeBug
...
fix clippingNode bug
2013-12-24 01:50:51 -08:00
Huabing.Xu
b6dc3d0371
fix clippingNode bug
2013-12-24 17:16:28 +08:00
CocosRobot
c3b7406b43
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-24 09:00:04 +00:00
James Chen
81d073aff0
Reverts FileUtil::getFileData to virtual function.
2013-12-24 16:29:55 +08:00
James Chen
d33b2c41c7
Merge branch 'develop' into data-refactor
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-12-24 16:24:17 +08:00
samuele3hu
e497f823ea
Merge branch 'lua_spine_dev' of https://github.com/edwardzhou/cocos2d-x into Spine
2013-12-24 16:14:10 +08:00
boyu0
1a453a26ab
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
...
Conflicts:
cocos/2d/renderer/CCNewSpriteBatchNode.cpp
cocos/2d/renderer/CCNewSpriteBatchNode.h
2013-12-24 16:07:25 +08:00
James Chen
f527b50ce6
Merge pull request #4630 from dumganhar/iss3492-bmfont-fix
...
closed #3492 : LabelBMFont string can't be shown integrally.
2013-12-23 23:56:38 -08:00
James Chen
7ee0771101
closed #3492 : LabelBMFont string can't be shown integrally.
...
Issue URL: http://www.cocos2d-x.org/issues/3492
2013-12-24 15:55:45 +08:00
boyu0
6e6ccbd5f9
change some const char* to const std::string&
2013-12-24 15:49:58 +08:00
James Chen
16195b4571
Merge pull request #4629 from Dhilan007/update_vsProject
...
update vs project for remove some file into renderer.
2013-12-23 23:49:48 -08:00
Liam
921f067ab7
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
2013-12-24 15:42:50 +08:00
Dhilan007
f140ece282
update vs project for remove some file into renderer.
2013-12-24 15:34:40 +08:00
Liam
c6fb3b7e0d
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
2013-12-24 15:32:09 +08:00
CocosRobot
3875d89ce6
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-24 07:31:29 +00:00
James Chen
0305ff15db
Merge pull request #4625 from dabingnn/develop_NewClippingNode
...
Develop new clipping node
2013-12-23 23:20:38 -08:00
Huabing.Xu
5cc45493ef
remove commented codes
2013-12-24 15:13:37 +08:00
Huabing.Xu
ccf47e6422
remove commented codes
2013-12-24 15:11:01 +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
07bc4d34a8
some rename for global variables and member functions.
2013-12-24 14:53:49 +08:00
CocosRobot
4775b4c4d8
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-24 06:33:43 +00:00
James Chen
39c3bc10ed
Merge pull request #4614 from 2youyouo2/develop
...
update armature, using `const std::string&` instead of `const char*`
2013-12-23 22:25:50 -08:00
yinkaile
67c3480320
change std::string.compare() to ==
2013-12-24 14:21:25 +08:00
Huabing.Xu
c36d920159
remove include reference
2013-12-24 14:15:23 +08:00
Huabing.Xu
eee06ec905
update project file:android and linux
2013-12-24 14:12:15 +08:00
Huabing.Xu
9db599c0c9
remove class NewClippingNode
2013-12-24 14:10:54 +08:00
Huabing.Xu
e7facf9f85
remove NewClippingNode feature function into ClippingNode
2013-12-24 14:08:57 +08:00
CocosRobot
c170559759
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-24 05:59:50 +00:00
yinkaile
9f8d95131e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-24 13:48:41 +08:00
samuele3hu
7f4e384886
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-24 13:43:57 +08:00
samuele3hu
98e4e802f4
Support pass by value for setPosition\setAnchorPoint\setContentSize for lua binding
2013-12-24 13:42:32 +08:00
yinkaile
44e22584a4
fixed getFileData
2013-12-24 13:35:46 +08:00
Edward Zhou
4082c86070
1. add Spine LUA binding with testcase; 2. CCSkeleton inherites from Node since NodeRGBA is deprecated.
2013-12-24 11:55:53 +08:00
CocosRobot
e50b6b616b
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-24 03:45:37 +00:00
boyu0
8e329501ba
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
...
Conflicts:
cocos/2d/renderer/CCNewSprite.cpp
cocos/2d/renderer/CCNewSprite.h
cocos/2d/renderer/CCNewTextureAtlas.cpp
cocos/2d/renderer/CCNewTextureAtlas.h
2013-12-24 11:44:08 +08:00
Huabing.Xu
b821a33cfa
remove comment code
2013-12-24 11:28:42 +08:00
Huabing.Xu
a607bc9ac1
Merge branch 'develop' into develop_NewSpriteBatchNode
...
* develop:
[JSB] long —> ssize_t in JSB_TableViewDataSource::callJSDelegate.
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-24 11:21:37 +08:00
Huabing.Xu
12e2cfedf2
update project file:android and linux
2013-12-24 11:20:21 +08:00
CaiWenzhi
f355fa6201
Fixed bugs
2013-12-24 11:18:25 +08:00
yinkaile
ff053e71fe
change std::string compare method
2013-12-24 11:05:53 +08:00
Huabing.Xu
24ac743a3c
remove class NewSpriteBatchNode
2013-12-24 11:03:59 +08:00
boyu0
3344c5243c
change some const char* to const std::string&
2013-12-24 10:51:47 +08:00
Huabing.Xu
b61bf3ad95
LabelBMFont inherit SpriteBatchNode instead of NewSpriteBatchNode
...
remove NewSpriteBatchNode testcase to SpriteBatchNode
2013-12-24 10:51:35 +08:00
yinkaile
4de3e520d8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-24 10:51:24 +08:00
Huabing.Xu
410cfb9ca4
move NewSpriteBatchNode feature function into SpriteBatchNode
2013-12-24 10:48:57 +08:00
CaiWenzhi
6dd55921aa
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-24 10:44:57 +08:00
James Chen
325f2e21a7
[JSB] long —> ssize_t in JSB_TableViewDataSource::callJSDelegate.
2013-12-24 10:41:45 +08:00
CaiWenzhi
3885477276
Remove CCDictionary from GUIReader
2013-12-24 10:41:01 +08:00
CocosRobot
d22f2aaf67
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-24 02:28:17 +00:00
Huabing.Xu
8310c18105
update project file: android and linux
2013-12-24 10:07:53 +08:00
Huabing.Xu
c4f4f91cb4
Merge branch 'develop' into develop_mergeNewSprite
...
* develop:
[AUTO] : updating submodule reference to latest autogenerated bindings
Updates Bindings-generator.
Binds Node::setAnchorPoint manually.
Don’t hide parent’s addChild method in TMXLayer class.
[AUTO] : updating submodule reference to latest autogenerated bindings
Updates JS-tests to the latest version.
[Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
Updates js tests to the latest version.
Removes unneeded binding glue codes, Sprite::setPosition.
Bindings-generator skips Node::setContentSize. Binds it manually.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3353:Add the DisplayLinkDirector lua binding
issue #2771 : fix warning log and fix typo.
issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper
2013-12-24 10:03:21 +08:00
Huabing.Xu
8d58e43ad2
remove Class NewSprite
2013-12-24 09:40:00 +08:00
CocosRobot
a9d8a64e63
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-23 14:10:01 +00: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
44f9009a5d
Merge pull request #4610 from dumganhar/lastest-js-test
...
Updates JS-test to the latest version and some binding fixes
2013-12-23 06:04:49 -08:00
James Chen
3327614a99
Binds Node::setAnchorPoint manually.
2013-12-23 21:54:02 +08:00
James Chen
5f17984826
Don’t hide parent’s addChild method in TMXLayer class.
2013-12-23 21:53:23 +08:00
CocosRobot
cc7aa1ee0d
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-23 13:45:59 +00:00
James Chen
6b73fa570e
Merge pull request #4601 from samuele3hu/toluaerror
...
issue #3353 Lua gc mechanism will make the extended attributes of lua userdata disapper
2013-12-23 05:40:15 -08:00
James Chen
09e04e1490
Merge pull request #4607 from samuele3hu/NewEventDispatcher
...
[Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>
2013-12-23 05:38:53 -08:00
James Chen
6bbc6e2dde
CCSkeleton is inherited from Node now.
2013-12-23 21:12:58 +08:00
Huabing.Xu
e66eb6464d
use Sprite instead of NewSprite
2013-12-23 21:07:25 +08:00
Huabing.Xu
c3247c800f
merge feature function from NewSprite into Sprite
2013-12-23 21:06:37 +08:00
James Chen
a48544c814
Merge pull request #4598 from boyu0/iss2771_physical
...
issue #2771 : fix warning log and fix typo.
2013-12-23 05:00:03 -08:00
samuele3hu
b1dd233a04
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-23 20:30:33 +08:00
samuele3hu
48a95cfa55
[Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
2013-12-23 20:29:05 +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
James Chen
3096c34311
Removes unneeded binding glue codes, Sprite::setPosition.
2013-12-23 20:25:46 +08:00
James Chen
1ed0f80348
Merge pull request #4605 from dabingnn/develop_mergeNewTextureAtlas
...
Develop merge new texture atlas
2013-12-23 04:16:16 -08:00
CocosRobot
2efe4b7420
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-23 12:14:14 +00:00
Huabing.Xu
b3eb297249
Merge branch 'develop' into develop_mergeNewTextureAtlas
...
* develop:
[AUTO] : updating submodule reference to latest autogenerated bindings
closed #3478 : BitmapFontMultiLineAlignment test shows some unneeded 'line break'
Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings.
Updates bindings-generator, skips to bind override functions.
Removes unneeded ‘clone’ in cocos2d_specifics.cpp.
2013-12-23 20:12:06 +08:00
Huabing.Xu
1dd2c1c20c
remove NewTextureAtlas
2013-12-23 20:11:50 +08:00
James Chen
bbbfa4b106
Merge pull request #4603 from dabingnn/develop_mergeNewRenderTexture
...
Develop merge new render texture
2013-12-23 04:09:33 -08:00
Huabing.Xu
98d573f4cb
rename protected _beginWithClear to beginWithClear
2013-12-23 19:59:09 +08:00
CocosRobot
509d4513eb
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-23 11:48:15 +00:00
James Chen
eb9cb237d5
Merge pull request #4600 from dumganhar/remove-unneeded-bindings-codes
...
closed #3480 : Removes unneeded codes of override function.
2013-12-23 03:43:27 -08:00
Huabing.Xu
0dab85a3bf
update CMakeLists.txt
2013-12-23 18:37:18 +08:00
Huabing.Xu
75597bc47f
Merge branch 'develop' into develop_mergeNewRenderTexture
...
* develop:
[LUA] Removes CCCameraDeprecated table in Deprecated.lua.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info
Compilation fix after this PR (https://github.com/cocos2d/cocos2d-x/pull/4583 ).
issue #3403:Delete Camera manual lua binding
issue #3403:Add the EventDispatcher lua binding and the releated test cases
2013-12-23 18:34:12 +08:00
James Chen
8c3315de76
closed #3478 : BitmapFontMultiLineAlignment test shows some unneeded 'line break'
2013-12-23 18:23:39 +08:00
Huabing.Xu
9c97fc6f19
remove NewRenderTexture include file
2013-12-23 18:08:50 +08:00
Huabing.Xu
bcaec978d3
remove NewRenderTexture Class
2013-12-23 18:04:04 +08:00
Huabing.Xu
487e0b21af
update Xcode project file& android.mk
2013-12-23 18:03:08 +08:00
samuele3hu
783be69322
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-12-23 17:20:17 +08:00
Huabing.Xu
41a77fed61
TestCase Use RenderTexture instead of NewRenderTexture
2013-12-23 17:13:41 +08:00
Huabing.Xu
a7a50dffcc
move begin(), end(),draw() to RenderTexture
2013-12-23 17:13:06 +08:00
boyu0
669ba8149a
closed #2050 : fix js glue code.
2013-12-23 17:06:13 +08:00
James Chen
ed93f90ccc
Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings.
2013-12-23 16:58:26 +08:00
James Chen
43e9df17bb
Removes unneeded ‘clone’ in cocos2d_specifics.cpp.
2013-12-23 16:39:25 +08:00
James Chen
9dff1dcd36
[LUA] Removes CCCameraDeprecated table in Deprecated.lua.
2013-12-23 16:37:40 +08:00
Huabing.Xu
fad585fbef
move rendering callback to RenderTexture
2013-12-23 15:59:47 +08:00
boyu0
0cbbfdba8c
closed #2050 : Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
...
Conflicts:
cocos/2d/CCTMXLayer.cpp
2013-12-23 15:40:33 +08:00
CaiWenzhi
9aa85d2bd6
Remove NodeRGBA inherit
2013-12-23 15:02:52 +08:00
Huabing.Xu
b7c0d7a9e8
1. remove redundant code in NewRenderTexture 2. rename protected beginWithClear to _beginWithClear
2013-12-23 14:59:44 +08:00
boyu0
69f1834e61
issue #2771 : fix warning log and fix typo.
2013-12-23 14:30:43 +08:00
yinkaile
8d9035c5e8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-23 14:06:22 +08:00
yinkaile
ba809a0096
change const char* to const std::string&
2013-12-23 14:05:46 +08:00
CocosRobot
9901703f4a
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-23 05:52:59 +00:00
James Chen
f9c45f89ac
Merge branch 'data-refactor' of https://github.com/dumganhar/cocos2d-x into data-refactor
2013-12-23 13:52:42 +08:00
James Chen
2fec81fcae
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-12-23 13:52:15 +08:00
James Chen
4ed988b8c5
Fixes linux build failure.
2013-12-23 13:45:31 +08:00
James Chen
aeafe06d7f
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
2013-12-23 11:57:29 +08:00
James Chen
11423b5851
Changes the type of FontFreeType::_ttfData from `unsigned char*` to `Data`, makes codes more elegant.
2013-12-23 11:53:39 +08:00
James Chen
ca082080b5
Binds FileUtils::getStringFromFile automatically since we have added this method.
2013-12-23 11:47:56 +08:00
samuele3hu
9128960c13
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-23 11:22:41 +08:00
samuele3hu
f0dc7f0b15
issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info
2013-12-23 11:19:55 +08:00
boyu0
1072711a4c
issue #2050 : use static_cast
2013-12-23 10:46:35 +08:00
boyu0
baf8cb06c5
issue #2050 : delete max/minGID, fix firstGID bug
2013-12-23 10:37:46 +08:00
James Chen
0a2490333b
Compilation fix after this PR ( https://github.com/cocos2d/cocos2d-x/pull/4583 ).
2013-12-23 10:03:36 +08:00
samuele3hu
7daace0b2a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-23 09:43:05 +08:00
samuele3hu
71d5896d41
issue #3403:Delete Camera manual lua binding
2013-12-23 09:42:36 +08:00
yinkaile
87103434e3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-23 09:30:14 +08:00
samuele3hu
50bcdee725
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-22 22:11:17 +08:00
samuele3hu
97f26176e8
issue #3403:Add the EventDispatcher lua binding and the releated test cases
2013-12-22 22:10:21 +08:00
Dhilan007
786b7d9912
update vs project for remove CCCamera.
2013-12-22 17:19:59 +08:00
CocosRobot
bc5fd247ac
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-21 20:35:41 +00:00
Ricardo Quesada
4f435a8613
Adds getScene() to Node
...
helper function to get the Scene containing the Node
2013-12-21 12:28:49 -08:00
Ricardo Quesada
d35846b0d4
Merge pull request #4588 from ricardoquesada/events_in_director
...
Events in director
2013-12-21 10:58:43 -08:00
Ricardo Quesada
49903ea779
Director emits events after visit, after draw and after update. And when the projection changes
...
Adds helper functions on EventDispatcher
Adds test in NewEventDispatcherTest
2013-12-21 10:55:16 -08:00
Ricardo Quesada
eea2e70d1e
Adds events in director
2013-12-21 00:56:28 -08:00
CocosRobot
58e25a657f
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-21 03:47:33 +00:00
Ricardo Quesada
72d77bb035
removes dirty from ActionCamera
2013-12-20 19:45:30 -08:00
Ricardo Quesada
eadbaa3bf5
Adds comment to ActionCamera file
2013-12-20 19:37:14 -08:00
Ricardo Quesada
fd8c7e9a5d
Removes CCCamera
...
Not needed anymore.
2013-12-20 19:24:56 -08:00
Ricardo Quesada
b8b7714431
Camera is working OK in 2d projection
2013-12-20 19:19:24 -08:00
Ricardo Quesada
d8ad5291f4
Nore camera
2013-12-20 16:33:31 -08:00
Ricardo Quesada
0703d974e2
NodeGrid fixes
...
Adds license
Removes unneded matrix
replaces std::for_each with for range-loop
2013-12-20 11:52:52 -08:00
James Chen
2a7b2c107a
Updates CCUserDefaultAndroid.cpp.
2013-12-20 21:51:53 +08:00
James Chen
b504d817b5
Small bug fix in CCData.
2013-12-20 21:41:20 +08:00
minggo
9bea08ded9
Merge pull request #4580 from dabingnn/develop_MotionStreak
...
Migrate MotionStreak to new renderer
2013-12-20 05:36:52 -08:00
Huabing.Xu
739cf0ce85
Migrate MotionStreak to new renderer
2013-12-20 21:21:50 +08:00
James Chen
9e05f300f3
[Data Refactor] compilation error fix.
2013-12-20 21:16:46 +08:00
James Chen
21a9f05110
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
cocos/2d/CCUserDefault.cpp
cocos/2d/CCUserDefault.mm
cocos/2d/CCUserDefaultAndroid.cpp
cocos/2d/ZipUtils.cpp
cocos/2d/platform/CCFileUtils.h
cocos/2d/platform/CCSAXParser.cpp
2013-12-20 21:12:11 +08:00
James Chen
ab7a273354
closed #3465 : New spine runtime support, update CMakeLists.txt
2013-12-20 20:18:32 +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
James Chen
3d76281617
Removes an unused assert.
2013-12-20 19:49:25 +08:00
James Chen
5852c66e5a
closed #3463 : ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms.
2013-12-20 19:47:11 +08:00
Huabing.Xu
a8d2ae9eda
Merge branch 'develop' into develop_transitionScene
...
* develop:
[AUTO] : updating submodule reference to latest autogenerated bindings
closed #3463 : Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding. Instead of using std::unordered_map<long, T>(long is the hash_code generated by typeid(T).hash_code()), We needs to use std::unordered_map<std::string, T> to avoid collision since unordered_map internally processes collisions.
Update CHANGELOG [ci skip]
Update AUTHORS [ci skip]
closed #3457 : Fix of UserDefault. Infinite loop in UserDefault's destructor on iOS. The destructor of UserDefault is private now.
[AUTO] : updating submodule reference to latest autogenerated bindings
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
2013-12-20 19:15:50 +08:00
byeonggee.seo
f3e4d9277e
spine android build phase moved
2013-12-20 19:16:16 +09:00
CocosRobot
f3d3e65e76
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-20 09:35:05 +00:00
James Chen
55ff96df3a
closed #3463 : Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding.
...
Instead of using std::unordered_map<long, T>(long is the hash_code generated by typeid(T).hash_code()),
We needs to use std::unordered_map<std::string, T> to avoid collision since unordered_map internally processes collisions.
2013-12-20 17:13:09 +08:00
yinkaile
3bd1562f4a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-20 16:46:29 +08:00
James Chen
e54c993918
Merge pull request #4564 from dmurtagh/UserDefault_GetDouble_Fix_For_Android
...
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
2013-12-20 00:13:05 -08:00
byeonggee.seo
0a30a9a604
spine simple JS binding supported
2013-12-20 16:10:15 +09:00
Huabing.Xu
ef5b072182
fix transition scene CrossFade
2013-12-20 14:38:02 +08:00
James Chen
2c590cea3e
closed #3457 : Fix of UserDefault. Infinite loop in UserDefault's destructor on iOS. The destructor of UserDefault is private now.
2013-12-20 14:06:24 +08:00
Huabing.Xu
87f62bc8a0
Merge branch 'develop' into develop_transitionScene
...
* develop:
#include <string> in CCComponentContainer.h to fix linux build failure.
#include <algorithm> for std::find in CCVector.h.
const love in CCFileUtils.cpp.
More std::for_each —> for(const auto& …)
2013-12-20 12:45:22 +08:00
minggo
ea751f8f1f
Merge pull request #4568 from dabingnn/develop_transitionScene
...
fix transition scene progress timer
2013-12-19 19:06:06 -08:00
CocosRobot
8c0d74bb33
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-20 02:56:57 +00:00
yinkaile
4f003da8cb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-20 10:53:37 +08:00
Huabing.Xu
9385fb3481
fix transition scene progress timer
2013-12-20 10:53:35 +08:00
James Chen
e56a4a7c00
Merge pull request #4567 from dumganhar/for_each-gone
...
All std::for_each has gone. uses for(const auto& ...) instead.
2013-12-19 18:50:50 -08:00
James Chen
a53f00c579
#include <string> in CCComponentContainer.h to fix linux build failure.
2013-12-20 10:41:29 +08:00
minggo
756f8f7a11
Merge pull request #4482 from dabingnn/develop_gridNode
...
Develop grid node
2013-12-19 18:30:42 -08:00
James Chen
3dba88c5c9
#include <algorithm> for std::find in CCVector.h.
2013-12-20 10:12:07 +08:00
James Chen
58772d7dec
const love in CCFileUtils.cpp.
2013-12-20 10:11:41 +08:00
James Chen
34382b4a8a
More std::for_each —> for(const auto& …)
2013-12-20 09:54:50 +08:00
boyu0
19e1609c27
issue #2050 : unsigned int to int
2013-12-20 09:50:53 +08:00
Ricardo Quesada
f5d0d1ce43
batched children work as expected
...
Fixed order in the multi matrix.
2013-12-19 16:33:47 -08:00
Ricardo Quesada
59fee6b8d2
replaces std::for_each with for()
...
replaces `std::for_each` with C++11 `for( : )`
2013-12-19 13:34:41 -08:00
Damien
52c66a678c
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
...
- defaultValue was not being passed into the JNI CallStaticDoubleMethod
method previously.
- CCUserDefault::getDoubleForKey() would return undefined garbage when
the key doesn’t exist.
Test Case:
Call the following from anywhere in your code (in release
configuration). X will be garbage.
Call the following from your code:
double x =
CCUserDefault::sharedUserDefault()->getDoubleForKey("Some-Non-existant-k
ey-1234", 0);
CCLOG("x = %4.2f", x);
Fix Tested on Android. Affects Android only.
2013-12-19 12:32:51 -08:00
Ricardo Quesada
99ae4d86d3
fixes compiler warnings
...
* converts some `int` to `ssize_t`
* adds `const` to `title()` and `subtitle()`
2013-12-19 12:23:42 -08:00
Huabing.Xu
61cf9e49eb
change TransitionPageTurn::_outSceneProxy when class construction instead of onEnter
2013-12-19 22:01:32 +08:00
Huabing.Xu
517fec4de7
change TransitionTurnOffTiles::_outSceneProxy when class construction instead of onEnter
2013-12-19 21:49:21 +08:00
Huabing.Xu
034e1152e5
minor change accord to cocos2d coding style
2013-12-19 21:41:07 +08:00
Huabing.Xu
9fec597ff3
remove unreachable code
2013-12-19 21:36:44 +08:00
James Chen
cfec4d5b7e
Updates spine test.
2013-12-19 21:35:43 +08:00
CocosRobot
982d5626fc
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 13:13:34 +00:00
yinkaile
05e0d03ca9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-19 21:13:15 +08:00
yinkaile
c58963bd45
add support for tweenRotate property
2013-12-19 21:12:25 +08:00
James Chen
df85ba8fd9
Merge commit 'refs/pull/4545/head' of git://github.com/cocos2d/cocos2d-x into new-spine
...
Conflicts:
cocos/editor-support/spine/CCSkeleton.h
2013-12-19 21:07:24 +08:00
James Chen
ec0bdf06af
Merge pull request #4555 from 2youyouo2/develop
...
fixed armature position not right
2013-12-19 05:05:25 -08:00
CocosRobot
fc1516aee4
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 12:54:14 +00:00
yinkaile
b367896f94
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-19 20:50:27 +08:00
James Chen
3dc052db4f
Fixes linux and windows building failure.
2013-12-19 20:32:22 +08:00
James Chen
755d29b0e1
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into more_container_bind
2013-12-19 20:17:54 +08:00
James Chen
f73e939b57
Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
2013-12-19 20:17:44 +08:00
CocosRobot
8421d43195
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 10:12:28 +00:00
Huabing.Xu
44366c653c
fix compile error
2013-12-19 17:20:36 +08: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
boyu0
ef54ed3c15
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD
...
Conflicts:
cocos/2d/CCLabel.cpp
cocos/2d/CCLabel.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/2d/CCLayer.cpp
cocos/2d/CCLayer.h
cocos/2d/CCNode.cpp
extensions/GUI/CCControlExtension/CCControl.cpp
extensions/GUI/CCControlExtension/CCControlButton.cpp
extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
tools/tojs/cocos2dx.ini
2013-12-19 17:05:59 +08:00
Huabing.Xu
911e5b0bac
fix bug : group command nesting will cause infinite loop
2013-12-19 16:55:22 +08:00
Huabing.Xu
1bc7250f7e
node grid migrating to new renderer
2013-12-19 16:54:39 +08:00
yinkaile
c02272ade3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-19 15:44:05 +08:00
yinkaile
140bd2ecad
fixed armature position not right
2013-12-19 15:43:32 +08:00
Ricardo Quesada
1ed37df37f
Merge pull request #4553 from ricardoquesada/skew_fixes
...
Skew works again!
2013-12-18 21:11:47 -08:00
Ricardo Quesada
1d3cc7a24c
Skew works again!
2013-12-18 21:11:06 -08:00
CocosRobot
ac24dec620
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 04:19:07 +00:00
James Chen
113fa9924e
Merge pull request #4550 from dumganhar/merge-pr-4532
...
Merge pr 4532
2013-12-18 20:12:18 -08:00
CocosRobot
403315e315
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 03:58:41 +00:00
James Chen
f8b7d70d92
Reverts submodule.
2013-12-19 11:53:56 +08:00
James Chen
d31c1457b1
Merge pull request #4546 from Dhilan007/update_vsProject
...
update vs project for removes unneeded files
2013-12-18 19:30:21 -08:00
James Chen
75b5edb66c
Merge commit 'refs/pull/4532/head' of git://github.com/cocos2d/cocos2d-x into armature-test
2013-12-19 11:16:03 +08:00
yinkaile
a6a432d2a2
fixed not render
2013-12-19 10:42:06 +08:00
Ricardo Quesada
d138925aa0
Merge branch 'develop' into node_fixes
2013-12-18 18:33:56 -08:00
Ricardo Quesada
b9a64725ab
iterator in Sprite fixes
...
And replaces some std::for_each() with for() to prevent another object in the stack.
2013-12-18 18:33:04 -08:00
Dhilan007
ffa6ad3cb2
update vs project for removes unneeded files
2013-12-19 10:24:50 +08:00
minggo
9fc28e6c7d
Merge pull request #4534 from boyu0/edit_hungarian_notation
...
Edit hungarian notation
2013-12-18 18:10:17 -08:00
Ricardo Quesada
89701f5006
getNodeToParentTransform fixes
...
Code is cleaner.
`Armature` calls parent to reduce code.
[]: Skew is still not working properly
2013-12-18 18:00:55 -08:00
byeonggee.seo
e673bd80bb
new spine runtime applied
2013-12-19 10:50:37 +09:00
boyu0
c6cc77e75b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
2013-12-19 09:45:21 +08:00
yinkaile
93eaf44e9c
Merge branch 'develop' into Array
...
Conflicts:
cocos/scripting/auto-generated
2013-12-19 09:42:21 +08:00
Ricardo Quesada
8390e7eadb
Node cleanup
...
Uses "normal" interation without the lambda to prevent another object in the stack.
removed unused code.
2013-12-18 16:56:59 -08:00
CocosRobot
228b4ebf75
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-18 22:11:07 +00:00
Ricardo Quesada
7616edd9f3
Improves SpriteTest
...
Improves SpriteTest.
It is easier to see if Sprite works as SpriteBatchNode (and vice-versa).
Needed for the new renderer.
Also adds `const` to title() and subtitle()
2013-12-18 13:52:10 -08:00
Ricardo Quesada
a175e5a13c
Merge pull request #4539 from CocosRobot/updategeneratedsubmodule_1387397647
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-18 12:18:22 -08:00
CocosRobot
d0779b5352
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-18 20:14:20 +00:00
Ricardo Quesada
b36d77b1c2
Android and Linux fixes
2013-12-18 12:07:51 -08:00
Ricardo Quesada
d1b555614e
removes `using namespace std` from header file
...
... in order to prevent possible collisions.
`using namespace XXX` MUST never be used in header files.
2013-12-18 11:45:30 -08:00
Ricardo Quesada
903844c7bd
Removes unneeded files
...
New functionality is merged into the 'official' classes
2013-12-18 11:44:45 -08:00
yinkaile
324732b867
change play arguments
2013-12-18 23:29:54 +08:00
yinkaile
7be834ea37
change play arguments
2013-12-18 22:57:18 +08:00
boyu0
d0b039ceda
fix compile errors.
2013-12-18 22:44:03 +08:00
yinkaile
57c33e0604
fixed compile error
2013-12-18 22:36:10 +08:00
yinkaile
d3a575e8cc
change for iterator and callfunc
2013-12-18 22:07:33 +08:00
yinkaile
026811ca59
Merge branch 'develop' into Array
...
Conflicts:
cocos/scripting/auto-generated
tools/bindings-generator
2013-12-18 22:03:16 +08:00
boyu0
71be55a9aa
revert AccelerometerSimulation.m
2013-12-18 19:02:49 +08:00
boyu0
50544a04a7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
2013-12-18 18:53:44 +08:00
boyu0
f16384a105
fix more code with hungarian notation
2013-12-18 18:51:36 +08:00
boyu0
d16c67096a
revert submodules
2013-12-18 18:33:39 +08:00
boyu0
082c3d274a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
2013-12-18 18:05:30 +08:00
CocosRobot
000958bf82
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-18 09:57:15 +00:00
James Chen
9c0d39c6f9
Merge pull request #4531 from dumganhar/extension-warning-fix
...
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
2013-12-18 01:48:14 -08:00
boyu0
e07c4ffec1
Change NULL to nullptr, edit hungarian notation.
2013-12-18 17:47:20 +08:00
Huabing.Xu
46d1d5bb91
add GridNode New renderer imp
2013-12-18 17:19:50 +08:00
James Chen
589b71eecf
Merge pull request #4530 from samuele3hu/developConversion
...
issue #3402:Add the new label lua binding and the releated test cases
2013-12-18 01:16:47 -08:00
James Chen
ddc1328e6b
Small fix in CCValue.cpp. visitMap is a template that supports IntValueMap and ValueMap. IntValueMap is confused. ValueMapIntKey seems better.
2013-12-18 17:01:57 +08:00
James Chen
7719c692b8
More warning fixes.
2013-12-18 16:03:07 +08:00
James Chen
581ba49399
Diables CC_ENABLE_CACHE_TEXTURE_DATA in Renderer::initGLView since Renderer is not inherited from Object now. CCNotificationCenter will not be able to work.
...
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
2013-12-18 15:41:57 +08:00
James Chen
0695e32fff
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
2013-12-18 15:40:31 +08:00
samuele3hu
f5f95399fd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-18 14:58:35 +08:00
James Chen
2892e8be3f
Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData.
2013-12-18 14:58:17 +08:00
CocosRobot
8f1e94471e
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-18 06:52:09 +00:00
James Chen
7a5074652c
Merge pull request #4526 from samuele3hu/LuaConversion
...
Add support for unsigned short
2013-12-17 22:43:42 -08:00
Dhilan007
2d9b7ee4fc
update vs project for new renderer and fix compiling fail on vs.
2013-12-18 14:36:49 +08:00
samuele3hu
55830c3023
Add support for unsigned short
2013-12-18 13:47:59 +08:00
samuele3hu
4d4b96ba30
issue #3402:Add the new label lua binding and the releated test cases
2013-12-18 11:39:43 +08:00
Ricardo Quesada
24f89ac45c
Revert... android platform is 10
2013-12-17 19:07:28 -08:00
Ricardo Quesada
156f69c528
Renderer is subclass of Object again... needed for Android.
...
ouch
2013-12-17 19:06:22 -08:00
Ricardo Quesada
5c9b8db0cb
Updates project files file Linux and Android
2013-12-17 18:47:46 -08:00
Ricardo Quesada
33c4f891a0
Adds 'CC' to renderer files
2013-12-17 18:41:09 -08:00
Ricardo Quesada
f369a8eec3
Adds correct License to Renderer files
2013-12-17 18:12:15 -08:00
Ricardo Quesada
3f3071fbb6
Cleanup RenderCommand code
...
RenderCommand code is cleaner
2013-12-17 18:02:11 -08:00
Ricardo Quesada
d6be81b7a8
The Renderer is not a singleton
...
In order to access, you have to get it from the Director
`Director::getInstance()->getRenderer()`
2013-12-17 17:50:17 -08:00
Ricardo Quesada
10eafeaeed
fixes warning compiler
2013-12-17 11:16:30 -08:00
Ricardo Quesada
441cb6c282
fixes warnings in QuadCommand
2013-12-17 10:35:15 -08:00
Ricardo Quesada
ff106ed070
fixes warning on Label Fragment shader
2013-12-17 10:01:38 -08:00
yinkaile
581a7856de
fixed compiler error
2013-12-17 19:32:16 +08:00
CocosRobot
12d8740537
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-17 10:39:43 +00:00
James Chen
9d1cb43d8c
Merge pull request #4510 from dumganhar/vector-fix
...
Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other).
2013-12-17 02:28:56 -08:00
James Chen
37f408f2b9
Merge pull request #4506 from Dhilan007/ushort_jsb
...
add API for transform unsigned short
2013-12-17 02:20:56 -08:00
Dhilan007
0414926b52
add API for transform unsigned short
2013-12-17 18:17:04 +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
3829f841e7
Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other).
2013-12-17 18:09:07 +08:00
yinkaile
6ff45b09e7
Merge branch 'newRenderer' into Array
...
Conflicts:
cocos/editor-support/cocostudio/CCArmature.cpp
cocos/editor-support/cocostudio/CCArmature.h
cocos/editor-support/cocostudio/CCBatchNode.cpp
cocos/editor-support/cocostudio/CCColliderDetector.cpp
cocos/scripting/auto-generated
tools/bindings-generator
2013-12-17 18:06:11 +08:00
James Chen
16b643fbef
Merge pull request #4508 from CocosRobot/updategeneratedsubmodule_1387273832
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-17 01:56:09 -08:00
James Chen
c0d741d0d8
Merge pull request #4507 from dumganhar/del-vector-foreach
...
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
2013-12-17 01:55:35 -08:00
James Chen
c85f9877bb
Reverts Vector::eraseObject, not need to return iterator.
2013-12-17 17:54:38 +08:00
CocosRobot
30521ff5a4
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-17 09:50:36 +00:00
James Chen
d16fa07661
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
2013-12-17 17:45:29 +08:00
minggo
bcb07abb7b
Merge pull request #4505 from 2youyouo2/newRenderer
...
update armature to new render
2013-12-17 01:43:07 -08:00
yinkaile
bc868cc004
update armature to new render
2013-12-17 17:00:01 +08:00
minggo
85ba3ee1a9
Merge pull request #4496 from Dhilan007/addImageAsync_IncorrectError
...
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly ...
2013-12-17 00:32:50 -08:00
CocosRobot
91cfecb931
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-17 08:13:06 +00:00
LinWenhai
649e6b8065
use size_t replace unsigned int for record redeque::size returned value.
2013-12-17 16:04:48 +08:00
James Chen
12cc6c6153
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer
...
Conflicts:
cocos/2d/CMakeLists.txt
2013-12-17 15:50:24 +08:00
James Chen
7fc7757470
issue #2171 : Adds header files of renderer in cocos2d.h.
2013-12-17 15:40:50 +08:00
James Chen
08edcca9be
issue #2171 : small fix in ccTypes.h
2013-12-17 15:39:35 +08:00
James Chen
8f5970ef90
issue #2171 : Don’t ‘using namespace std;’ in header file.
2013-12-17 15:32:24 +08:00
CocosRobot
21c74322bd
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-17 07:25:00 +00:00
minggo
16ed9155c0
Merge pull request #4460 from Dhilan007/label_distanceField
...
new label:add support for distanceField
2013-12-16 23:18:41 -08:00
James Chen
2a38d4fe94
issue #2171 : Fixing compilation errors for Linux port.
2013-12-17 14:50:40 +08:00
James Chen
d74ebe18a9
issue #2171 : NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
2013-12-17 14:19:35 +08:00
James Chen
4e01769cd5
issue #2171 : [New Renderer] Fixing compilation errors for Android.
2013-12-17 14:18:41 +08:00
Ricardo Quesada
c7d350c83e
Merge branch 'develop' into newRenderer
2013-12-16 20:43:43 -08:00
Huabing.Xu
6abb6639b5
remove android properties change by eclipse
2013-12-16 19:22:40 +08:00
Liam
3c26106ffb
update ui animation with frame ease type
2013-12-16 18:13:49 +08:00
Dhilan007
f7a448814c
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
2013-12-16 17:12:53 +08:00
Huabing.Xu
d63d3b3c24
remove manually JS binding functions
2013-12-16 14:45:21 +08:00
James Chen
7a1e13acab
Merge pull request #4494 from CocosRobot/updategeneratedsubmodule_1387175807
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-15 22:39:08 -08:00
CocosRobot
1e645cfcd5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-16 06:36:50 +00:00
Dhilan007
0cf17f5658
label : fix some error on android when the GLSL versions is 1.0
2013-12-16 14:36:11 +08:00
youyou
81cdbea9c8
change Array to Vector, Dictionary to Map
2013-12-16 14:34:09 +08:00
minggo
eb883f735b
Merge pull request #4489 from pyrasis/android_shadowstroke
...
fix CCImage bug on android platform.
2013-12-15 22:31:18 -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
James Chen
3a11dafda7
Uses reinterpret_cast instead of static_cast for jsval_to_ssize and luaval_to_ssize.
2013-12-16 14:13:24 +08:00
James Chen
adb45d3c68
Adds conversions for ssize_t.
2013-12-16 13:01:20 +08:00
Huabing.Xu
b1eacd52cb
Merge branch 'develop' into develop_gridNode
...
* develop:
fix compile error related to ssize_t.
issue #2771 : add and change some physics API, and add more documents
[AUTO] : updating submodule reference to latest autogenerated bindings
Some fixes for XXX:getDescription.
Reverts CCSpriteBatchNode.h
size_t —> ssize_t in CCTMXLayer.cpp
issue #2771 : add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
[AUTO] : updating submodule reference to latest autogenerated bindings
More renames of description() to getDescription()
getDescription() works as expected
fix compiling error after fixing conflicts
fix compiling error after fixing conflicts
use ssize_t for index
use ssize_t for index and capacity
use ssize_t for capacity and index in containers
Fix:Remove some needless lua binding functions and resolve a bug
2013-12-16 10:43:49 +08:00
minggo
53092b359b
Merge pull request #4486 from boyu0/iss2771_physical
...
[ci skip]issue #2771 : physical
2013-12-15 18:30:48 -08:00
boyu0
c15ad14ed3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-16 03:45:06 +08:00
boyu0
f9f816caf9
issue #3162 : change log to cpp file
2013-12-16 03:42:54 +08:00
Lee, Jae-Hong
2807e785c0
fix CCImage bug on android platform.
...
- android.graphics.Bitmap bytes are aleady RGBA
- delete swapAlphaChannel and swapAlpha
2013-12-15 21:07:55 +09:00
Ricardo Quesada
3838268fd0
Merge branch 'develop' into newRenderer
2013-12-14 19:28:01 -08:00
youyou
917bd8c3d9
change Array to Vector
2013-12-13 19:40:38 +08:00
boyu0
defae416f3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 18:09:39 +08:00
Dhilan007
4e2e423615
fix compile error related to ssize_t.
2013-12-13 17:53:03 +08:00
boyu0
2dbb2d496f
issue #2771 : add and change some physics API, and add more documents
2013-12-13 17:36:58 +08:00
CocosRobot
4114b682ca
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-13 09:10:37 +00:00
James Chen
189cf1a076
Some fixes for XXX:getDescription.
2013-12-13 16:51:57 +08:00
James Chen
ed93c114e5
Reverts CCSpriteBatchNode.h
2013-12-13 16:47:42 +08:00
James Chen
bb5ef615dd
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479
...
Conflicts:
cocos/2d/CCSpriteBatchNode.h
2013-12-13 16:44:22 +08:00
James Chen
7a8f2ae235
size_t —> ssize_t in CCTMXLayer.cpp
2013-12-13 16:41:03 +08:00
youyou
0e8c3409e5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
2013-12-13 16:28:50 +08:00
boyu0
4befb50307
issue #2771 : add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
2013-12-13 16:26:26 +08:00
youyou
6a3aff0861
fixed change animation internal, animation speed not right
2013-12-13 15:58:58 +08:00
samuele3hu
6c49131ed6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-13 15:51:03 +08:00
samuele3hu
98bd84c436
Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
2013-12-13 15:50:12 +08:00
youyou
1bdf1a44a1
1.change blendfunc method
...
2.support custom easing
2013-12-13 15:02:09 +08:00
Dhilan007
39280d55f3
new label:add support for distanceField
...
PerformanceTest:add performance test for label.
2013-12-13 12:42:15 +08:00
Huabing.Xu
a8a2ceb887
add linux make list
2013-12-13 12:25:17 +08:00
boyu0
aabb2c655d
issue #3162 : reset submodule
2013-12-13 11:48:16 +08:00
Huabing.Xu
305e80030c
update Visual studio project file
2013-12-13 10:59:23 +08:00
Huabing.Xu
00edb5f7fe
update android.mk in 2d folder
2013-12-13 10:57:23 +08:00
boyu0
d4c8fb0be6
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 10:47:52 +08:00
boyu0
c8c0e2270e
issue #3162 : deprecated RGBAProtocol, NodeRGBA and LayerRGBA
2013-12-13 10:10:49 +08:00
Ricardo Quesada
6ca6068cb7
Merge branch 'develop' into newRenderer
2013-12-12 14:58:47 -08:00
CocosRobot
644e2d923c
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-12 22:48:57 +00:00
Ricardo Quesada
61cc365d9e
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCGLProgram.h
cocos/2d/CCLabelTTF.h
2013-12-12 14:41:42 -08:00
Ricardo Quesada
f4c68e4eef
More renames of description() to getDescription()
2013-12-12 14:38:12 -08:00
Ricardo Quesada
a8c317bd83
getDescription() works as expected
...
renames `description` to `getDescription`. Adds `virtual` to it.
Adds `getDescription` to missing nodes.
2013-12-12 14:30:22 -08:00
Ricardo Quesada
29a15c885a
Merge branch 'develop' into newRenderer
2013-12-12 11:44:09 -08:00
boyu0
d7106d49be
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-12 17:04:21 +08:00
Huabing.Xu
5509bd48ef
remove _grid
2013-12-12 16:21:21 +08:00
Huabing.Xu
08bfbbc582
Fix project can not compile after rebased pull
2013-12-12 16:20:52 +08:00
Huabing.Xu
256fe13d3f
other grid scene transitions can work now
2013-12-12 15:15:43 +08:00
Huabing.Xu
f1cac00dd7
TransitionPageTurn can work now
2013-12-12 15:15:43 +08:00
Huabing.Xu
ea9d744d79
add setGridTarget method, grid node now can affect its target and its child
2013-12-12 15:15:43 +08:00
Huabing.Xu
09a9b1f557
remove setGrid getGrid in class Node
2013-12-12 15:15:43 +08:00
Huabing.Xu
aad617e200
add class GridNode
2013-12-12 15:10:04 +08:00
minggo
21e2b341f1
fix compiling error after fixing conflicts
2013-12-12 14:59:33 +08:00
minggo
16efe94946
fix compiling error after fixing conflicts
2013-12-12 14:48:27 +08:00
minggo
040c42ebfd
use ssize_t for index
2013-12-12 14:48:26 +08:00
minggo
1e9c763b40
use ssize_t for index and capacity
2013-12-12 14:48:26 +08:00
minggo
ab23b47043
use ssize_t for capacity and index in containers
2013-12-12 14:48:26 +08:00
samuele3hu
edfebce42c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-12 14:48:21 +08:00
samuele3hu
4ccceea230
Fix:Remove some needless lua binding functions and resolve a bug
2013-12-12 14:47:35 +08:00
James Chen
3649c12d37
issue #2790 : Compilation error fix in CCMap.h.
2013-12-12 14:36:59 +08:00
James Chen
93bd45cefd
issue #2790 : Adds comments for Vector<T>.
...
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
2013-12-12 14:22:49 +08:00
James Chen
3fc9c93102
issue #2790 : Comment fix for Map<K, V>::clear.
...
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
2013-12-12 12:58:01 +08:00
James Chen
6264336809
issue #2790 : Updates comments for Map<K, V> container.
...
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
2013-12-12 11:54:03 +08:00
CocosRobot
f12895a020
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-12 03:32:44 +00:00
James Chen
320ae15db4
issue #2790 : Lua compilation fix.
2013-12-12 10:54:41 +08:00
James Chen
b5bab598b3
issue #2790 : Disables deprecated warning for android to make Travis-CI happy.
2013-12-12 10:35:13 +08:00
James Chen
5c62fe8f3f
issue #2790 : Reverts comments in CCString.h
2013-12-12 10:34:41 +08:00
James Chen
92a7aa03de
issue #2790 : Reverts comments in CCDictionary.h
2013-12-12 09:53:50 +08:00
James Chen
b2e8bdce1e
issue #2790 : Uses StringUtils::format for Node::description().
2013-12-12 09:47:35 +08:00
James Chen
976bef8b68
issue #2790 : StringUtils::toStringWithFormat —> StringUtils::format.
2013-12-12 09:37:56 +08:00
Ricardo Quesada
6d1abc7d4d
Merge branch 'develop' into newRenderer
2013-12-11 15:28:05 -08:00
James Chen
9e637a3a3b
issue #2790 : GLProgram::getXXXLog return `std::string` to prevent using CCString which was deprecated.
2013-12-11 22:35:37 +08:00
James Chen
c2bccbaf98
issue #2790 : Removes unneeded dynamic_cast in CCPhyicsWorld.cpp.
2013-12-11 22:09:59 +08:00
James Chen
ce61fa4d9b
issue #2790 : const_iterator —> iterator to fix android build errors.
2013-12-11 22:09:22 +08:00
James Chen
45dabe305f
issue #2790 : performance improved for PhysicsWorld.
2013-12-11 18:08:07 +08:00
James Chen
36fd873257
issue #2790 : Adds Vector::find.
2013-12-11 18:08:07 +08:00
James Chen
cc567a3077
issue #2790 : Vector::remove —> Vector::erase.
2013-12-11 18:08:06 +08:00
James Chen
093e310cab
issue #2790 : Vector::remove —> Vector::erase.
2013-12-11 18:08:06 +08:00
James Chen
b66fccb5ab
issue #2790 : Removes Map::erase(first, last).
2013-12-11 18:08:06 +08:00
James Chen
be9bb6998b
issue #2790 : Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes.
...
Also renames Map::remove to Map::erase.
2013-12-11 18:08:06 +08:00
James Chen
49cc9719a6
issue #2790 : log —> CCLOG.
2013-12-11 18:08:06 +08:00
James Chen
40bc797b1f
issue #2790 : Configuration::getValue has default value now.
2013-12-11 18:08:06 +08:00
James Chen
1a1cef9342
issue #2790 : Addes Value::Null variable.
2013-12-11 18:08:05 +08:00
James Chen
022df4c014
issue #2790 : Removes test codes.
2013-12-11 18:08:05 +08:00
James Chen
2cda34d59a
issue #2790 : Deprecates CCDictionary, uses ValueMap for pure base data. Adds StringUtils class .
2013-12-11 18:08:05 +08:00
boyu0
00b115843c
issue #3162 : add updateColor function to Label and delete duplicate functions.
2013-12-11 16:38:47 +08:00
boyu0
7cbce905bf
issue #3162 : delete duplicate functions.
2013-12-11 16:12:14 +08:00
boyu0
463ae20ce6
issue #3162 : Add layer cascade color and cascade opacity test, fix bugs
2013-12-11 15:57:20 +08:00
samuele3hu
d104f49dea
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-11 12:06:37 +08:00
samuele3hu
6d8deac8a8
issue #3374:Register the lua manual binding funtions leading to the top index of lua state
2013-12-11 12:05:46 +08:00
James Chen
473b21a05a
Merge pull request #4471 from Dhilan007/compile_error_vs_131210
...
fix compile error for vs project.
2013-12-10 18:06:57 -08:00
Ricardo Quesada
3b66d09bf5
Merge branch 'develop' into newRenderer
2013-12-10 11:10:55 -08:00
Ricardo Quesada
23222923bf
Migrated code to Matrix4
2013-12-10 11:07:15 -08:00
Dhilan007
35eeebe64a
add comments for include "CCStdC.h" only for windows
2013-12-10 23:13:21 +08:00
Dhilan007
abef5b59fa
fix compile error for vs project
2013-12-10 21:20:52 +08:00
James Chen
f10bd853c0
A warning fix in CCBAnimationManager. Uses CallFuncN::create(std::function) instead.
2013-12-10 20:33:21 +08:00
James Chen
1db469fa3d
Merge pull request #4467 from CocosRobot/updategeneratedsubmodule_1386674868
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 03:28:49 -08:00
CocosRobot
bf11a8d309
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 11:27:50 +00:00
James Chen
47541523e8
Merge pull request #4466 from dumganhar/iss2790-deprecate-ccarray
...
issue #2790 : HttpClient and TouchesTest uses Vector<T> now.
2013-12-10 03:24:31 -08:00
boyu0
a71394b122
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-10 18:03:41 +08:00
samuele3hu
89c079009b
issue #2790:Resolve some errors of basical conversion functions
2013-12-10 18:01:40 +08:00
James Chen
627a1bf700
issue #2790 : HttpClient uses Vector<T> now.
2013-12-10 16:41:13 +08:00
CocosRobot
a775f7940d
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 08:30:00 +00:00
James Chen
eff05669b9
Merge pull request #4463 from boyu0/edit_using_of_std_move
...
Edit using of std move
2013-12-10 00:12:07 -08:00
boyu0
083a0eea2a
Remove all std::move in function returns.
2013-12-10 16:06:05 +08:00
boyu0
698cdc5591
add std::move to Vector move constructor and move equal operator overloading function.
2013-12-10 15:58:13 +08:00
CocosRobot
b5a0048ffd
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 07:21:39 +00:00
minggo
55270cecb4
Merge pull request #4457 from dumganhar/iss2790-deprecate-ccarray
...
issue #2790 : Don't use CCDictionary, CCArray for CCBReader, use std::unordered_map, Vector<T>, Map<K, V> instead.
2013-12-09 23:15:43 -08:00
James Chen
e03dc97726
isssue #2790 : Removes unused FIXME comment.
2013-12-10 13:51:58 +08:00
James Chen
1a385c1572
issue #2790 : _actionManager —> _animationManager.
2013-12-10 13:45:15 +08:00
James Chen
52d00477ad
issue #2790 : Uses std::shared_ptr for _actionManagers.
2013-12-10 13:42:55 +08:00
James Chen
479477be52
issue #2790 : Stops all actions when reset _rootNode.
2013-12-10 13:41:51 +08:00
CocosRobot
1927e3e62c
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 04:08:19 +00:00
samuele3
85783fff2b
issue #2790:Unify the format
2013-12-10 11:47:51 +08:00
samuele3
34c0147cf3
issue #2790:Resolve the compile error
2013-12-10 11:33:57 +08:00
samuele3
f801a8e5fe
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-10 11:21:59 +08:00
samuele3
c2e7299d8f
Issue #2790:Add more conversion functions to support templates containers
2013-12-10 11:21:30 +08:00
Ricardo Quesada
0222c6544e
Migration to Mat4x4
...
Armature not migrated yet
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-12-09 17:32:51 -08:00
Ricardo Quesada
aa00137fde
Merge branch 'develop' into newRenderer
2013-12-09 11:10:00 -08:00
James Chen
64fd2386a9
issue #2790 : Uses Map<K, V> instead of Dictionary in CCBAnimationManager.
2013-12-09 18:17:04 +08:00
James Chen
8b69994d5c
issue #2790 : Removes CCBValue.
2013-12-09 17:55:56 +08:00
James Chen
d1d5659818
issue #2790 : Uses Vector<T> or Map<K, V> as many as possible for CCBReader.
2013-12-09 17:55:56 +08:00
James Chen
f6dc9bf9b6
issue #2790 : Adds more ‘assignment operator’ method for CCValue.
2013-12-09 17:55:56 +08:00
James Chen
f16068e621
issue #2790 : Bug fix in CCMap.h
2013-12-09 17:55:56 +08:00
James Chen
21b84339ca
issue #2790 : Reverts to use Dictionary to avoid a strange bug for CCBReader.
2013-12-09 17:55:56 +08:00
James Chen
d63b933eb3
issue #2790 : More CCArray —> Vector<T> or ValueVector for CCBAnimationMangager
2013-12-09 17:55:55 +08:00
minggo
63779930a6
Merge pull request #4452 from boyu0/add_stencil_nil_test
...
[ci skip]Add _stencil is nil test, add warning log.
2013-12-09 01:32:40 -08:00
boyu0
d0da73c365
Add _stencil is nil test, add warning log.
2013-12-09 14:00:10 +08:00
youyou
a884a70045
fix2d compling warning
2013-12-09 13:56:07 +08:00
CocosRobot
b2e7966137
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-09 03:53:01 +00:00
boyu0
d6d7923134
closed #3162 : add RGBAProtocol, NodeRGBA and LayerRGBA back and deprecate them
2013-12-09 11:32:28 +08:00
youyou
c96bc7b58d
fix collider Synchronization
2013-12-09 11:14:53 +08:00
James Chen
a2e90f1fca
issue #2790 : Small fixes for physics, uses reference and std::move.
2013-12-09 10:54:22 +08:00
James Chen
13111c2cd9
issue #2790 : Error fix in CCBReader.
2013-12-09 09:54:04 +08:00
James Chen
e07f2bdddd
issue #2790 : Vector<T> and Map<K, V> for CCBReader. Not finished yet.
2013-12-08 22:17:54 +08:00
James Chen
f406dcfebc
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2790-deprecate-ccarray
2013-12-07 23:32:49 +08:00
James Chen
abbcd45c58
issue #2790 : CCLOG —> CCLOGINFO in CCMap.h
2013-12-07 23:32:29 +08:00
James Chen
908f5ed515
issue #2790 : Fix for TMXObjectGroup::getObject.
2013-12-07 16:38:50 +08:00
James Chen
beb6bb6c8d
issue #2790 : Bug fix in CCMap.h
2013-12-07 16:14:22 +08:00
James Chen
be7c62a2b9
issue #2790 : Removes unused CCSet binding glue codes.
2013-12-07 14:44:21 +08:00
James Chen
16cd61f024
issue #2790 : Vector<T> for physics and remove lots of unneeded dynamic_cast.
2013-12-07 14:28:14 +08:00
James Chen
365f6faabb
issue #2790 : Warning fixes for CCDictionary.cpp and CCString.cpp
2013-12-07 14:26:52 +08:00
James Chen
06e6d38ab0
issue #2790 : Initializes Value when empty constructor was invoked.
2013-12-07 14:26:17 +08:00
James Chen
6b0589679b
issue #2790 : Vector<SchedulerScriptHandlerEntry*> instead of CCArray* in CCScheduler
2013-12-07 14:25:24 +08:00
James Chen
d7997cf0cc
issue #2790 : Updates MenuItemToggole
2013-12-07 14:24:31 +08:00
James Chen
cd72813389
issue #2790 : Autorelease pool is using Vector<T> now.
2013-12-07 14:23:29 +08:00
James Chen
b0cb7c230a
#issue #2790 : Uses Vector<Scene*> for scenesStack in CCDirector.
2013-12-07 14:22:51 +08:00
James Chen
0091ca2b6f
issue #2790 : Uses non-const ValueMap for simplifying codes in CCAnimationCache.cpp.
2013-12-07 14:22:03 +08:00
James Chen
6f13a111ae
issue #2790 : Adds Vector<T>::sort method, adds Vector::removeObject(object, toRemoved).
2013-12-07 14:18:42 +08:00
James Chen
165cdf7fe6
issue #2790 : Deprecates CCArray.
2013-12-07 10:48:02 +08:00
James Chen
23ad9f4e1a
issue #2790 : Adds const version of Vector<T>::forEach.
2013-12-07 10:46:40 +08:00
Ricardo Quesada
8df96b1a6e
Layercolor uses the new API
2013-12-06 17:59:34 -08:00
Ricardo Quesada
ba2f65c6b2
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
2013-12-06 17:42:48 -08:00
Ricardo Quesada
ee0ef6bf46
ProgressTimer works OK
...
Adds _modelViewTransform as ivar of Node (temporary fix)
2013-12-06 17:42:16 -08:00
Nite Luo
94255a9d52
Fix culling
2013-12-06 14:59:06 -08:00
Ricardo Quesada
439adafbcd
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
2013-12-06 11:57:19 -08:00
Ricardo Quesada
745541979b
Particles working again.
...
Paticle Batch working too: increased VBO_SIE to 10500
2013-12-06 11:51:17 -08:00
Nite Luo
3e0bee706e
Fix a hack in CCLabelAtlas for vertice color, add TODO for quad command
2013-12-06 11:41:24 -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
boyu0
0e94d4f3b8
closed #3162 : fix indent.
2013-12-06 18:23:31 +08:00
James Chen
6cd573fa7f
issue #2790 : Deprecates CCSet.
2013-12-06 18:16:58 +08:00
boyu0
4d0e3dbd8d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-06 18:16:26 +08:00
boyu0
af5f496861
issue #3162 : Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.
2013-12-06 18:07:16 +08:00
CocosRobot
8442f17259
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-06 09:31:16 +00:00
James Chen
0d30f2bbbb
Merge pull request #4445 from dumganhar/iss2790-template-container
...
issue #2790 : Fix of JSB project broken after using Vector<T>
2013-12-06 01:24:21 -08:00
minggo
368647c166
Merge pull request #4444 from minggo/fix-warning
...
fix some warnings
2013-12-06 01:07:03 -08:00
James Chen
9f6d2df63b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2790-template-container
2013-12-06 16:46:51 +08:00
James Chen
b5978eeee6
issue #2790 : Bindings-generator supports binding Vector<T> and some bug fixes.
2013-12-06 16:46:19 +08:00
minggo
fa7c97171b
fix some warnings
2013-12-06 16:32:06 +08:00
minggo
0126aaa205
Merge pull request #4442 from minggo/use-schedule
...
use Schedule::performFunctionInCocosThread
2013-12-05 22:30:54 -08:00
Ricardo Quesada
81b06f06a9
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCAtlasNode.h
2013-12-05 22:24:41 -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
minggo
eecd5d7980
Merge pull request #4441 from xhcnb/mem_leak_android_userdefault
...
[ci skip]UserDefault::setDataForKey on android will cause memory leak
2013-12-05 22:19:58 -08:00
samuele3
c006bfd68e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror
2013-12-06 14:17:23 +08:00
samuele3
ad8638d976
issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper
2013-12-06 14:16:33 +08:00
minggo
1502fef7e4
use Schedule::performFunctionInCocosThread
2013-12-06 14:15:01 +08:00
youyou
e17b9d839b
1.add TEST_EASING
...
2.add play serveral movement function
3.update TEST_COLLIDER_DETECTOR
4.fixed movement event
2013-12-06 13:40:49 +08:00
Jason Xu
29bd5001ae
UserDefault::setDataForKey on android will cause memory leak
2013-12-06 11:53:43 +08:00
minggo
f02d15d71f
initialize static member variable in cpp
2013-12-06 11:46:13 +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
Nite Luo
e3fc789070
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
2013-12-05 12:05:44 -08:00
darkdukey
5f902d95b3
Merge pull request #5 from dabingnn/newRendererParticleSystem
...
New renderer particle system
2013-12-05 12:05:18 -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
minggo
9676821479
use int in Vector
2013-12-05 17:38:08 +08:00
minggo
b67d567a79
replace long with int or ssize_t
2013-12-05 17:22:22 +08:00
James Chen
6aa2e5b257
Updates comments that vs2012 doesn’t support initializer list.
2013-12-05 16:49:05 +08:00
James Chen
b520941c5c
Reverts config of VS project.
2013-12-05 16:37:50 +08:00
James Chen
b4b50f3491
Compilation fix for windows.
2013-12-05 16:33:13 +08:00
James Chen
79700118db
Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole
...
Conflicts:
cocos/base/CCConsole.cpp
cocos/base/CCConsole.h
2013-12-05 16:26:04 +08:00
James Chen
2b857ebb52
Fixing compilation errors on windows.
2013-12-05 16:09:38 +08:00
Ricardo Quesada
c617eee505
Uses the new Vector<>. Code is more robust!
2013-12-04 22:07:23 -08:00
Ricardo Quesada
6a034a91f1
Merge branch 'develop' into console
...
Conflicts:
cocos/scripting/auto-generated
2013-12-04 21:58:11 -08:00
Ricardo Quesada
73321199b9
Console: commands receives the char*
...
The char* is passed in case the commands
need to sub-parse the arguments.
Very useful for QA.
For example, the could create a command called "click", and the command could
receive arguments.
2013-12-04 21:51:08 -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
CocosRobot
d04f777351
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-05 04:02:07 +00:00
James Chen
14ab7ccd16
Merge pull request #4428 from boyu0/iss2771_move_CC_USE_PHYSICS_to_header
...
issue #2771 : move CC_USE_PHYSICS from project definition to ccConfig.h
2013-12-04 19:55:10 -08:00
martell
e0523c73f5
fixed CCImage for MSVC someone added std:tolower which broke it
2013-12-05 03:53:25 +00:00
James
373c3b01bf
issue #2790 : Fixing compilation errors on linux.
2013-12-05 11:44:37 +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
e0bf32d881
dprintf is not defined on Android
...
using my own dprintf
2013-12-04 19:33:50 -08:00
Ricardo Quesada
49b25231f2
Compiles on Android
2013-12-04 19:16:01 -08:00
Nite Luo
9b0e0d2116
Fix a bug with auto batching logic
2013-12-04 19:05:17 -08:00
James Chen
944160210c
issue #2790 : Renames functions in Map<K, V>.
2013-12-05 10:59:43 +08:00
Ricardo Quesada
4aae44f1e9
fixes cocos2d.h include
2013-12-04 18:54:15 -08:00
James Chen
499a0404d4
issue #2790 : Renames some functions in Vector<T>. Makes it more like stl vector.
2013-12-05 10:35:10 +08:00
Ricardo Quesada
15321a58df
fixes compiler errors on Linux
2013-12-04 18:28:09 -08:00
Huabing.Xu
e6823875d5
change VBO_SIZE to a big number to avoid crash temporarily
2013-12-05 10:20:54 +08:00
Huabing.Xu
7a58cb5a29
use quad command instead of custom command for ParticleSystemQuad::draw()
2013-12-05 10:20:22 +08:00
Ricardo Quesada
b52d535a42
fixes indentation issues
...
and some compilations issues on Linux
2013-12-04 18:19:51 -08:00
Ricardo Quesada
f42aef0af8
Moves CCConsole.* to base/
2013-12-04 18:09:23 -08:00
Nite Luo
e316ac779b
Sprite culling now using vertices directly to avoid calculation on transform
2013-12-04 17:41:18 -08:00
Ricardo Quesada
c2a88154af
Custom commands are working OK
2013-12-04 17:38:11 -08:00
Nite Luo
a98714f6a5
support device without VAO
2013-12-04 17:02:02 -08:00
Ricardo Quesada
e41deeee86
Adds Scene Graph command
2013-12-04 16:57:44 -08:00
Ricardo Quesada
ef18d4891e
More bug fixes
2013-12-04 16:26:21 -08:00
Nite Luo
792cb5a716
Merge branch 'develop' into newRenderer
2013-12-04 15:23:12 -08:00
Nite Luo
143df8af7d
Fix RenderTexture after merging commandpool
2013-12-04 15:13:13 -08:00
darkdukey
4b7d0c290a
Merge pull request #4 from dabingnn/newRendererCommandPool
...
New renderer command pool
2013-12-04 15:08:17 -08:00
Nite Luo
f423166471
Fix bugs with RenderTexture with NewRender
2013-12-04 15:06:28 -08:00
Ricardo Quesada
f69d5d1328
Merge branch 'develop' into console
2013-12-04 12:28:05 -08:00
Ricardo Quesada
245d33e4ad
Fixes several bugs in the console.
...
[*] Doesn't crash
[*] Closes connection
[*] Its faster
2013-12-04 12:26:43 -08:00
Nite Luo
ae551ae294
Convert RenderTexture to use RenderCommands
2013-12-04 11:54:57 -08:00
James Chen
c9767b8ea0
issue #2790 : fileToValueDict —> getValueMapFromFile, fileToValueArray —> getValueVectorFromFile.
2013-12-04 17:50:57 +08:00
James Chen
54289276de
issue #2790 : ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap.
2013-12-04 17:46:57 +08:00
James Chen
736c70704b
issue #2790 : Some FIXME fixes.
2013-12-04 17:28:14 +08:00
James Chen
4212e33aee
issue #2790 : Removes unused comments in CCAnimation.h
2013-12-04 17:27:53 +08:00
James Chen
bbeec97b48
issue #2790 : Bug fixes in CCValue.cpp.
2013-12-04 16:38:12 +08:00
James Chen
82cc795ecf
issue #2790 : Adds more move functions.
2013-12-04 16:37:48 +08:00
James Chen
293ba0210b
issue #2790 : CCLOG —> CCLOGINFO for CCMap.h and CCVector.h
2013-12-04 16:37:08 +08:00
James Chen
60874ece64
issue #2790 : Updates Makefile, Moves some codes to CCValue.cpp.
2013-12-04 16:18:22 +08:00
James Chen
ceaa1f26bb
issue #2790 : Windows run ok with ValueDict for FileUtils.
2013-12-04 16:02:54 +08:00
James Chen
76896d70d0
issue #2790 : Android build was ok, fixes some warnings.
2013-12-04 16:02:54 +08:00
James Chen
35b96602d3
issue #2790 : includes <algorithm> for std::for_each.
2013-12-04 16:02:53 +08:00
James Chen
5c60f66c63
issue #2790 : Menu::itemForTouch —> Menu::getItemForTouch. Array* —> ValueArray.
2013-12-04 16:02:53 +08:00
James Chen
f01f56113c
issue #2790 : Don’t make an assert if converting Value failed.
2013-12-04 16:02:53 +08:00
James Chen
5eb9446b80
issue #2790 : Uses const reference instead of value for std::for_each ’s argument.
2013-12-04 16:02:53 +08:00
James Chen
3fc5fffd26
issue #2790 : const char* —> const std::string& for CCNS.h/.cpp.
2013-12-04 16:02:53 +08:00
James Chen
9881ab2178
issue #2790 : Uses cocos2d::Map and ValueDict for SpriteFrameCache.
2013-12-04 16:02:53 +08:00
James Chen
2e0489a49c
issue #2790 : Uses ValueDict instead of Dictionary* for ParticleSystem.
2013-12-04 16:02:53 +08:00
James Chen
2d6e6dbdb0
issue #2790 : Assert fix for Vector<T>::insertObject.
2013-12-04 16:02:52 +08:00
James Chen
1164176bed
issue #2790 : NULL —> nullptr in CCParticleSystem.cpp.
2013-12-04 16:02:52 +08:00
James Chen
411136dd57
issue #2790 : Updates CCValue, supports using ‘const char*’ to construct a Value.
2013-12-04 16:02:52 +08:00
James Chen
4ec6e50cc4
issue #2790 : Pure base data from Dictionary* to ValueDict, Array* to ValueArray.
2013-12-04 16:02:52 +08:00
James Chen
8a435aa274
issue #2790 : ArrayValue —> ValueArray, DictValue —> ValueDict.
2013-12-04 16:02:52 +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
9928e8bef1
issue #2790 : Uses Vector<T>::getObjectAtIndex instead of Vector<T>[] operator to avoid some mistakes.
2013-12-04 16:01:55 +08:00
James Chen
cb215bc931
issue #2790 : Vector<T> replaces Array* finished.
2013-12-04 16:01:55 +08:00
James Chen
0d581a15d8
issue #2790 : MenuItemToggle::setSubItems() uses Vector<MenuItem*> now.
2013-12-04 16:01:55 +08:00
James Chen
8aef092005
issue #2790 : TestCpp with new Vector<>.
2013-12-04 16:01:54 +08:00
James Chen
1d5984b29a
issue #2790 : Vector::makeObjectsPerformCallback —> Vector::forEach
2013-12-04 16:01:02 +08:00
James Chen
d4d864216b
issue #2790 : Deletes Vector::init, adds Vector::setCapacity.
2013-12-04 16:00:18 +08:00
James Chen
90062b656d
issue #2790 : Node::_children is Vector<Node*> now.
2013-12-04 16:00:17 +08:00
James Chen
c152652c5b
issue #2790 : Vector<FiniteTimeAction*> for Sequence::create(arr) and Spawn::create(arr).
2013-12-04 15:56:08 +08:00
James Chen
80004548c8
issue #2790 : Adds CCVector.h to Xcode project. int —> long
2013-12-04 15:56:08 +08:00
James Chen
52af153a81
issue #2790 : Commit CCVector.h from Riq’s repo( https://github.com/ricardoquesada/cocos2d-x/blob/template_vector/cocos2dx/cocoa/CCVector.h ).
2013-12-04 15:56:08 +08:00
CocosRobot
a354031526
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-04 07:47:50 +00:00
samuele3
629ffcbbfd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDeprecated
2013-12-04 15:20:09 +08:00
samuele3
c1a226686f
issue #3309:Modify some deprecated cpp files and lua files
2013-12-04 15:15:55 +08:00
boyu0
98779b0a9f
issue #2771 : move CC_USE_PHYSICS from project definition to ccConfig.h
2013-12-04 14:36:32 +08:00
minggo
608e3bfa1b
Merge pull request #4410 from signmotion/corrected_DISALLOW_COPY_AND_ASSIGN
...
[ci skip]Corrected "disallow copy and assign"
2013-12-03 19:21:45 -08:00
minggo
92b180080c
Merge pull request #4409 from mlepage/develop
...
[ci skip]Fix typos
2013-12-03 19:13:23 -08:00
Ricardo Quesada
a34352cef7
Console is working!
2013-12-03 18:46:54 -08:00
Huabing.Xu
cd562676f5
use block allocation for commands
2013-12-04 10:39:34 +08:00
minggo
9babdaa1fa
Merge pull request #4419 from boyu0/iss2771_physical_fix_update_physics_transform
...
[ci skip]issue #2771 : add condition test to updatePhysicsTransform
2013-12-03 18:15:35 -08:00
minggo
712bcc7b36
Merge pull request #4416 from minggo/change-long
...
[ci skip]use size_t instead of long in Array
2013-12-03 18:08:08 -08:00
Nite Luo
0c292e59b8
Merge branch 'develop' into newRenderer
2013-12-03 10:52:10 -08:00
boyu0
fd68dc4f9f
issue #2771 : add condition test to updatePhysicsTransform
2013-12-03 16:28:18 +08:00
samuele3
367799da0d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDeprecated
2013-12-03 15:42:31 +08:00
samuele3
a8c1bba464
issue #3309:Add some deprecated functions and classes to support master cocostudio lua bindings
2013-12-03 15:40:59 +08:00
Huabing.Xu
757f1abc7f
1. protected render command construction/destruction function.
...
2. use renderCommandPool<T> to allocate and deallocate command
3. use releaseToCommandPool interface to push command back to pool
2013-12-03 14:08:47 +08:00
minggo
02aca34ccf
Merge pull request #4417 from boyu0/iss2771_physical
...
[ci skip]issue #2771 physical, add more joint and joint tests
2013-12-02 21:59:46 -08:00
boyu0
63a4e09c90
issue #2771 : add more joint tests, add some joint api, fix bugs
2013-12-03 12:47:03 +08:00
Huabing.Xu
44f12ce8e4
add RenderCommandPool head file
2013-12-03 11:52:51 +08:00
Huabing.Xu
d4b9e0538b
refactor: group command use a non parameter constructor and a reentrant init function
2013-12-03 11:24:03 +08:00
Huabing.Xu
d33f05b3f0
refactor: custom command use a non parameter constructor and a reentrant init function
2013-12-03 11:17:21 +08:00
Huabing.Xu
ace75eebce
refactor: quad command use a non parameter constructor and a reentrant init function
2013-12-03 11:11:46 +08:00
minggo
225348cdde
use size_t instead of long in Array
2013-12-03 11:09:39 +08:00
Nite Luo
6862d59bb2
Add NewRenderTexture to convert RenderTexture to use new renderer
2013-12-02 17:23:52 -08:00
Nite Luo
8801f508eb
Partcle system use the new renderer
2013-12-02 12:13:05 -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
Ricardo Quesada
eb834bce7f
Adds readline
2013-12-02 09:57:16 -08:00
boyu0
dba58f6a9b
issue #2771 : add more joints
2013-12-02 18:29:04 +08:00
James Chen
9618eb00be
Merge pull request #4411 from martell/cmake
...
closed #3328 : cmake support for windows
2013-12-02 01:22:57 -08:00
garfield_ho
bac83f3740
Cancel the onSubThreadEnded callback,because _ws may be deleted in the onClose callback.
2013-12-02 17:19:52 +08:00
martell
06ff1bc594
Fixed HelloCpp Linking on Linux
2013-12-02 07:10:37 +00:00
martell
7a8653525b
fixed Audio for Linux
2013-12-02 06:37:32 +00:00
2youyou2
963dd6852b
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
2013-12-02 13:33:26 +08:00
2youyou2
246b03d52d
fixed alpha effect
2013-12-02 13:32:31 +08:00
minggo
d2f235f8b8
Merge pull request #4408 from boyu0/iss2345_add_tga_support_to_CCImage
...
[ci skip]issue #2345 : add tga support to Image
2013-12-01 18:18:42 -08:00
minggo
24f7819e99
Merge pull request #4362 from xhcnb/hotfix_android_setAccelerometerInterval
...
[ci skip]Fix: on android, Device::setAccelerometerInterval will causes dead loop
2013-12-01 18:08:58 -08:00
martell
f369606d77
fix cocos2d-x for vs2013
2013-11-30 08:05:39 +00:00
martell
79401a7596
quickly added win32 cmake
2013-11-30 06:09:12 +00:00
signmotion
03d64e0689
- Corrected CC_DISALLOW_COPY_AND_ASSIGN.
2013-11-29 20:34:15 +02:00
signmotion
41daad30fa
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-29 19:44:03 +02:00
Marc Lepage
940b0ffd56
Fix typos
2013-11-29 12:09:38 -05:00
Jason Xu
266e4e1654
rename to with Jni suffex
2013-11-29 19:34:36 +08:00
Jason Xu
27c3a459ed
rename android native function names.
2013-11-29 17:17:15 +08:00
boyu0
83f855e2ec
issue #2345 : delete unnecessary include
2013-11-29 15:31:58 +08:00
boyu0
04c3d95005
issue #2345 : namespace cocos2d { -> NS_CC_BEGIN
2013-11-29 15:25:21 +08:00
boyu0
dffc12e648
issue #2345 : new/delete -> malloc/free
2013-11-29 15:13:16 +08:00
boyu0
86074c23d8
issue #2345 : class Image add tga image format support.
2013-11-29 14:31:42 +08:00