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

993 Commits

Author SHA1 Message Date
minggo de60057621 Merge pull request #2472 from minggo/master 
disable depth test for clipping test
 2013-04-26 20:34:38 -07:00
minggo fa0370bba5 disable depth test for clipping test 2013-04-27 11:33:23 +08:00
minggo 9f7d091e95 Merge pull request #2470 from minggo/master 
disable menutest in lua
 2013-04-26 20:18:23 -07:00
minggo ff207b68e0 disable menutest in lua 2013-04-27 11:17:10 +08:00
James Chen 5b45f85216 [HelloLua] print ~> cclog 2013-04-27 09:48:35 +08:00
Rohan Kuruvilla d7020a7ab2 Adding new status messages for Android 2013-04-26 13:47:26 -07:00
Rohan Kuruvilla 8209fa56a2 Fixing bug where screen rotate would keep creating new NSD services 2013-04-26 13:47:26 -07:00
Rohan Kuruvilla eb85a6c1fb Handle evalScript from JNI. Also adds helpers for settings status 2013-04-26 13:47:25 -07:00
Rohan Kuruvilla 615329eee5 Add evalScript over the network code and force portrait mode on stop 2013-04-26 13:47:25 -07:00
Rohan Kuruvilla 374c456749 change orientation to Portrait on CCB Stop 2013-04-26 13:47:25 -07:00
Rohan Kuruvilla ece710c4d8 Adding eval script wrapper for ScriptingCore to AppDelegate 2013-04-26 13:41:15 -07:00
minggo d40fdd24b7 fixed #2075:add SpiteTest into Android.mk 2013-04-26 14:02:13 +08:00
minggo 89591fdccc fixed #2084:add lua loader for all platforms 2013-04-26 12:12:19 +08:00
minggo 62231912be Merge https://github.com/cocos2d/cocos2d-x 2013-04-26 10:36:46 +08:00
Rohan Kuruvilla c12268bd70 Modifying little log statements 2013-04-25 18:44:59 -07:00
Rohan Kuruvilla 56a1ba9e42 Removing unneeded code 2013-04-25 18:41:58 -07:00
Rohan Kuruvilla e2edc04946 Fixing handling starting and stopping of NSD service in Android 2013-04-25 18:41:53 -07:00
Rohan Kuruvilla 8a59680175 Removing onSurfaceChange update since it was being executed after ccb_run. This resulted in frame size being changed after game was running (bug) 2013-04-25 18:41:48 -07:00
Rohan Kuruvilla 188f0354f3 Fixing configChanges flag to disable GL context being deleted on rotate 2013-04-25 18:41:43 -07:00
Rohan Kuruvilla b1f9dd30e7 Using iOS specific text entry for setting pairing code 2013-04-25 18:41:38 -07:00
Rohan Kuruvilla 76f334797d Refactoring applicationDidFinishLaunching. Also adding scaling for large non-retina Android tablets 2013-04-25 18:41:33 -07:00
Rohan Kuruvilla 2636bafd0c Fixing network logging for Android and iOS 2013-04-25 18:41:29 -07:00
Rohan Kuruvilla cecb157f22 Fixing rotation for iOS 2013-04-25 18:41:24 -07:00
Rohan Kuruvilla 0378a97fa0 Adding sending of filelist when reset is pressed on iOS 2013-04-25 18:41:18 -07:00
Rohan Kuruvilla 7bd3f2a260 Fixing resolution handling for iOS and Android 
1. Adding iPhone5 support
2. Changing Android resolution management based on DPI (Tablet mode or Phone mode)
3. Modifying distribution of xlarge,large,medium,small and xsmall assets to do it properly
4. Using kResolutionFixedWidth (kResolutionFixedHeight for landscape games) to properly calculate aspect ratio
5. Tested on all iOS devices and Nexus 4 (which is correctly identified as Retina phone)
 2013-04-25 18:41:14 -07:00
Rohan Kuruvilla f95b802866 Adding rudemntary support for Rotation in Android 2013-04-25 18:41:01 -07:00
Rohan Kuruvilla bb91f1eb30 Adding rudementary support for Rotation in iOS 2013-04-25 18:40:56 -07:00
Rohan Kuruvilla d8c30e0c5b Adding log redirect over the network for iOS. Also fixing Stop command crash in Android 2013-04-25 18:39:51 -07:00
Rohan Kuruvilla e6fc611346 Commiting out orientation change code. was causing gl errors with landscape games 2013-04-25 18:39:47 -07:00
Rohan Kuruvilla 9b86791eef Adding CocosPlayer for iOS 2013-04-25 18:39:43 -07:00
James Chen 5337234e22 Android also uses executeScript to load lua source file or byte code file. So unused codes need to be deleted. 2013-04-25 21:31:52 +08:00
minggo b6c8e78149 remove js files from compiling 2013-04-25 18:37:27 +08:00
minggo 3f72473aba Merge https://github.com/cocos2d/cocos2d-x 2013-04-25 16:25:55 +08:00
James Chen 7bd1d8cde1 Updating cocos2d-js-tests. 2013-04-25 16:16:39 +08:00
James Chen 9913358dde Updating TestJavascript project configuration. 2013-04-25 14:31:11 +08:00
minggo 9881012459 Merge https://github.com/cocos2d/cocos2d-x 2013-04-25 12:01:59 +08:00
James Chen 631b08e984 Updating project configuration for iOS. 2013-04-25 11:30:35 +08:00
minggo fb7851b429 define checkAnim() before using it 2013-04-24 17:06:59 +08:00
minggo 93ed85903f Merge pull request #2437 from dumganhar/iss2075-spine-support 
fixed #2075: Adding spine editor support.
 2013-04-24 01:12:23 -07:00
