walzer
|
4ae43e5901
|
fix typos in doxygen of CCSprite and CCProtocol
|
2013-01-14 21:51:47 +08:00 |
minggo
|
591cd4a401
|
Update AUTHORS
|
2013-01-14 19:24:27 +08:00 |
minggo
|
90a4653530
|
Merge pull request #1839 from fnz/gles20
Fix addImageAsync iOS memory leak
|
2013-01-14 03:22:11 -08:00 |
walzer
|
c9c227873f
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2013-01-14 17:07:07 +08:00 |
walzer
|
1ab552b482
|
Add a sample doxygen sample in CCSprite.h and CCProtocol.h
|
2013-01-14 16:54:20 +08:00 |
Victor K
|
bf01df0f52
|
Fix addImageAsync iOS memory leak
Bug: http://www.cocos2d-x.org/issues/1087
Thread: http://www.cocos2d-x.org/boards/6/topics/17031
|
2013-01-14 15:32:30 +07:00 |
James Chen
|
51fb96f268
|
Merge pull request #1838 from dumganhar/iss1649-return-const
fixed #1649: Changed return type to const reference for member variable access.
|
2013-01-14 00:08:57 -08:00 |
James Chen
|
6733f786a5
|
fixed #1649: Reverted some invokings of function that returns const reference.
|
2013-01-14 16:06:18 +08:00 |
James Chen
|
22ebf3a5e5
|
Merge remote-tracking branch 'cocos2d-x/gles20' into iss1649-return-const
|
2013-01-14 15:52:42 +08:00 |
James Chen
|
6565fa92cc
|
fixed #1649: Changed return type to const reference for member variable access.
|
2013-01-14 15:51:53 +08:00 |
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 |
Jozef Prídavok
|
9889b4f9fd
|
Added the very first implementation of CCEditBox for Win32.
|
2013-01-10 23:59:21 +01: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 |