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

2079 Commits

Author SHA1 Message Date
minggo 1cf237d296 Merge pull request #1643 from minggo/gles20 
issue #1564:make iOS test work ok
 2012-11-23 00:31:06 -08:00
minggo a423317abc issue #1564:make iOS test work ok 2012-11-23 16:30:09 +08:00
James Chen 48d77fedc1 issue #1573: Reverted GameScene.js and MainMenuScene.js. 2012-11-23 15:09:04 +08:00
James Chen 7c1e860d78 issue #1573: Added CocosDragonJS. Made it compiled ok on iOS,android and win32. 2012-11-23 15:09:03 +08:00
James Chen 6af0188295 First commit CocosDragonJS. 2012-11-23 15:09:02 +08:00
Rohan Kuruvilla cfb59529a8 Adding CocosDragonJS project 2012-11-23 15:08:58 +08:00
minggo 3980a710a3 Merge pull request #1641 from minggo/gles20 
issue #1564: make tests run on mac osx
 2012-11-22 22:24:25 -08:00
minggo 96ecb05ca9 issue #1564: make tests run on mac osx 2012-11-23 14:22:50 +08:00
minggo f82e800695 Merge pull request #1640 from minggo/gles20 
modify lua project setting
 2012-11-22 18:42:45 -08:00
minggo 226b10a9e2 modify lua project setting 2012-11-23 10:41:41 +08:00
James Chen 971d948132 issue #1572: WatermelonWithMe works on iOS now. 2012-11-22 19:05:38 +08:00
James Chen c32ea4486b issue #1572: WatermelonWithMe works on Android now. 2012-11-22 18:46:30 +08:00
James Chen 7c1a3a7305 issue #1572: Modify vs2010 solution. 2012-11-22 17:54:55 +08:00
James Chen e0fd8f6284 issue #1572: Adding WatermelonWithMe project. 2012-11-22 17:54:54 +08:00
James Chen b79b3335bd Merge pull request #1630 from dumganhar/iss1564-update-tests 
issue #1564: Made ChipmunkTest of TestJavascript works
 2012-11-21 23:30:14 -08:00
James Chen b66bc98a46 issue #1564: Made ChipmunkTest of TestJavascript works 2012-11-22 15:19:16 +08:00
James Chen aa8e582b7e Merge pull request #1629 from dumganhar/iss1564-update-tests 
issue #1564: fix the wrong order of parameters in CCScheduler::scheduleSelector.
 2012-11-21 20:07:45 -08:00
James Chen 51d61ba214 issue #1564: fix the wrong order of parameters in CCScheduler::scheduleSelector. 
Made MoonWarriors works.
 2012-11-22 12:05:38 +08:00
James Chen 7d4ca88deb Merge pull request #1627 from dumganhar/iss1564-update-tests 
issue #1564: Closed verbose log of TestJavascript for android. And Made it compiled ok.
 2012-11-21 18:49:03 -08:00
James Chen 1ce1b4b471 issue #1564: Closed verbose log of TestJavascript for android. And Made it compiled ok. 2012-11-22 10:47:57 +08:00
minggo b5bf49e9c6 issue #1564: make TestJavasripteTest work on iOS 2012-11-22 10:44:21 +08:00
James Chen 89a51433b8 issue #1564: Make TestJavascript works on windows. 2012-11-22 10:24:26 +08:00
James Chen b4c1d60e5c Updated the submodule reference of cocos2d-js-tests and cxx-generator. 2012-11-21 21:26:18 +08:00
James Chen 24c83cb461 Merge pull request #1617 from dumganhar/iss1564-update-tests 
issue #1564: Fix crash of ParticlesTest.
 2012-11-21 01:24:59 -08:00
James Chen d0ccff9081 issue #1564: Updated ClippingNodeTest. 2012-11-21 16:28:31 +08:00
minggo ab14c0ddc2 Merge pull request #1615 from minggo/gles20 
create stencil buffer for TestCpp
 2012-11-21 00:03:41 -08:00
minggo ed6d14580a issue #1564:create stencil buffer for TestCpp 2012-11-21 16:00:40 +08:00
James Chen 9cf9c9943d Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests 
Conflicts:
	samples/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h
 2012-11-21 15:42:26 +08:00
James Chen f17f5bbe7b issue #1564: Updated ClippingNodeTest. 2012-11-21 15:41:47 +08:00
minggo 2e152ada45 issue #1564:add CClippingNodeTest 2012-11-21 15:36:48 +08:00
James Chen dd2b15cba0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests 
Conflicts:
	samples/TestCpp/Classes/tests.h
 2012-11-21 15:27:47 +08:00
James Chen 170978d6a5 issue #1564: Added ClippingNodeTest. 2012-11-21 15:22:54 +08:00
minggo 3a789c075f issue #1564:add ChipmunkTest 2012-11-21 12:02:29 +08:00
minggo 5a4da366ed issue #1564:update DrawPrimitivesTest 2012-11-21 11:43:08 +08:00
minggo b8af64e798 issue #1564:update LabelTest 2012-11-20 18:17:47 +08:00
minggo a80ae8b27b issue #1564:update LayerTest 2012-11-20 18:00:27 +08:00
minggo d27ff67098 issue #1564:update ParallaxTest 2012-11-20 17:43:26 +08:00
minggo faaa8e1e1b issue #1564:update ParticleTest 2012-11-20 17:39:11 +08:00
minggo a246d11110 issue #1564: update some test cases 2012-11-20 17:30:05 +08:00
minggo fc40008711 Merge branch 'iss1564-update-tests' of https://github.com/dumganhar/cocos2d-x into iss1564-update-tests 2012-11-20 16:51:41 +08:00
minggo 9c1e90e981 issue #1564:update RenderTextureTest 2012-11-20 16:45:59 +08:00
James Chen 8f6c8e202e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests 
Conflicts:
	samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
 2012-11-20 16:35:42 +08:00
James Chen ebd522e3fa issue #1564: Return a new object instead of 'const reference' for some get methods. 2012-11-20 16:34:55 +08:00
minggo f15135f26a issue #1564:update SchedulerTest 2012-11-20 16:24:27 +08:00
James Chen 62a502e365 issue #1564: Renamed ChipmunkAccelTouchTest to ChipmunkTest. 2012-11-20 16:19:05 +08:00
minggo c026a1f488 issue #1564:update ShaderTest 2012-11-20 16:16:16 +08:00
minggo fce5b79a09 issue #1564:update SpriteTest 2012-11-20 15:19:57 +08:00
minggo 2c09b68815 Merge pull request #1601 from minggo/iss1564-update-tests 
update tests
 2012-11-19 18:46:20 -08:00
minggo 31cfebd0d7 issue #1564:update Texture2dTest 2012-11-20 10:42:03 +08:00
minggo 33529afc07 Merge pull request #1592 from fape/luaCocos2d 
fix compile: rename kOrientation to kCCTransitionOrientation
 2012-11-19 17:36:25 -08:00
