Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,712 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

2390 Commits

Author SHA1 Message Date
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
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
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