James Chen abacdc9921 tabify for makefile. 2013-04-24 15:15:25 +08:00
James Chen 8e5610fc58 issue #2075: Updating Makefile of TestCpp for native client port. 2013-04-24 15:00:53 +08:00
James Chen 6c1890f8ab issue #2075: Updating TestCpp project setting for marmalade and linux. 2013-04-24 14:58:11 +08:00
minggo c6dfee706c fix memory leak in FontTest 2013-04-24 14:49:52 +08:00
James Chen 7b138c6be9 issue #2075: Adding spinetest in TestCpp for win32. 2013-04-24 14:48:39 +08:00
James Chen 0c3cb27113 issue #2075: Updating TestCpp for mac. 2013-04-24 14:34:41 +08:00
James Chen 2d1172814d issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
minggo d4efbcfcef don't include unneeded header file 2013-04-23 10:10:14 +08:00
Sergey Shambir 8507f7a386 network: Added PUT and DELETE request types 2013-04-21 20:54:52 +04:00
Sergey Shambir e5b2f300f9 Added CC_FORMAT_PRINTF(x,y) macro to warn on CCLog() format errors 
Uses printf format. Enabled for GCC and clang.
 2013-04-19 11:54:08 +04:00
James Chen f129b94e2d Removing unused file(uthash.h) in JSB projects. 2013-04-19 11:09:02 +08:00
minggo 37dc03b7d6 Merge pull request #2404 from minggo/assetmanager 
fix a compiling error
 2013-04-18 19:36:03 -07:00
minggo f9aa710c36 fix a compiling error 2013-04-19 10:34:40 +08:00
Dawid Drozd a153fa1f94 Fixing linking errors for TestCPP with libcurl 2013-04-18 12:14:18 +02:00
James Chen 41b0345e9c Removing unused file (uthash.h) in Project.pbxproj. 2013-04-18 13:52:25 +08:00
minggo 78d3c7f048 fixed #1613:not reload resources on Android platform after return from background 2013-04-17 15:34:57 +08:00
James Chen a005852fa5 issue #1847: Using luajit for win32. 2013-04-17 10:46:38 +08:00
James Chen 928b6ad361 issue #1847: Fix a typo in Ball.lua and Paddle.lua. 2013-04-17 09:52:26 +08:00
James Chen 6a56bb6d73 issue #1847: [iOS] Using LuaJit for HelloLua and TestLua. 2013-04-17 09:51:28 +08:00
James Chen 79d58bcdb9 issue #1847: Adding sources of Luajit2.0.1-hotfix, and adding android support. 2013-04-16 17:34:58 +08:00
Sam Clegg ffb7360e46 Enable easy swithing between Box2D and chipmunk in linux and nacl 
The ENABLE_BOX2D/ENABLE_CHIPMUNK defines were previously
hardcoded in the Makefiles.  Now you get chipmunk by default
on both platforms and can enble Box2D by setting USE_BOX2D in
your environment.

Also remove erroneous -D__CC_PLATFORM_FILEUTILS_CPP__ and
-D__CC_PLATFORM_IMAGE_CPP__ from linux Makefiles.  These should
never be defined globally like this.
 2013-04-15 07:35:50 -07:00
James Chen 0c8e3e9129 Merge pull request #2349 from rogerzanoni/master 
fixed #2052: [Linux] [-Werror=array-bounds] error appears when compiling Box2dTestBed.
 2013-04-14 19:45:35 -07:00
James Chen a5d78830db fixed #1860: onNodeLoaded will be called twice if ccb was added as a CCBFile. 2013-04-15 10:39:44 +08:00
Roger Zanoni 05873ad7a0 Check array boundaries to avoid the "array-bounds" error on linux 
Compiling on linux causes the error "array subscript is above array
bounds [-Werror=array-bounds]". This commit adds boundary checking
using the constant defining the maximum number of items in the "nuke" array.

Signed-off-by: Roger Zanoni <roger.zanoni@openbossa.org>
 2013-04-10 10:53:52 -04:00
James Chen 6e9fcf8c05 fixed #2048: Adding test case for variable cell sizes in CCTableView. 2013-04-10 16:38:00 +08:00
James Chen 32406efec2 Merge branch 'newlines_in_cclog' of https://github.com/sbc100/cocos2d-x into sbc100-newlines_in_cclog 
Conflicts:
	cocos2dx/proj.linux/cocos2dx.mk
 2013-04-10 14:17:23 +08:00