ivzave 28ca22bfde added lua support for linux platform 2012-11-19 14:56:02 +04:00
James Chen af36ada6e4 issue #1555: Enabled point size in DrawPrimitivesTest.cpp. 2012-11-19 17:16:45 +08:00
James Chen 5734a2d9bc issue #1555: Updated ActionsTest.cpp 2012-11-19 17:15:16 +08:00
minggo 0b5a86bf42 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1562-label-test 2012-11-19 16:29:00 +08:00
minggo 38232e4eb5 issue #1562:update TileMapTest 2012-11-19 16:28:37 +08:00
James Chen f2e0df4de3 issue #1565: Removed VS2008 support. 2012-11-19 14:42:27 +08:00
minggo 29fc9a6af7 issue #1564:update MenuTest 2012-11-19 13:57:54 +08:00
minggo fb5b7ed7bb fixed #1560:fix a logical error in CCNode::schedule() 2012-11-19 11:24:03 +08:00
fape 355d8df79e fix compile: rename kOrientation to kCCTransitionOrientation 2012-11-17 19:02:04 +01:00
fape 30b026421e The S3E data dir ONLY used by the emulator/simulator. 2012-11-17 13:49:01 +01:00
James Chen db2175e41c Merge pull request #1582 from guanqun/build-fixes 
two simple build fixes
 2012-11-17 02:13:22 -08:00
James Chen df6a50a23a issue #1555: Fixed some compilation error for marmalade and blackberry ports. 2012-11-16 18:13:55 +08:00
James Chen c5b5b978fa issue #1555: Made win32 works ok. 2012-11-16 17:08:34 +08:00
James Chen 7601cc7e27 Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update 
Conflicts:
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
 2012-11-16 16:21:16 +08:00
James Chen 892cb6b352 issue #1530: Using GCC4.2 compiler to build debug version of JSBinding projects since there is an unknown 'vm_protect' crash by using llvm. 2012-11-16 15:58:22 +08:00
James Chen ee1a5a461d issue #1530: Updated cocos2d-js-test to the latest version. 2012-11-16 15:58:21 +08:00
James Chen def0cc8c39 issue #1530: Updated TestJavascript. 2012-11-16 15:58:20 +08:00
James Chen c2d8d118bf issue #1530: Updated MoonWarriors. 2012-11-16 15:58:19 +08:00
Rohan Kuruvilla 7305442803 Updating MoonWarriors project with new chipmunk bindings 2012-11-16 15:56:30 +08:00
Rohan Kuruvilla 28f2f94f13 Updating TestJavascript project to include object oriented chipmunk 2012-11-16 15:56:30 +08:00
Rohan Kuruvilla 5fb2c0892e Updating jsb JS bootstrap files 2012-11-16 15:56:28 +08:00
Lu Guanqun 17e23f61a7 remove unused private field in KeypadTest 2012-11-16 15:19:43 +08:00
minggo b497143f93 issue #1555:menu can receive touch event now 2012-11-16 14:51:48 +08:00
minggo cb2bc37513 issue #1555: make tests work 2012-11-15 18:34:23 +08:00
James Chen c79cac3af6 Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade 2012-11-15 10:10:53 +08:00
Mat Hopwood 148a558405 Tiff support and resource location 
* Tiff support added to CCImage
* CCFileUtils updated to support resource folders
* Examples updated to support multiple resolution assets
 2012-11-14 17:46:09 +00:00
minggo a701eaecce issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
James Chen b5b0e289eb fixed #1557: set the window size of TestCpp for marmalade port. 2012-11-12 10:46:26 +08:00
James Chen 833b5b1be8 Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade 
Conflicts:
	cocos2dx/base_nodes/CCNode.cpp
	cocos2dx/sprite_nodes/CCSprite.cpp
	samples/TestCpp/Classes/TouchesTest/Ball.cpp
	samples/TestCpp/Classes/VisibleRect.cpp
	samples/TestCpp/Classes/VisibleRect.h
 2012-11-12 10:20:04 +08:00
James Chen 81aff37457 Redirected cocos2d-html5-tests to cocos2d-js-tests 2012-11-08 16:06:32 +08:00
James Chen 6f377855e4 Updated the submodule reference of "cocos2d-html5-tests" to the latest version. 2012-11-06 17:06:04 +08:00
James Chen 5226fbac27 Updated the submodule reference of "samples/TestJavascript/cocos2d-html5-tests". 2012-11-06 10:10:25 +08:00
James Chen ceb4371f12 issue #1549: Using new JS API for MoonWarriors. 
Updated the logics of js_cocos2dx_CCMenuItemSprite_create and js_cocos2dx_CCMenuItemImage_create.
 2012-11-05 23:22:59 +08:00
James Chen 1596603377 issue #1549: Update the submodule reference of 'cocos2d-html5-tests' to the latest version. 2012-11-05 18:59:42 +08:00
James Chen 57f4e82f75 issue #1549: Made the window size same as cocos2d-html5 (800x450) on win32. 2012-11-05 18:46:23 +08:00
James Chen b72f922287 issue #1549: Sync jsb_constants_cocos2d.js and jsb_constants_cocosbuilder.js to -iphone version. 2012-11-05 18:43:12 +08:00
James Chen 26547c7b30 fixed #1548: Updated libcurl header files to 7.26.0 on iOS. 2012-11-05 13:13:46 +08:00
James Chen d14d536953 Sorted the sources of MoonWarriors and TestJavascript by type to make iOS project more beautiful. 2012-11-02 15:52:28 +08:00
James Chen e2ee4f560c Updated TestJavascript/bindings/jsb_constants_cocos2d.js. 2012-11-02 15:22:58 +08:00
James Chen d8580f77a2 Updated project configuration for TestJavascript, added UnitTest.js. 2012-11-02 15:20:42 +08:00
James Chen b401730c1a Updated the submodule reference of cocos2d-html5-test. 2012-11-02 15:14:29 +08:00
James Chen 24385b04a6 fixed #1526: Updated MoonWorriors project configuration for iOS port. 2012-11-02 11:25:24 +08:00
James Chen 84b642d186 Merge pull request #1531 from dumganhar/iss1530-js-improvements 
issue #1530: Picked some JSBinding improvements in PR #1499
 2012-11-01 01:09:39 -07:00
James Chen 45005c6cd9 issue #1530: Set COCOS2D_DEBUG macro to 1 in Application.mk for MoonWarriors project, otherwise there are many outputs in logcat window. 2012-11-01 15:56:05 +08:00
minggo d5afc69393 Merge pull request #1530 from minggo/gles20 
fix compiling error on linux 64 bit
 2012-11-01 00:43:24 -07:00
minggo 95d3f87bd7 fix compiling error on linux 64 bit 2012-11-01 15:38:48 +08:00
James Chen d9fd274f16 Updated the project configuration of TestJavascript for win32 and android port. 2012-11-01 15:19:14 +08:00
minggo 2a796567e0 Merge pull request #1523 from minggo/gles20 
invoke base class's onExit() to avoid memory leak
 2012-10-30 20:35:02 -07:00
