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

6687 Commits

Author SHA1 Message Date
minggo b640b6c206 Merge pull request #1837 from minggo/iss1468-ccpoint 
Iss1468 ccpoint
 2013-01-13 23:18:35 -08:00
minggo c08c982f89 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1468-ccpoint 2013-01-14 15:07:21 +08:00
minggo 984b304ec5 issue #1468:change CCPoint CCSize CCRect from class to struct 2013-01-14 14:45:16 +08:00
James Chen 0fd16e7b31 Merge pull request #1827 from folecr/assert_fix 
fixed #1654: Assert fix for android.
 2013-01-13 22:15:11 -08:00
James Chen 441d1d9920 Update AUTHORS 2013-01-14 11:35:13 +08:00
James Chen 49ead245d9 Merge pull request #1824 from johnangel/gles20 
fixed #1627: Enable Windows XP support in Visual Studio 2012 Update 1.
 2013-01-13 19:32:09 -08:00
Rolando Abarca 320068930e more debug stuff 2013-01-11 14:29:40 -08:00
Rolando Abarca 47c003ae54 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2013-01-11 14:01:42 -08:00
Rolando Abarca 5df4b4d997 adding debug support for js 2013-01-11 14:01:36 -08:00
johnangel a1155f52e6 Merge remote branch 'upstream/gles20' into gles20 2013-01-11 21:48:47 +01:00
James Chen 800e65b6fc fixed #1653: Using JSB_PRECONDITION2 to check return value in js_bindings_ccbreader.cpp and js_bindings_chipmunk_manual.cpp. 2013-01-11 22:00:42 +08:00
James Chen 1a659bdacb issue #1653: Updated the submodule of cxx-generator. 2013-01-11 21:46:45 +08:00
James Chen 777a327945 Updated cocos2d-js-tests. 2013-01-11 21:27:04 +08:00
James Chen 09f2f56d41 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1653-jsb-int 2013-01-11 20:46:23 +08:00
James Chen d15561e826 issue #1653: Checking the return value of jsapi. Return JSVAL_VOID if jsapi has no return value. 2013-01-11 18:57:33 +08:00
James Chen 7f4146f3e2 issue #1653: JS_ValueToInt32, JS_ValueToECMAInt32 --> jsval_to_int32 
Using JSB_PRECONDITION2 to check the return value of js api.
Reporting an error when binding api return JS_FALSE.
 2013-01-11 17:44:39 +08:00
James Chen e1ca1fdb2b Merge pull request #1830 from dumganhar/update-js-tests 
Updated the submodule of cocos2d-js-tests.
 2013-01-11 01:20:15 -08:00
James Chen df05a1d7e9 Updated the submodule of cocos2d-js-tests. 2013-01-11 17:18:48 +08:00
James Chen 273ffcc571 issue #1653: Updated the submodule of cxx-generator. 2013-01-11 13:55:36 +08:00
James Chen a8361bf703 issue #1653: Checking return value for 'native --> jsval'. 2013-01-11 13:54:57 +08:00
folecr 58874dc7a5 CCAssert uses CC_ASSERT directly 
* ... after call to cc_assert_script_compatible()
 * CCAssert will now report the correct line number
 2013-01-10 12:26:12 -08:00
johnangel 16269d952d Detect VS2012 Update 1 2013-01-10 11:55:30 +01:00
James Chen 518d923c0a Merge pull request #1828 from dumganhar/gles20 
fixed a typo.
 2013-01-10 00:01:17 -08:00
James Chen 9f322d9646 fix a typo. 2013-01-10 15:58:52 +08:00
folecr e3cf517f32 Assert implementation for Android 
* __android_log_assert is not stable
    * Uses __android_log_print instead
 2013-01-09 18:51:49 -08:00
James Chen 02a1be178a Update AUTHORS 2013-01-09 23:01:20 +08:00
James Chen 11ac5cec71 Merge pull request #1817 from jpridavok/gles20 
fixed #1635: Added EditBox implementation for Mac OSX.
 2013-01-09 06:59:04 -08:00
Jozef Prídavok 229ad55dfa Fixed and refactored Mac Implementation. 2013-01-09 15:34:53 +01:00
Jozef Prídavok 69ea0d63f8 Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into gles20 2013-01-09 15:13:02 +01:00
Jozef Prídavok 4f2f5a3c8f Added EditBox implementation for Mac OSX. 2013-01-09 15:09:57 +01:00
James Chen e1a617a7cd Merge pull request #1826 from dumganhar/iss-1646-spidermonkey18 
fixed #1646: Updated spiderMonkey to FF18.0.
 2013-01-09 02:24:42 -08:00
James Chen b3be1e9e90 fixed #1646: GCC_OPTIMIZATION=1 for every jsb project setting of debug mode. This can avoid 'vm_protect' error when debugging jsb project on device. 2013-01-09 18:23:33 +08:00
walzer 42f6839b15 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2013-01-09 17:50:09 +08:00
James Chen 6d7f380f23 issue #1646: GCC_OPTIMIZATION_LEVEL=1. 2013-01-09 17:49:08 +08:00
James Chen 8a4f87277e issue #1646: Updated WatermelonWithme project setting for win32. 2013-01-09 15:35:19 +08:00
James Chen c9c8ee66b9 issue #1646: Using GNU libstdc++ to build spiderMonkey on Android. 2013-01-09 14:45:36 +08:00
James Chen ad9138685e issue #1646: Updated spiderMonkey to FF18.0. 2013-01-09 13:42:21 +08:00
folecr c0ecad31fe Consistent use of CCAssert 
* Remove @
 * Use CCAssert instead of CC_ASSERT (number of parameters differ between the two)
 2013-01-08 14:11:34 -08:00
Jozef Prídavok 025c50e6cf Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2013-01-08 13:28:40 +01:00
johnangel 0d476604e0 Detect VS2012 Update 1 2013-01-08 10:58:38 +01:00
James Chen ff035e9050 Merge pull request #1825 from dumganhar/iss-1645-jstemplate-ios 
fixed #1645: JS Project created by xcode template doesn't work correctly.
 2013-01-07 23:19:11 -08:00
James Chen a4ea453ade fixed #1645: Excluded proj.win32. 2013-01-08 15:15:44 +08:00
James Chen 831c414c63 fixed #1645: JS Project created by xcode template doesn't work correctly. 2013-01-08 15:04:59 +08:00
James Chen f0f78d72e4 issue #1645: Updated js template for iOS project. 2013-01-08 10:40:49 +08:00
johnangel e32a193561 Setting Windows app title for non-Debug mode, also. 2013-01-07 12:17:50 +01:00
johnangel 674bb8e728 Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010. 2013-01-07 11:51:05 +01:00
James Chen 774e9dcc23 Merge pull request #1823 from dumganhar/iss1620-sys-localstorage 
fixed #1620: Using sqlite3 to implement sys.LocalStorage.
 2013-01-07 02:30:26 -08:00
James Chen b662d5c569 fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h. 2013-01-07 18:06:53 +08:00
James Chen 43b95f2a9a fixed #1620: Check return value. 2013-01-07 17:38:52 +08:00
James Chen 1d59a36ee9 fixed #1620: Invoking localStorageFree in the destructor of ScriptingCore. Added header file to cocos-ext.h 2013-01-07 17:34:22 +08:00