Rohan Kuruvilla 3d7e8f0d84 Fixing CocosPlayer AppDelegate to include openGL bindings. Also adding JNI stubs for changing orientation 2013-04-09 15:29:35 -07:00
James Chen 935b7af11c Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into azmeuk-openal 
Conflicts:
	AUTHORS
 2013-04-08 17:53:14 +08:00
James Chen c3a177e5e6 Merge pull request #2268 from Weeds/ccscheduler-fix 
fixed #2003: Fixed potential crash in CCScheduler::removeHashElement.
 2013-04-08 02:00:22 -07:00
James Chen 1a44f776f8 fixed #2005: Adding CurrentLanguageTest for Testlua. 2013-04-07 16:34:07 +08:00
James Chen 268bd4dfad fixed #2004: Adding UserDefaultTest for TestLua. 2013-04-07 16:20:43 +08:00
James Chen 1913b2b3a5 [TestLua] The menu item of Tests which is not supported will be disabled. 2013-04-07 16:06:53 +08:00
James Chen fce5deb0ec Refactoring mainmenu.lua. 2013-04-07 15:56:05 +08:00
James Chen ef731879f1 Merge pull request #2291 from dumganhar/iss1944-remove-associate-nativeobj 
fixed #1944: The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore.
 2013-04-06 20:20:33 -07:00
James Chen 684c659ba7 Merge pull request #2311 from dumganhar/iss2002-more-luatest 
fixed #2002: Adding Texture2dTest, RenderTexture, ZwoptexTest, FontTest, CocosDenshionTest and EffectsAdvancedTest for TestLua
 2013-04-06 19:45:28 -07:00
James Chen 6e1cf1e951 fixed #2002: Adding EffectsAdvancedTest for TestLua. 2013-04-07 10:38:56 +08:00
minggo 2436d87cb3 Merge pull request #2256 from waiter/master 
Add CCRemoveSelf Action
 2013-04-06 19:09:17 -07:00
James Chen 85b0fd306a Adding CocosDenshionTest. 2013-04-06 14:32:46 +08:00
James Chen 63c0ede945 Removing a comment. 2013-04-06 14:00:59 +08:00
James Chen 5171e11765 Adding FontTest for TestLua. 2013-04-06 14:00:17 +08:00
James Chen 17b948367a Adding ZwoptexTest. 2013-04-05 23:34:46 +08:00
James Chen e754909c5f Adding RenderTexture test for TestLua. 2013-04-05 17:13:46 +08:00
James Chen 2bff6d6480 Adding Texture2dTest. And format some lua codes. 2013-04-05 16:13:04 +08:00
James Chen 425b95152c Merge pull request #2295 from SevInf/master 
fixed #1999: CCEditBox iOS enchantments/bugfixes
 2013-04-03 07:37:29 -07:00
Sergej Tatarincev 202edc1597 CCEditBox test for separate font name/size setters 2013-04-03 17:20:01 +03:00
James Chen 031e77ccbe Updating SceneTest.lua. 2013-04-03 18:31:00 +08:00
James Chen 818a570b7f fixed #1998: Adding SceneTest.lua for TestLua. 2013-04-03 18:14:03 +08:00
James Chen 229d4329a5 fixed #1997: Adding IntervalTest for TestLua. 2013-04-03 17:00:05 +08:00
James Chen 2d9f8ca8de fixed #1814: MenuTest for Testlua is ok. 2013-04-03 16:29:16 +08:00
James Chen 686775300d fixed #1994: ActionManagerTest.lua is ok. 2013-04-03 11:59:17 +08:00
James Chen 6d6bc03465 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1944-remove-associate-nativeobj 2013-04-03 10:27:01 +08:00
James Chen c54ee96705 issue #1994: Adding actionManagerTest.lua. 2013-04-03 10:20:12 +08:00
James Chen 46b26cffd3 fixed #1993: Adding ParallaxTest for TestLua. 2013-04-02 18:20:14 +08:00
James Chen a73395507c fixed #1942: LayerTest for TestLua is ok. 2013-04-02 17:52:08 +08:00
James Chen ec7a2f4c5c fixed #1944: The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore. 2013-04-02 11:35:55 +08:00
James Chen 930487f6f7 Updating layerTest.lua. 2013-04-02 11:28:31 +08:00
James Chen d0300d429c issue #1942: Adding LayerTest, first commit. 2013-04-01 18:05:35 +08:00
James Chen a7f1fba762 TileMapTest.lua is ok. 2013-04-01 17:39:27 +08:00
James Chen 57a76a3a86 Using universal config for TestLua. 2013-04-01 17:39:27 +08:00
James Chen be4d15fbba Updating LabelTest.lua 2013-04-01 17:39:26 +08:00
James Chen 9ea35977db new tile map tests 2013-04-01 17:39:26 +08:00