minggo ad64beb769 invoke base class's onExit() to avoid memory leak 2012-10-31 11:33:53 +08:00
James Chen 8edf9826b1 issue #1537: Made samples/MoonWarriors/proj.android/build_native.sh executable. 2012-10-31 10:40:42 +08:00
minggo fe8c1573f2 set MoonWarriors to be portrait on iOS 5.1 2012-10-30 11:38:24 +08:00
minggo 811a56d0a2 Merge pull request #1512 from minggo/moonwarrior 
Moonwarrior
 2012-10-29 02:57:03 -07:00
minggo 7073481077 fixed #1527: modify some project setting 2012-10-29 17:54:31 +08:00
minggo 9a2a535fef fixed #1527:add correct icon for xcode project 2012-10-29 16:59:23 +08:00
minggo 2a118a4172 fixed #1527:re-create MoonWarriors xcode project to fix the bug that it will not run on simulator sometimes 2012-10-29 16:47:09 +08:00
James Chen 9113702903 Merge pull request #1510 from dumganhar/gles20 
fixed #1312: Upgraded libcurl to 7.26.0 for linux port
 2012-10-29 01:24:29 -07:00
James Chen d4b7c55ce6 issue #1530: Added resources of cocos2d-html5-tests for TestJavascript project of IOS port. 2012-10-29 16:06:06 +08:00
James Chen d97ce3e7e9 issue #1530: Removed the dependence of Chipmunk for MoonWarriors project setting. 2012-10-29 15:41:39 +08:00
Rohan Kuruvilla 5760ea305c Fixing CallFuncN bindings to properly pass optional third parameter 2012-10-29 15:14:11 +08:00
minggo e992408a86 issue #1312:update libcurl for linux 64 2012-10-29 14:39:44 +08:00
Mat Hopwood 2b265929e2 Marmalade Sample data removed and merged changes 
* Marmalade samples now use Resources folder, excess data removed
* Merged in James' changes
* CCNode::updateTransform() added
 2012-10-25 21:40:37 +01:00
James Chen f1da845bf9 Updated the submodule of cocos2d-html5-test. 2012-10-25 16:33:34 +08:00
James Chen e07ca43c3d fixes a compilation error in TestCpp. 2012-10-24 16:28:54 +08:00
James Chen ffe52a157f Removed some unused codes about "enableRetinaDisplay". 2012-10-24 16:12:40 +08:00
James Chen 7d9b3d3969 Merge pull request #1488 from dumganhar/iss1520-comments 
fixed #1520: Added comments for using multiresolution in HelloCpp.
 2012-10-24 01:00:39 -07:00
minggo 38cd1ecd46 fixed #1512: add VisableRect.cpp/h into iOS and mac project 2012-10-24 10:09:25 +08:00
Mat Hopwood 6074dea6cc Marmalade fixes and optimisation of TestCpp assets 
* .gitignore added to folders that contain app.icf to ensure that these
files get included in the repo
* Made TestCPP compatible with Marmalade
* Removed data folder from TestCPP example, now points at the samples
Resource folder
 2012-10-24 01:03:06 +01:00
James Chen 62f7b25df2 issue #1521: Using relative coordinates in TestCpp. 2012-10-23 17:48:50 +08:00
James Chen b383704ebc fixed #1520: Updated one comment in HelloCpp. 2012-10-23 14:04:35 +08:00
James Chen b3db7e91f8 fixed #1520: Updated some comments. 2012-10-23 14:01:48 +08:00
James Chen f4f63fd824 fixed #1520: Added comments for using multiresolution in HelloCpp. 2012-10-23 10:50:47 +08:00
minggo 9cf3f4c5f6 Merge pull request #1474 from wenbin1989/gles20 
Add kLanguageKorean to ccLanguageType and getCurrentLanguage()
 2012-10-21 18:49:42 -07:00
James Chen aea21bc271 fixed #1517: Updated Project configuration for vs2008. 2012-10-20 09:29:20 +08:00
Mat Hopwood 988835560d Marmalade Support 
Full Marmalade support added for Cocos2d-x
 2012-10-19 16:26:34 +01:00
James Chen a6151cd3bf Merge pull request #1480 from dumganhar/gles20 
Updated the comment of setFrameZoomFactor.
 2012-10-19 03:01:27 -07:00
James Chen bd0ad94bf2 Updated the comment of setFrameZoomFactor. 2012-10-19 18:00:26 +08:00
James Chen aa818f3b54 Merge pull request #1479 from dumganhar/gles20 
Renamed "setFrameZoom" to "setFrameZoomFactor", added 'getFrameZoomFactor
 2012-10-19 02:50:08 -07:00
James Chen 5751d82e6b Renamed "setFrameZoom" to "setFrameZoomFactor", added 'getFrameZoomFactor'. 2012-10-19 17:39:55 +08:00
James Chen 6b69112fda fixed #1516: TestLua compilation error when the path of cocos2d-x contains spaces 2012-10-19 16:52:38 +08:00
James Chen 533cb8dc48 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1517-ff16 2012-10-19 13:57:34 +08:00
minggo f40b6ac4eb fixed #1515: implement zoom function on mac os 2012-10-19 11:33:06 +08:00
James Chen 08bb6718cd issue #1517: Added ws2_32.lib for MoonWarriors.vcxproj and TestJavascript.vcxproj. 2012-10-19 11:21:27 +08:00
James Chen de3376b43f issue #1517:[Win32]Upgrading SpiderMonkey js engine to FF 16.0.1 2012-10-19 11:15:23 +08:00
wenbin1989 4a50d6903c add Korean Language Type in CurrentLanguageTest 
I have tested the Korean Language Type of CurrentLanguageTest in ios,
android, mac. Works fine.
 2012-10-19 09:41:46 +08:00
minggo 986a0a34c0 Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into zoom-scale 2012-10-18 17:01:27 +08:00
James Chen 41c784ec61 issue #1515: [LINUX support] Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop. 2012-10-18 11:51:02 +08:00
minggo d68f7c76f6 Merge pull request #1471 from minggo/iss1466-shader-test 
reloading shader when coming to foreground
 2012-10-17 20:03:22 -07:00
minggo 501ceb21eb fixed #1466:restore shader when comming to background 2012-10-18 11:00:44 +08:00
James Chen 0b101bedd0 issue #1515: Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop. 2012-10-18 10:54:19 +08:00
minggo b6426f01ff fixed #1466:restore shader when comming to background 2012-10-18 10:39:56 +08:00
minggo bfa7991a94 fixed #1466:restore shader when comming to background 2012-10-18 10:15:46 +08:00
James Chen 2779b4f1ab Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into johnangel 2012-10-17 15:08:25 +08:00
johnangel a2e1400402 Merge remote branch 'upstream/gles20' into gles20 2012-10-16 08:42:30 +02:00
James Chen deed3ddc33 Updated AppDelegate of SampleGame for iOS port. 2012-10-15 18:50:46 +08:00
minggo 2ded8ea034 Merge pull request #1442 from dumganhar/iss1486-multi-res 
Multiresolution support
 2012-10-15 02:15:21 -07:00
