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

704 Commits

Author SHA1 Message Date
Ed Bartley f424da2a7e * CCControl* should not respond to touches if the control is not visible. 2012-10-30 11:10:05 -04:00
minggo a09367ca7e Merge pull request #1491 from sburavtsov/HttpClient-destroy-fix 
Fix for correct unscheduling and instance destruction
 2012-10-25 02:05:34 -07:00
Sergey Buravtsov 0b381357b0 Fix for correct unscheduling and instance destruction 2012-10-24 03:33:17 +04:00
johnangel a2e1400402 Merge remote branch 'upstream/gles20' into gles20 2012-10-16 08:42:30 +02:00
James Chen fb657f674d fixed #1510: Application will freeze when 'numberOfCellsInTableView' returns zero. 2012-10-16 11:31:04 +08:00
James Chen a65f13defe issue #1486: Fix bugs for CCEditBox iOS port. 2012-10-15 13:01:36 +08:00
James Chen 0e76827b7e issue #1486: Commenting one line to avoid something like mosaic in 'CCControlExtensionTest', especially the display of 'huePickerBackground.png' when in 800*480 window size with 480*320 design resolution and hd(960*640) resources. 2012-10-14 22:03:23 +08:00
johnangel ad7dacc281 Merge remote branch 'upstream/gles20' into gles20 2012-10-08 16:35:43 +02:00
Walzer f1d9629404 Merge pull request #1361 from ncrothe/gles20 
add the capability to set custom http header to HttpClient
 2012-10-08 01:06:39 -07:00
James Chen cb2f3efc2c fixed #1495: CCScrollView display area and touch area are wrong if its parent's postion isn't at CCPointZero in world. 2012-10-08 14:12:34 +08:00
Donald Alan Morrison f6b51c0a5f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-25 10:20:18 -07:00
Donald Alan Morrison a245199075 Jianhua Chen pointed out a semantic error in my "fix". Thanks James! 
The Static Analyzer doesn't search for this semantic error, even though it is common.
 2012-09-25 10:13:49 -07:00
James Chen d91d7c8317 issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension. 2012-09-25 17:26:09 +08:00
James Chen 83fe21b4f4 issue #1483: Removed a comment. 2012-09-25 17:03:29 +08:00
James Chen f7229f74d8 issue #1483: Synchronizing CCControlExtension to latest version. 2012-09-25 16:57:51 +08:00
Donald Alan Morrison 8693c54997 Minor memory-logic error. textField is a retain property, so assigning to it retains it, and assigning NULL to it releases it. Also, an init method called release outside the proper scope (the do{}while(0); block). 
If you don't like the autorelease pool, it's easy enough to change this fix.

Aside: someone pulled tools/cxx-generator again, not me(!) :-)
 2012-09-24 14:55:40 -07:00
minggo f17545a1ae fix a compile error 2012-09-24 15:26:18 +08:00
minggo 88952396e4 Merge branch 'ptr_int_casting_issue' of https://github.com/ByungChoi/cocos2d-x into ptr_int 2012-09-24 15:16:30 +08:00
James Chen e4cee68688 Added libExtensions.lib for TestJavascript vs2010 project. 
Removed some calling of 'USING_NS_CC;' in extensions.
 2012-09-24 11:47:33 +08:00
James Chen a413496a1a Delete 'cocos2d::' since extension is the sub-namespace of cocos2d. 2012-09-24 11:08:10 +08:00
James Chen 426915dd4a fixed some compilation error for win32 platform. 2012-09-24 11:05:15 +08:00
ncrothe b3f5a04ad4 Update extensions/network/HttpClient.cpp 
Added custom header capability to http wrapper (using curl features). This allows setting non-default content-type for POSTs.
 2012-09-22 17:52:04 +03:00
