boyu0
4df1e104f3
issue #4118 : improve performance.
2014-02-26 19:56:52 +08:00
Huabing.Xu
c7315a2e3e
closed #3874 : expand textureID bit to 32bits
2014-02-26 15:01:45 +08:00
zhangbin
24ba47a43a
closed #3991 , Add method to reload cached texture & update the nodes used the texture.
2014-02-26 11:44:54 +08:00
James Chen
5e315273f9
Merge pull request #5467 from boyu0/bug4144_node_setphysicsbody
...
closed #4144 : fix bug: Can not use Node::setPhysicsBody to reset a physics body.
2014-02-26 11:43:19 +08:00
James Chen
2b2979551e
Merge pull request #5460 from boyu0/iss4118_physical_performance_improve
...
issue #4118 : Physical performance improve.
2014-02-26 11:37:13 +08:00
boyu0
912dad7a71
closed #4144 : fix bug: Node::setPhysicsBody doesn't work at the second time.
2014-02-26 10:53:41 +08:00
James Chen
51808b59e9
More const reference love in EventDispatcher.
2014-02-25 14:31:24 +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
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
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
a4cc0edb4a
issue #4118 : refactor physics update
2014-02-24 16:17:42 +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
Ricardo Quesada
f77b92f1d7
performance improvements in culling
2014-02-23 02:02:28 -08: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
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
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
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
Dhilan007
d0e640d966
remove CC prefix.
2014-02-21 09:59:43 +08:00
Dhilan007
54f48b23e6
LabelBMFont re-implemented as a wrapper of Label.
2014-02-20 22:33:52 +08:00
James Chen
68eaa746ea
closed #2535 : TouchScriptHandlerEntry will release twice lua reference
2014-02-20 21:58:20 +08:00
James Chen
0b6858bdde
Added virtual and override keywords to Scene::init() method
2014-02-20 21:37:01 +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
7970e37bf5
closed #4097 : Adds missing include.
2014-02-20 17:23:22 +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
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
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
2c5f791e03
issue #4058 : Scheduler:: scheduleUpdateForTarget is a template function now. And it works perfect.
2014-02-20 11:57:04 +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
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
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
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
Dhilan007
5361413383
replace [auto] with [const auto&] in FOR loop.
2014-02-18 16:41:01 +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
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
James Chen
905443d17c
new[] free mismatching after PR #5326 .
2014-02-18 10:11:04 +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
Dhilan007
4f94064242
closed #4048:fixed LabelTTFMultiline test case show nothing on mac.
2014-02-17 14:35:49 +08:00
zhangbin
e02f488224
Merge branch 'develop' into issue3964
2014-02-16 11:01:07 +08:00
James Chen
1693ea0ef6
Typo fix in CCDevice.mm.
2014-02-14 09:41:06 +08:00
Dhilan007
0d5c702708
move labelttf's platform-dependent code from CCImage to CCDevice
2014-02-13 21:08:43 +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
zhangbin
8ae5d2a049
closed #3964 , Solve the bug of logic code in method Image::saveImageToPNG().
2014-02-13 16:22:41 +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
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
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
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
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
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
Dhilan007
a8387a12f0
Merge branch 'improve-label-chinese' of https://github.com/Pisces000221/cocos2d-x into develop
2014-02-10 10:09:56 +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
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
Pisces000221
ae8057b933
Added ischinese_unicode function
2014-02-08 14:07:18 +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
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
Ricardo Quesada
e33baac396
iso almost working
2014-02-06 22:20:28 -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
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
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
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
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
Ricardo Quesada
4ed2e0d9d2
Merge branch 'develop' into glview_improvements
...
Conflicts:
CHANGELOG
cocos/2d/platform/linux/CCApplication.cpp
samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp
samples/Cpp/HelloCpp/Classes/AppDelegate.cpp
samples/Cpp/HelloCpp/Classes/AppMacros.h
samples/Cpp/HelloCpp/proj.ios/AppController.mm
samples/Cpp/HelloCpp/proj.mac/main.cpp
samples/Cpp/SimpleGame/Classes/AppDelegate.cpp
samples/Cpp/SimpleGame/proj.ios/AppController.mm
samples/Cpp/SimpleGame/proj.mac/main.cpp
samples/Cpp/TestCpp/Classes/AppDelegate.h
samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
samples/Javascript/CocosDragonJS/proj.ios/AppController.mm
samples/Javascript/CocosDragonJS/proj.mac/main.cpp
samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
samples/Javascript/CrystalCraze/proj.ios/AppController.mm
samples/Javascript/CrystalCraze/proj.mac/main.cpp
samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp
samples/Javascript/MoonWarriors/proj.ios/AppController.mm
samples/Javascript/MoonWarriors/proj.mac/main.cpp
samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp
samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm
samples/Javascript/WatermelonWithMe/proj.mac/main.cpp
samples/Lua/HelloLua/Classes/AppDelegate.cpp
samples/Lua/HelloLua/proj.ios/AppController.mm
samples/Lua/HelloLua/proj.mac/main.cpp
2014-01-28 11:32:25 -08:00
James Chen
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
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
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
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
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
6a302735d8
Removes unused files.
2014-01-26 17:54:13 +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
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
martell
609ee3db2b
Added Dutch for 3.x branch
2014-01-25 20:38:15 +00: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
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
Dhilan007
6655ad79d7
use const ValueMap& for setters.
2014-01-24 16:05:38 +08:00
Dhilan007
43ef9051a3
close #3835:fix TMXMapInfo::startElement insert property to properties fail
2014-01-24 15:37:32 +08:00
Dhilan007
771ed300c4
close #3642:fix bounding box of new label is incorrect.
2014-01-24 14:04:08 +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
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
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
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
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
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
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
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
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
Huabing.Xu
cc39ca4f16
issue #3812 : rename convertToWorldCoordiantes->convertToWorldCoordinates
2014-01-22 17:09:13 +08:00
minggo
9c6a65baba
Merge pull request #5156 from minggo/deprecate-function
...
deprecated some functions in Object
2014-01-22 00:51:50 -08: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
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
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
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
minggo
4833810c6e
Merge pull request #5132 from minggo/iss3713-replace_CCObject
...
remove Object::_autoReleaseCount
2014-01-21 02:26:40 -08:00
Dhilan007
697b0289c7
close #3805:fix wrap error and alignment error.
2014-01-21 17:55:49 +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
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
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
minggo
5fd35c3bab
Merge https://github.com/cocos2d/cocos2d-x into iss3713-replace_CCObject
2014-01-21 13:46:40 +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
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
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
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
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
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
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