minggo 93d702e3cc fixed #1491:remove dependency of FontLabel lib 2012-10-15 12:03:15 +08:00
James Chen 39a4af57cc issue #1486: Using relative position for ActionsTest and Box2dView. 2012-10-14 22:21:57 +08:00
minggo 8b650794e6 Merge pull request #1445 from minggo/gles20 
make TestJavascript work on iOS
 2012-10-12 02:47:55 -07:00
James Chen 32a9d51618 issue #1486: Commented some unused codes. 2012-10-12 17:37:49 +08:00
James Chen 36600d95b1 issue #1486: Calculate content scale factor by screen height. 2012-10-12 17:37:26 +08:00
James Chen 04a4ebc571 issue #1486: Using relative coordinate for HelloLua. 2012-10-12 16:18:28 +08:00
James Chen f5abe422ea Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1486-multi-res 2012-10-12 15:50:11 +08:00
James Chen 6fd24c469b Updated *.user for vs2010 & vs2008. 2012-10-12 15:45:57 +08:00
James Chen e876b997e7 Updated TestJavascript.vcproj 2012-10-12 15:42:00 +08:00
James Chen 3b0a989200 Updated TestJavascript project configuration for VS2008 & VS2010. 2012-10-12 15:14:47 +08:00
minggo 572460e60a make TestJavascript work on iOS 2012-10-12 12:00:36 +08:00
James Chen 98aa5dd489 issue #1486: Updated AppDelegate.cpp and proj.win32/main.cpp. 2012-10-12 10:02:49 +08:00
folecr 36f8b31efc Define some helper functions and comment out references to chipmunk 2012-10-11 17:56:44 -07:00
folecr fc59b2c962 Updated build script 
* merges js files from the cocos2d-html5-tests submodule into Android's assets folder
 * copies js helper files into Android's assets folder
 * copies the res from cocos2d-html5-tests into Android's assets folder
 2012-10-11 16:58:44 -07:00
folecr 336af23428 Helper files copied from cocos2d-iphone 2012-10-11 16:58:44 -07:00
folecr c63cf54256 Submodule for cocos2d-html5-tests 2012-10-11 16:37:22 -07:00
folecr 2e8aad611d Run tests-boot-jsb.js from the root directory 2012-10-11 16:35:17 -07:00
folecr a763e4242f Remove samples/TestJavascript/Resources 2012-10-11 14:25:48 -07:00
folecr 2cf579de6b NDK debugger script 2012-10-11 14:25:47 -07:00
James Chen b78e2c9130 issue #1486: Added iPad, ipadhd resources, and make some watermark for these pictures. 2012-10-11 18:33:43 +08:00
James Chen cdf54a872f issue #1486: A bug fix. 2012-10-11 17:02:27 +08:00
James Chen 77da7b5895 issue #1486: First commit based on BorMor's branch. 2012-10-11 16:45:14 +08:00
James Chen ade54a3de7 Merge branch 'multi_resolution_support' of https://github.com/BorMor/cocos2d-x into bormor-multi-res 
Conflicts:
	samples/HelloCpp/Classes/AppDelegate.cpp
	samples/HelloCpp/Classes/HelloWorldScene.cpp
 2012-10-11 16:12:22 +08:00
James Chen 918045e6ac issue #1469: Deleted two unused files. 2012-10-10 22:18:27 +08:00
James Chen 122a748029 issue #1469: Removed some unused resources. 2012-10-10 22:15:47 +08:00
James Chen 36d8e86879 issue #1469: Made MoonWarriors works on iOS. 2012-10-10 22:06:44 +08:00
James Chen abd1d7e3bf issue #1469: VS2010 compilation works. 2012-10-10 15:14:19 +08:00
James Chen 5054684e00 issue #1469: Made MoonWarriors works on android. 2012-10-10 15:06:11 +08:00
James Chen d03ff0616a issue #1469: Added MoonWarriors sources and made it works on windows. 2012-10-10 14:50:04 +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
minggo 58b46b2f53 Merge pull request #1419 from folecr/ndkgdb 
Run Android debugger with Cocos2D-X projects!
 2012-10-07 19:52:12 -07:00
folecr d8a26a8623 Use "-j8" flag to ndk-build when building TestJavaScript 
* If a "-p" for "parallel build" option is set
 2012-10-05 12:36:04 -07:00
folecr abcb6b33a7 set -x in build script so that entire command line is available in the build log 2012-10-01 11:58:46 -07:00
folecr 2f5613595b Helper script to launch this application via ndk-gdb 2012-10-01 11:58:45 -07:00
walzer d18eecf247 UIInterfaceOrientationMaskLandscape -> UIInterfaceOrientationMaskAllButUpsideDown, developers still need to set orientation in xcode->targets 2012-09-27 10:28:00 +08:00
walzer c9772c76ec fix compilation error in xcodebuild command line, which are caused by ios6 deprecated marcos and enums 2012-09-27 00:44:40 +08:00
minggo f3e2a385e1 modify xcode project to include correct files 2012-09-26 17:12:57 +08:00
James Chen 0ca7e00700 fixed some compilation errors for linux platform. 2012-09-26 15:23:10 +08:00
James Chen ac8edf1384 Updated samples/TestCpp/proj.linux/Makefile. 2012-09-26 14:06:49 +08:00
minggo dc3ba6e0cc fix some bugs when testing 2012-09-26 12:01:42 +08:00
James Chen 4a3127f41f Updated android template. Added 'cocos2dx/platform/android/java/res/.gitignore' since res folder is needed for eclipse. 2012-09-25 21:52:30 +08:00
minggo 6878b626cd add new GUI component 2012-09-25 18:00:06 +08:00
minggo 2b35f1a20f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into layer_gradient 2012-09-25 17:38:17 +08:00
minggo 418816ea77 add fps_image.png into TestCpp 2012-09-25 17:06:59 +08:00
James Chen f7229f74d8 issue #1483: Synchronizing CCControlExtension to latest version. 2012-09-25 16:57:51 +08:00
minggo da97921099 fix compile errors of TestJavaScript 2012-09-25 16:21:28 +08:00
walzer 609c4b12f9 revert back SimpleGame to enableRetinaDisplay approach. Update background image of HelloCpp to 640x1136. 2012-09-24 21:14:08 +08:00
Sergey Vikhirev 05eb4352e8 Remove retina specific methods and logic 2012-09-24 14:22:02 +04:00
minggo a568c1d221 revert modification of AppDelegate.cpp 2012-09-24 17:24:00 +08:00
ncrothe e0fe233752 Update samples/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp 
Added test to show use of HttpRequest::setHeaders
 2012-09-24 12:15:53 +03:00
minggo eb952e7c69 Merge pull request #1370 from minggo/ptr_int 
Ptr int
 2012-09-24 00:27:21 -07:00