ncrothe 7b9c15176e Update extensions/network/HttpRequest.h 2012-09-22 17:45:02 +03:00
Byung Choi 2ed9119d4f fixed pointer to int casting warnings and errors, based on stdint 2012-09-22 03:02:29 +09:00
minggo 0a1f0369e6 fixed #1481: merge Nicolas's pull request and do some bug fixes 2012-09-21 17:01:19 +08:00
minggo 32de12e479 Merge pull request #1339 from rohankuruvilla/merge2 
JS Bindings improvements
 2012-09-20 19:38:49 -07:00
Walzer befaf686bb Merge pull request #1352 from sburavtsov/HttpClientFix-FOLLOW_LOCATION 
To be able to handle 302 redirects with curl we need to set option CURLOPT_FOLLOWLOCATION
 2012-09-20 18:20:46 -07:00
Rohan Kuruvilla 100a7a1883 Adding sample game wrapper using CCBReader. Also includes small modification to CCBReader 2012-09-20 18:02:17 -07:00
Rohan Kuruvilla 0fc7feb3f0 Updating CCBReader to support Scripting Owners 2012-09-20 14:45:34 -07:00
Sergey Buravtsov 5128f0e1a8 To be able to handle 302 redirects with curl we need to set option CURLOPT_FOLLOWLOCATION 2012-09-20 19:51:04 +04:00
M.W. Park d042e8557d fixed CCSpriteLoader's flipX bug. 2012-09-20 12:47:45 +09:00
M.W. Park b4b9a1be2b fixed log output. 2012-09-20 12:32:37 +09:00
James Chen 9fabf3a45b fixed #1470: Made CCBReader support cocosbuilder v2.1-beta0. 2012-09-19 18:41:50 +08:00
minggo 8cdf73640b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1470_cocosbuilder 2012-09-19 18:08:17 +08:00
minggo 4bff6927b8 issue #1470:re-publish ccb 2012-09-19 17:43:11 +08:00
Ed Bartley 925c21cdde Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20 2012-09-18 18:42:41 -04:00
minggo 4bc5e9e415 issue #1470:fix more logical errors 2012-09-18 17:55:03 +08:00
minggo a0feb5f289 issue #1470:fix some logical errors 2012-09-18 17:04:10 +08:00
minggo 4b969e35c8 issue #1470:implement animation 2012-09-17 18:49:05 +08:00
minggo 0845e08fd3 issue #1470:update CCBReader to support Cocosbuilder v2.1 beta0 2012-09-17 14:27:17 +08:00
johnangel fdec1ba4b9 Fixing include paths to be able to compile cocos2d-x using 
external Visual Studio solution, without copying all files
 2012-09-15 16:34:31 +02:00
Walzer 0cd3552ef7 fixed #1475, use vector::insert instead of vector::clear + assign in CCHttpClient::writeData, to prevent losing data 2012-09-10 23:17:16 +08:00
Ed Bartley c67412618d Merge branch 'gles20' of github.com:FlowerpotGames/cocos2d-x; branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20 
Conflicts:
	extensions/GUI/CCScrollView/CCScrollView.cpp
 2012-09-10 10:50:30 -04:00
James Chen a6acd90c29 fixed #1458: Updated copyright information for some files which are relative to CCTableView. 2012-09-10 14:13:55 +08:00
James Chen 6f3ee0299a issue #1458: Updated vs2010 project configuration. 2012-09-10 14:05:44 +08:00
James Chen 1460f4e42f issue #1458: Updated project configuration for all platforms. 
CCTableView::viewWithSource --> CCTableView::create, adding TableViewTest.
 2012-09-10 13:39:12 +08:00
James Chen 554b1709c3 issue #1458: Adding CCScrollView::updateInset. 2012-09-09 22:46:31 +08:00
James Chen bf45edeed5 Reverted one line code. 2012-09-09 22:37:32 +08:00
James Chen 6719841b13 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into tableview-gles20 2012-09-09 22:34:53 +08:00
James Chen d9cc8fa346 issue #1458: Adding CCTableView support. Updated win32 project configuration. 2012-09-09 22:34:32 +08:00
Walzer 7c4ad685e5 add comment for a potential bug in HttpClient.cpp 2012-09-09 18:25:02 +08:00
ebartley 5deeb3f8fa Update windows project files: Paths should be referenced from the $(ProjectDir) so that devs using a custom .sln that references the existing .vcxproj files in the cocos2d-x repo can use them without errors. 2012-09-07 15:00:21 -04:00
Ed Bartley 591d15c2a1 CCscrollView screenPos also needs to be adjusted by the scale in order to be used with Retina display. 2012-09-05 15:12:03 -04:00
ThePickleMan 0a96915da2 Update extensions/GUI/CCControlExtension/CCControlSlider.cpp 
Removed meaningless setter...the macro already makes one...
 2012-09-04 20:54:34 -05:00