minggo f17545a1ae fix a compile error 2012-09-24 15:26:18 +08:00
walzer caa67d1eed Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into adapt-4inch-iphone5 
Conflicts:
	samples/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj
 2012-09-24 15:17:58 +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
minggo 48f9df7680 fix conflict 2012-09-24 15:01:24 +08:00
walzer 78ef574962 add touch callback to HelloCpp. Users can learn setDesignResolution easily. 2012-09-24 14:14:53 +08:00
walzer 7088b19a1a add sample code in HelloCpp & SimpleGame to teach how to adapt design resolution to different iPhone screens (HVGA, 3.5 inch retina, and 4.0 inch retina) 2012-09-24 13:59:16 +08:00
minggo e20b933f1a make TestJavaScript work and fix some warnings 2012-09-24 13:57:45 +08:00
walzer ed936dcd48 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into adapt-4inch-iphone5 2012-09-24 12:03:36 +08:00
Walzer 5c5544f823 Merge pull request #1363 from walzer/gles20 
fix ios6 orientation error, which is caused by ios6 api change.
 2012-09-23 21:00:30 -07: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 426915dd4a fixed some compilation error for win32 platform. 2012-09-24 11:05:15 +08:00
walzer 5b3bb2a087 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts fixed:
	cocos2dx/platform/ios/FontLabel/FontLabel.m
	cocos2dx/platform/ios/FontLabel/FontLabelStringDrawing.m
	template/xcode4/lib_js.xctemplate/TemplateInfo.plist
 2012-09-24 11:03:26 +08:00
walzer c50a62be7a issue #1482, fix typos, mehod -> method. 2012-09-24 10:54:03 +08:00
walzer 59a4b0460b HelloCpp and SimpleGame teaches how to adapt on all iPhone/iPad multi-resolutions, especially for 4-inch retina screen. 2012-09-24 10:46:15 +08:00
Walzer 88b98faa88 fixed #1482, fix orientation problem caused by ios6 api change. 
AppDelegate.mm & RootViewController.mm are updated.
 2012-09-23 20:24:51 +08:00
Byung Choi dad0573b29 fixed build breakage for linux from change of test src name. 2012-09-22 03:18:26 +09:00
minggo dca626eab0 Merge pull request #1357 from ByungChoi/linux_makefile 
Linux makefile
 2012-09-21 02:12:45 -07:00
minggo 0a1f0369e6 fixed #1481: merge Nicolas's pull request and do some bug fixes 2012-09-21 17:01:19 +08:00
Byung Choi a83b6a6261 updated sample/helloCpp debug & release makefile for linux 2012-09-21 15:35:41 +09:00
Byung Choi 4d04a1863b make-all-linux now builds debug & release, testCpp also gets both 2012-09-21 14:34:05 +09:00
Walzer c7ffe79baf remove useless LOCAL_STATIC_LIBRARIES := curl_static_prebuilt in TestCpp/proj.android/jni/android.mk 
The linking relationship is TestCpp -> cocos_extension_static -> cocos_curl_static now. Applications can link the extension library to use libcurl.

And this line still links curl_static_prebuilt which is not exist now, which made developers confused.
 2012-09-21 10:10:17 +08: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 2f3cdc6538 issue #1470:modify linux makefile and re-create xcode template 2012-09-19 18:05:10 +08:00
minggo 5e169eb0af issue #1470: put hd/ipad resources into corresponding directory 2012-09-19 17:54:45 +08:00
minggo ebe092661b issue #1470: modify mac project and delete unneeded files 2012-09-19 17:50:30 +08:00
minggo 4bff6927b8 issue #1470:re-publish ccb 2012-09-19 17:43:11 +08:00
minggo 9db2df3f7b issue #1470:modify resources path 2012-09-19 09:40:02 +08:00
folecr 5d816bfaf6 Verbose logging of build process 2012-09-18 17:08:37 -07:00
folecr f54566ac03 More robust script exits on errors and ... 
* Remove source build command (source repos for dependencies are not submodules)
 2012-09-18 17:02:01 -07:00
minggo 4b969e35c8 issue #1470:implement animation 2012-09-17 18:49:05 +08:00
minggo 0c4b5dd3e9 issue #1470:fix some crashes 2012-09-17 15:31:07 +08:00
Donald Alan Morrison 4cbd993091 Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07: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
James Chen f4ddabb942 Updated "ant.properties" for TestJavascript project since it will ignore 'assets/Images, assets/Fonts' folder. 2012-09-15 15:36:31 +08:00
YuLei 209e44ff09 [Lua] update HelloLua 2012-09-11 17:31:21 +08:00
YuLei ab6a476deb update TestLua 2012-09-11 17:13:20 +08:00
James Chen b6e4c98334 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dualface-lua 2012-09-11 14:03:33 +08:00
James Chen 7d8b261ced fixed #1477: Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions. 2012-09-11 14:02:33 +08:00
James Chen 2572823b1a Merge pull request #1301 from folecr/fix_android_module_location 
fixed #1476: Update location of spidermonkey-android makefile.
 2012-09-10 18:53:02 -07:00
folecr 991d63eaad Update location of spidermonkey-android makefile 2012-09-10 16:12:48 -07:00
James Chen 6a1aae95aa Merge branch 'gles20' of https://github.com/dualface/cocos2d-x into dualface-lua 
Conflicts:
	cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj
 2012-09-10 17:00:22 +08:00
James Chen c9ca584726 Merge pull request #1297 from dumganhar/tableview-win32 
fixed #1458: Adding CCTableView support.
 2012-09-09 23:52:18 -07:00
James Chen c9e1aa7adc fixed #1458: Updated TestCpp Makefile for linux port. 2012-09-10 14:50:19 +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
YuLei 1254d08d5c [Lua] fix: HelloLua 2012-09-10 12:23:45 +08:00
YuLei d4128975f6 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-10 11:42:56 +08:00
James Chen d9cc8fa346 issue #1458: Adding CCTableView support. Updated win32 project configuration. 2012-09-09 22:34:32 +08:00
Walzer 11b5ae5cef add proj.android to samples/SimpleGame, use getVisibleSize & getVisibleOrigin instead of getWinSize 2012-09-09 21:41:48 +08:00
Walzer 7e4615cd7b upgrade Cocos2dSimpleGame to v2.0.2 framework, add it into samples folder 2012-09-09 20:20:29 +08:00
YuLei 58ea948cc8 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-07 19:21:15 +08:00
ThePickleMan 469584e8b8 Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp 2012-09-04 23:53:17 -05:00
ThePickleMan ea87d6304d Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp 
Made the lower slider's value display too.
 2012-09-04 23:52:18 -05:00
ThePickleMan 5cf699f668 Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp 
Added a test for the restricted slider
 2012-09-04 22:32:29 -05:00