ThePickleMan 423abc6f10 Update extensions/GUI/CCControlExtension/CCControlSlider.h 
Removed meaningless setter...the macro already makes one...
 2012-09-04 20:54:17 -05:00
ThePickleMan f6f370ffea Update extensions/GUI/CCControlExtension/CCControlSlider.h 
changed CC_SYNTHESIZE_READONLY to CC_SYNTHESIZE
 2012-09-04 20:48:04 -05:00
ThePickleMan a4d2d317b5 Update extensions/GUI/CCControlExtension/CCControlSlider.cpp 2012-09-03 09:46:55 -05:00
ThePickleMan da819e1109 Update extensions/GUI/CCControlExtension/CCControlSlider.cpp 
Added default values for max/min allowed values
 2012-09-02 16:31:12 -05:00
ThePickleMan e07320f6a8 Update extensions/GUI/CCControlExtension/CCControlSlider.cpp 
Added minimum/maximum allowed values
 2012-09-02 16:10:25 -05:00
ThePickleMan 82ea6fbb99 Update extensions/GUI/CCControlExtension/CCControlSlider.h 
Added fields and methods for setting the maximum allowed value.
 2012-09-02 16:08:13 -05:00
fish 847ccaff7d CCRGBAProtocol must be public in order for actions like CCTintTo to have an affect on the CCScale9Sprite. 2012-08-30 10:39:36 -04:00
minggo 0e81fd0568 fixed #1442: use CREATE_FUNC instead of SCENE_CREATE_FUNC and NODE_CREATE_FUNC 2012-08-27 16:11:07 +08:00
Donald Alan Morrison 5075a83271 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/kazmath/src/ray2.c
 2012-08-25 00:00:27 -07:00
Donald Alan Morrison ee9f3d09a8 Fixed VS2010 Warning C4334: '<<' : result of 32-bit shift implicitly 
converted to 64 bits.
 2012-08-24 09:22:02 -07:00
James Chen ee3e68014b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox 2012-08-24 00:16:11 +08:00
James Chen 1685e5c497 issue #1429: Used java code to implement keyboard layout. 2012-08-24 00:15:15 +08:00
James Chen a437099779 issue #1429: Use activity to implement CCEditBox for android. Next step: use dialog to implement CCEditBox. 2012-08-23 09:42:28 +08:00
James Chen bcbd161398 issue #1429: First commit CCEditBox for android port. 2012-08-22 09:47:04 +08:00
James Chen 3eecc283d0 Merge branch 'iss1437_return_pointer' of https://github.com/minggo/cocos2d-x into iss1437_return_pointer 2012-08-21 16:57:41 +08:00
James Chen d918c8186f Update extensions/GUI/CCEditBox/CCEditBox.cpp 
Revert this file, uncomment some codes in 'initWithXXX'.
 2012-08-21 16:03:36 +08:00
minggo cfdc50fb60 issue #1437:make CCEGLView::sharedOpenGLView() return pointer 2012-08-21 14:58:31 +08:00
minggo 0231f65716 Merge pull request #1208 from minggo/iss1382_ccb_reader 
fixed #1382:safe retain mOwner to avoid crash caused by null pointer
 2012-08-20 20:23:03 -07:00