YuLei 57566d0364 revert main.js 2012-09-04 09:53:58 +08:00
YuLei e490035e2e Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-03 15:24:40 +08:00
James Chen f11c849cfe Merge pull request #1278 from edbartley/gles20 
fixed #1456: Remove code signing from MAC TestCpp project.
 2012-09-02 07:49:12 -07:00
fish 8c29e9b1e2 Remove code signing from MAC TestCpp project. 2012-09-01 18:06:30 -04:00
YuLei 135f2fdabd remove unused files 2012-09-02 01:13:52 +08:00
YuLei 6f3833af73 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-02 00:56:27 +08:00
YuLei da79992275 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-02 00:38:57 +08:00
James Chen 35f6f937c9 Merge pull request #1271 from mustime/testlua 
issue #1425: add NodeTest to TestLua.
 2012-09-01 01:52:42 -07:00
James Chen 8e290cad6e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1454_javascript 2012-08-31 23:29:02 +08:00
James Chen 94a1aa6123 issue #1454: fixed bugs in test-particles.js. 2012-08-31 23:28:43 +08:00
minggo dacf1704fc issue #1454:use pvr instead of pvr.gz and fix a bug of build_native.sh 2012-08-31 23:16:36 +08:00
James Chen f5a46d1d23 Merge pull request #1 from minggo/iss1454_javascript 
issue #1454:modify ios project resources
 2012-08-31 07:29:11 -07:00
minggo 1ea039d21d issue #1454:modify ios project resources 2012-08-31 22:23:30 +08:00
James Chen 0d2c2b3bf8 issue #1454: Updated win32 project configuration and some .plist files. 
Removed old binding files.
 2012-08-31 22:01:57 +08:00
James Chen e7e954045a issue #1454: Updated TestJavascript/proj.android/build_native.sh. 2012-08-31 21:30:58 +08:00
James Chen 9ba5a1bfef issue #1454: Removed COCOS2D_JAVASCRIPT macro. 2012-08-31 21:23:23 +08:00
James Chen dd8c993581 issue #1454: Removed some duplicated resources files. 2012-08-31 19:50:20 +08:00
mustime 31655bb6ca issue #1425: add NodeTest to TestLua 2012-08-31 18:40:21 +08:00
mustime f070864429 issue #1425: add NodeTest to TestLua 2012-08-31 18:26:27 +08:00
mustime 680e189365 issue #1425: update lua script 2012-08-31 18:25:28 +08:00
mustime 1092d04b7c issue #1425: fix "Issue1305" test case in ActionsTest 2012-08-31 18:22:43 +08:00
minggo 860d3eff4b issue #1454: make js binding work together with lua binding and native codes 2012-08-31 17:55:45 +08:00
YuLei 748d64ecc0 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-08-31 09:47:03 +08:00
James Chen e2629ef175 Fixed some compile errors on win32. 2012-08-30 23:10:09 +08:00
James Chen e584b94728 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into js 
Conflicts:
	scripting/javascript/bindings/cocos2d_generated.cpp
 2012-08-30 20:16:54 +08:00
mustime e1db27fb0d issue #1425: add ActionsEaseTest & MotionStreakTest 2012-08-30 16:39:58 +08:00
mustime 2bfa5dfc1e issue #1425: fix a problem when handling touch event 2012-08-30 16:38:16 +08:00
mustime 2961666fbc issue #1425: add MotionStreakTest for TestLua 2012-08-30 15:55:13 +08:00
mustime fc8cba66e0 issue #1425: add ActionsEaseTest to TestLua 2012-08-30 15:35:04 +08:00
mustime 009d15845a issue #1425: update lua script 2012-08-30 15:32:29 +08:00
Rohan Kuruvilla 743478570c Chipmunk support 
* Changing CGPoint to cpVect
 * Fix build and test code
 2012-08-29 16:35:30 -07:00
folecr 4ebafb0ae3 Remove reference to Resources/JS. This code is not used in the test suite. 2012-08-29 15:59:48 -07:00
James Chen 21547fb96f Don't make CCScriptEngineProtocol inherits from CCObject since setScriptEngine is invoked only once in AppDelegate.cpp, 
It will affect the lifecycle of ScriptCore instance, the autorelease pool will be destroyed before destructing ScriptCore.
So a crash will appear on Win32 if you close the game window.
 2012-08-29 14:49:04 -07:00
James Chen a2b5916301 Using 'getHashCodeByString(typeid(*native_obj).name())' instead of 'reinterpret_cast<long>(typeid(*native_obj).name());'. 
Since on win32 platform, 'reinterpret_cast<long>(typeid(*native_obj).name());' invoking in cocos2d.dll and outside cocos2d.dll(in TestJavascript.exe) will return different address.
But the return string from typeid(*native_obj).name() is the same string, so we must convert the string to hash id to make sure we can get unique id.
 2012-08-29 14:49:03 -07:00
mustime 289eb65dde issue #1425: fix a problem that missing "MainMenu" 2012-08-29 18:16:59 +08:00
mustime c15c96ac28 Merge https://github.com/cocos2d/cocos2d-x into testlua 2012-08-29 17:29:33 +08:00
mustime cc4573c3e4 issue #1425: add ParticleTest to TestLua 2012-08-29 17:17:36 +08:00
mustime df25d56cc3 issue #1425: update pkg for tolua++ binding 2012-08-29 17:10:06 +08:00
folecr 143cd39269 -DCOCOS2D_JAVASCRIPT added to APP_FLAGS in Application.mk. Applied to all files. 2012-08-28 19:07:50 -07:00
folecr 51911d066d Add flags : COCOS2D_JAVASCRIPT and COCOS2D_DEBUG=2 2012-08-28 17:44:01 -07:00
folecr 6f7cb44c62 Build script magic to deal with Image and Fonts on Android. 
* Copy Images/* and Fonts/* into assets
 * Ignore assets/Images and assets/Fonts directories when packaging
 2012-08-28 17:44:01 -07:00
folecr 9fa24f07f5 Excluded *.pvr.gz from packaging 2012-08-28 17:44:00 -07:00
folecr e00240c8aa Rename Resources/JS to Resources/oldjs to avoid conflict with js 2012-08-28 17:44:00 -07:00
folecr ab80fdd908 Add library reference to Cocos Android Java code 2012-08-28 17:44:00 -07:00
folecr a03dc1f7e8 Generate an Android build.xml 2012-08-28 17:44:00 -07:00
folecr 148b67d374 Disable use of chipmunk 2012-08-28 17:44:00 -07:00
folecr 4256dc6830 Update makefiles 2012-08-28 17:43:58 -07:00
folecr 421d60e4f2 Package the js directory 2012-08-28 17:43:57 -07:00
folecr f09bddd0f7 Add refernence to chipmunk static library 2012-08-28 17:43:56 -07:00
folecr 7017f772b2 Remove editor backup file 2012-08-28 17:43:56 -07:00
minggo f0068209f3 Merge pull request #1252 from mustime/testlua 
issue #1425: add EffectTest to TestLua
 2012-08-28 01:05:50 -07:00
mustime 22cf904038 issue #1425: add EffectTest to TestLua 2012-08-28 15:44:09 +08:00
minggo ff34cb7b39 issue #1425: add icons for testlua 2012-08-28 14:34:22 +08:00
minggo 76410f4b5b Merge pull request #1248 from mustime/testlua 
Testlua
 2012-08-27 23:18:22 -07:00
mustime f63a719981 issue #1425: fix the problem that missing Resources path 2012-08-28 14:14:09 +08:00
mustime 8ec843785c issue #1425: change the title from "HelloLua" to "TestLua" 2012-08-28 11:56:23 +08:00
mustime 4237ec42be issue #1425: add ios project for TestLua 2012-08-28 11:49:22 +08:00
mustime 9afede2474 issue #1425: update lua files 2012-08-28 11:48:34 +08:00
mustime 567f4b15aa issue #1425: fix a problem when searching lua files on ios project 2012-08-28 11:47:06 +08:00
Rohan Kuruvilla 8d7516a0ef Test project for cocos2d-x js. 2012-08-27 10:07:31 -07:00
minggo d1f92b8da4 Merge pull request #1239 from mustime/testlua 
Testlua
 2012-08-27 02:45:29 -07:00
James Chen ef906cd2ba Merge pull request #1247 from dumganhar/gles20 
Updated Makefiles for linux port.
 2012-08-27 01:45:26 -07:00
James Chen dd26a2fcd8 Updated Makefiles for linux port. 2012-08-27 16:43:02 +08: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
mustime c0c3222238 issue #1425: fix a typo error 2012-08-27 15:42:19 +08:00
mustime fa3ec83eec issue #1425: fix a problem when copying files to assets 2012-08-27 15:35:25 +08:00
mustime 6ac99e687b issue #1425: fix a error when designating the Resources path 2012-08-27 15:09:27 +08:00
James Chen 28150573c6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-27 13:48:55 +08:00
James Chen 7ccb720104 Resource file searching implementation for blackberry. 
Updated the package names of blackberry samples.
 2012-08-27 13:48:17 +08:00
mustime be116f5352 issue #1425: update TestLua project 2012-08-27 11:43:47 +08:00
minggo c7d365ca1c Merge pull request #1231 from donaldalanmorrison/gles20 
Gles20
 2012-08-26 20:17:40 -07:00
minggo 6e2b718243 Merge pull request #1241 from minggo/gles20 
add NULL as the last parameter to prevent crashing when creating CCSequence
 2012-08-26 19:48:36 -07:00
minggo a80c282844 add NULL as the last parameter to prevent crashing when creating CCSequence 2012-08-27 10:47:32 +08:00
mustime f641602e6e issue #1425: update vs10 proj configuration for TestLua 2012-08-27 10:23:05 +08:00
James Chen 3d0b5bf455 fixed some warnings in java codes for android port. 2012-08-27 10:21:43 +08:00
mustime 7f55980259 issue #1425: add copy commands to copy Resources to android/assets 2012-08-27 10:12:33 +08:00
mustime 6cc4eb8878 issue #1425: remove copying Resources files commands in VS10 2012-08-27 10:04:30 +08:00
mustime 1b70d8193f Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua 
Conflicts:
	samples/TestLua/proj.win32/TestLua.win32.vcxproj
 2012-08-27 10:00:00 +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 3eb3ebc67a Fixed VS2010 Warning C4800: 'void *' : forcing value to bool 'true' or 
'false' (performance warning).
 2012-08-24 11:20:23 -07:00
James Chen 1a5dd4fbb0 Updated vs2010 project configuration for TestLua. 2012-08-24 18:42:03 +08:00
James Chen 86d1d457a1 Added vs2008 project for TestLua. 2012-08-24 18:27:47 +08:00
minggo cb93713433 Merge pull request #1234 from minggo/gles20 
use absolute path in CCFileUtils
 2012-08-24 02:58:33 -07:00
minggo bcd691ad9f use absolute path in CCFileUtils 2012-08-24 17:55:29 +08:00
minggo cf1d61f3de Merge pull request #1232 from minggo/gles20 
fix compiling error of linux
 2012-08-24 01:09:37 -07:00
mingo ba4d75a60e issue #1445: fix compiling error of linux 2012-08-24 15:53:26 +08:00
James Chen 8e67592df2 Updated project configures of blackberry port. 2012-08-24 14:57:44 +08:00
Donald Alan Morrison 3c7846e32f Fixed VS2010 Warning: C4018: '<' : signed/unsigned mismatch 2012-08-23 23:35:25 -07:00
James Chen 85304b9441 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_lua 2012-08-24 10:27:20 +08:00
mustime 4c7ad0d0d1 issue #1425: testlua project 2012-08-24 10:23:23 +08:00
mustime f55aedb5e9 issue #1425: add android proj on TestLua 2012-08-24 10:18:59 +08:00
mustime f67b513d08 issue #1425: add android proj on TestLua 2012-08-24 10:07:15 +08:00
James Chen 26a31b21b3 issue #1429: Removed mGLView variable in HelloCpp/HelloLua/TestJavascript class. 2012-08-24 00:24:04 +08: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
minggo 83606d7691 Merge pull request #1212 from mustime/testlua 
Testlua
 2012-08-23 03:08:25 -07:00
minggo 37cb691600 fix some bugs while testing 2012-08-23 18:01:28 +08:00
mustime 36a99a099e issue #1425: add TestLua project 2012-08-23 16:10:50 +08:00
James Chen 06038163ca iss1429: Finished using Dialog to implement CCEditBox for android port. 
Next step:
	Using Java codes to implement Cocos2dxEditBox. Don't use style.xml, color.xml and keyboard.xml.
 2012-08-23 15:34:57 +08:00
minggo d83cdbda09 fixed #1441: put hd and ipad resources into separate directory 2012-08-23 14:20:32 +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 9553031196 fixed #1112: Lua support for blackberry port. 2012-08-22 18:48:57 +08:00
James Chen dbd02b2726 Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into dale_lua 2012-08-22 18:28:11 +08:00
James Chen bcbd161398 issue #1429: First commit CCEditBox for android port. 2012-08-22 09:47:04 +08:00
Dale Ducharme d76d9a6451 Adding lua scripting to BlackBerry port. 2012-08-21 13:32:28 -04:00
James Chen fac3e9c8de issue #1437: fixed some compile errors. 2012-08-21 17:25:03 +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
minggo ba2049d086 iss1438_android_template 2012-08-21 16:45:23 +08:00
minggo 07ddd43695 issue #1437:make CCApplication::sharedApplication() return pointer 2012-08-21 15:28:43 +08:00
minggo cfdc50fb60 issue #1437:make CCEGLView::sharedOpenGLView() return pointer 2012-08-21 14:58:31 +08:00
minggo e2140aea0b Merge pull request #1205 from minggo/gles20 
use CCSprite::createWithSpriteFrame() to create a sprite
 2012-08-20 02:29:34 -07:00
minggo c854562b03 use CCSprite::createWithSpriteFrame() to create a sprite 2012-08-20 17:28:17 +08:00
James Chen 0861877594 kCCResolutionXXX -> kResolutionXXX and estimate whether touch point is contained in GL viewport rectangle. 2012-08-20 16:32:22 +08:00
James Chen 7eb5d85298 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_bb 2012-08-20 15:49:24 +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
minggo a8f2c74b9e change TARGET_OS_IPHONE to TARGET_OS_MAC in TestCpp mac project 2012-08-20 15:42:56 +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 ce9c744f21 fixed #1419: cocos2dx-test ~> TestCpp 2012-08-16 18:20:00 +08:00
James Chen 48fa8a4e88 fixed #1419: Update eclipse project configurations for linux port. 2012-08-16 18:09:01 +08:00
James Chen de2c00b7ae issue #1405: fixed some compile error on win32 and linux. 2012-08-16 11:30:25 +08:00
minggo bcf61cdf26 issue #1405:use enum to distinguish target 2012-08-16 10:21:15 +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
mustime 42208f93aa issue #1425: change the interfaces in .pkg files to satisfy the current 
version
 2012-08-10 18:14:04 +08:00
James Chen 03c2366821 Merge branch 'minggo_res' of https://github.com/dumganhar/cocos2d-x into gles20 2012-08-09 17:50:39 +08:00
James Chen 6e2cace72d Merge branch 'iss1405_multi_resolution' of https://github.com/minggo/cocos2d-x into minggo_res 2012-08-09 17:19:20 +08:00
James Chen a7ce8f2e21 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into minggo_res 2012-08-09 17:16:10 +08:00
James Chen 3ff21fe275 fixed #1424: http wrapper compiled ok on win32. 2012-08-09 17:04:55 +08:00
minggo c31415b7bd issue #1405:resolution supports on mac 2012-08-09 14:34:20 +08:00
James Chen 826dfe4102 issue #1405: multi resolution works ok on win32. Add CCFileUtils::getResourceDirectory() method. 2012-08-09 12:49:33 +08:00
Walzer 08198c082e issue #1424, http wrapper has been tested on iOS, mac, android port. 2012-08-09 10:45:11 +08:00
minggo c34812567f issue #1405: modify macro names and comment and add getVisibleSize and getVisibleOrigin in CCDirector 2012-08-09 10:23:39 +08:00
minggo cc39dc55f4 issue #1405:remove unneeded functions of CCFileUtils 2012-08-08 18:39:33 +08:00
minggo 3395bba327 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution 2012-08-08 17:42:45 +08:00
minggo 3853611e62 issue #1405:support loading resources from directory defined by developer 2012-08-08 17:42:04 +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
minggo f6115d5667 issue #1405:zoom out work ok 2012-08-07 18:24:45 +08:00
minggo 5d8f909af4 issue #1405:multi resolution works ok 2012-08-07 14:29:46 +08:00
Walzer 39e45da8d9 Merge branch 'gles20' of https://github.com/greathqy/cocos2d-x into network 2012-08-06 15:36:13 +08:00
qingyun 054fe4993c fix CCLog stack overflow 2012-08-06 14:47:23 +08:00
minggo 9ccf3cefdf fixed #1417:add header search path and add CCTouch.cpp into mac project 2012-08-06 11:08:06 +08:00
qingyun 24136dc575 add CCHttpRequest and related tests to repository 2012-08-04 18:27:27 +08:00
qingyun dc35596ce9 add greathqy to AUTHORS 2012-08-04 18:12:39 +08:00
James Chen e9aa3743fa issue #1405: muti-resolution works ok on linux. 2012-08-03 13:56:18 +08:00
James Chen 9c26e38563 Merge branch 'gles20' of https://github.com/tongpengfei/cocos2d-x into linux_gles20 2012-08-03 10:10:33 +08:00
pengfei tong a37fd743e0 [FIX] testjs 2012-08-02 16:23:31 +08:00
pengfei tong c82c8412a8 [LOG] fix makefile 2012-08-02 13:19:40 +08:00
pengfei tong b93d0b5ebf [LOG] add linux port 2012-08-02 13:02:59 +08:00
minggo 5399aac590 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution 2012-08-02 10:50:15 +08:00
minggo 60983e8a02 Merge pull request #1147 from folecr/morefixandroidbuildscript 
Further clean up of android build scripts and template
 2012-08-01 19:45:18 -07:00
minggo 0b2396c54b issue #1405:support three type of resolution 2012-08-01 16:56:12 +08:00
Walzer cc3d850892 fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float" 2012-08-01 15:30:12 +08:00
folecr 4d3df6145b Cleaner build scripts 2012-07-31 22:56:18 -07:00
folecr e69cda8fe2 Quoted use of bash variables 2012-07-31 22:56:17 -07:00
Walzer dc37896ed9 change the param sequence of CCLabelTTF::create and initWithString, according to JS APIs 2012-08-01 13:24:23 +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
folecr 200992b272 Cleaner build script 
* Quoted parameters for bash directives
 * Forgo the extra _LOCAL variables by testing environment variables
 * Better path assumptions
 * References
   * http://stackoverflow.com/questions/59895/can-a-bash-script-tell-what-directory-its-stored-in
   * http://stackoverflow.com/questions/228544/how-to-tell-if-a-string-is-not-defined-in-a-bash-shell-script
 2012-07-27 17:45:21 -07:00
Nat Weiss 9f0be2de05 Added Mac cpp HelloWorld and Tests. 2012-07-24 19:07:31 -07:00
James Chen fda669510a fixed #1385: Logic error in BitmapFontMultiLineAlignment. 2012-07-24 11:32:02 +08:00
James Chen e7d7ff99c7 fixed #1386: PauseResumeActionsTest crashes. 2012-07-24 11:21:08 +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
minggo e249d6b0ce Merge branch 'gles20' of https://github.com/walzer/cocos2d-x into modify_xcode_project 2012-07-23 15:38:24 +08:00
Walzer cc23d0667d unify Bundle ID for all xcodeprojects to "org.cocos2d-x.*", add icons for iphone/ipad * retina. 2012-07-23 15:23:26 +08:00
James Chen d5f783b681 issue #1399: Updated android template. 2012-07-23 14:56:40 +08:00
James Chen 2ab5e4ab9c issue #1399: Added vs2010 support. 2012-07-23 11:57:34 +08:00
James Chen 8291b7aef6 Reverted 'cocosdenshion' to 'CocosDenshion'. 2012-07-23 11:07:31 +08:00
James Chen 5e5b008742 issue #1399: Built four android projects(HelloCpp, HelloLua, TestJavascript, TestCpp) successfully on Ubuntu System. 2012-07-21 13:49:20 +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 755b29cb9d Updated ios project settings. 2012-07-20 17:38:21 +08:00
James Chen 5b6497b0e4 Updated test_actions.js. 'new cc.Sprite.create' --> 'cc.Sprite.create'. 2012-07-20 17:12:17 +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