minggo 4db53b2f91 fixed #1382:safe return mOwner to avoid crash caused by null pointer 2012-08-20 15:54:53 +08:00
James Chen 6c9b4d3357 fixed #1420: Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs. 2012-08-20 15:49:02 +08:00
Dale Ducharme 4004a8ac61 Cocos2dx for gles2. 2012-08-17 17:45:21 -04:00
James Chen f7fd4fc2bf issue #1429: Fixed a bug in EAGLView.mm. 2012-08-17 15:24:33 +08:00
James Chen d3338a70e5 issue #1429: Updated EditBoxTest and fix a bug about callback function. 2012-08-17 14:29:07 +08:00
James Chen 0fce637ec7 issue #1429: First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest. 2012-08-15 14:33:56 +08:00
James Chen 3ff21fe275 fixed #1424: http wrapper compiled ok on win32. 2012-08-09 17:04:55 +08:00
Walzer 9d6e37cf73 issue #1424, rename "Network" to "network" 2012-08-09 11:44:24 +08:00
Walzer d2cfdf1d2f change Network to Network-rename 2012-08-09 11:43:08 +08:00
Walzer 08198c082e issue #1424, http wrapper has been tested on iOS, mac, android port. 2012-08-09 10:45:11 +08:00
Walzer 9ee50bb59a issue #1424, add doxygen comments, use httpbin.org interfaces in GET/POST before setting up our website. 2012-08-08 12:05:02 +08:00
Walzer b094f70ab3 issue #1424, http-get works ok. Tomorrow I will focus on post. 2012-08-07 18:28:07 +08:00
qingyun b3206737e3 add group for CCHttpRequest.h 2012-08-04 18:30:05 +08:00
qingyun 24136dc575 add CCHttpRequest and related tests to repository 2012-08-04 18:27:27 +08:00
Walzer cc3d850892 fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float" 2012-08-01 15:30:12 +08:00
Walzer 0431cb455b fixed #1413, add CCTouch::getLocation(), getDelta() method 
return OpenGL coordinates directly, to make the usage more convenient.
 2012-07-31 17:41:53 +08:00
Walzer b8fa32dbc0 use extensions/GUI instead of extensions/UI 2012-07-30 22:57:59 +08:00
Walzer dfea09819f fixed #1409, sync with CocosBuilder v2.0, use number "4" to stand for PROPERTY_*_DISABLED in CCControlButton 
The cub & ccbi files in current test suit use "3" to stand for DISABLED state in CCControlButton, while CocosBuilder v2.0 generate "4" for it.
 2012-07-29 22:13:20 +08:00
Walzer 1411705de4 fixed #1408, CCBReader, CCMenuItemImage should be loaded when the target and selector are empty 2012-07-29 21:17:35 +08:00
mustime 1a55b7c5ba Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1381 2012-07-27 18:29:57 +08:00
Walzer 685b70e6fb fixed #1402, résolve conflicting "create" functions 
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
 2012-07-23 22:49:11 +08:00
James Chen 9a6729551c Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399 2012-07-23 11:59:47 +08:00
James Chen 2ab5e4ab9c issue #1399: Added vs2010 support. 2012-07-23 11:57:34 +08:00
minggo ac70f8def5 Merge branch 'gles20-adjust-structure' into merge 2012-07-23 11:36:46 +08:00
minggo 5163b17a8a make CCBReaderTest work ok 2012-07-23 11:33:11 +08:00
James Chen acd4a5dc9d issue #1399: Updated build-win32.bat and libExtensions.vcproj. 2012-07-23 10:55:24 +08:00
James Chen b2b0a0c3d5 Updated ios project settings and updated some files in CCBReader folder. 2012-07-20 18:02:18 +08:00
James Chen 557f654cf3 Built successfully on android. 2012-07-20 17:06:00 +08:00
James Chen 77f1fba566 issue #1399: Adjust folder structure, made it built successfully on win32. 2012-07-20 14:05:52 +08:00
minggo f9c40f7372 issue #1399: work ok on iOS after adjusting directory structure 2012-07-19 17:22:36 +08:00
Walzer 8bab593246 move extensions/NDControls to cocos2d-x-extensions repository 2011-06-22 14:54:45 +08:00
minggo 9c49e27bf1 add extensions & tools directory 2011-06-14 14:31:25 +08:00