James Chen
|
1e8f1ab491
|
Merge pull request #3392 from CocosRobot/updategeneratedsubmodule_1375926296
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-08-07 18:47:20 -07:00 |
minggo
|
552c63d0cf
|
Merge pull request #3269 from metalbass/patch-4
Removed if from CC_SAFE_DELETE and changed 0 to nullptr on all CC_SA...
|
2013-08-07 18:45:27 -07:00 |
CocosRobot
|
89b3e7e193
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-08-08 01:44:58 +00:00 |
James Chen
|
7910581654
|
Merge pull request #3388 from dumganhar/iss2483-sp-v23
closed 2483: Upgrading spidermonkey library to v23.
|
2013-08-07 18:39:40 -07:00 |
minggo
|
b3b0a94440
|
Merge pull request #3390 from folecr/comments
Update nojava.txt with readme.
|
2013-08-07 18:39:14 -07:00 |
carlo morgantini
|
83b2377a76
|
some more clean up and removed CCStringTTF
|
2013-08-07 16:36:04 -07:00 |
folecr
|
cbd7796438
|
Update nojava.txt with readme.
|
2013-08-07 12:29:58 -07:00 |
James Chen
|
87736683c0
|
Merge pull request #3387 from pyrasis/tizen_2.2
[Tizen] Enable LocalStorage
|
2013-08-07 03:08:38 -07:00 |
James Chen
|
59f5353f89
|
issue #2483: Updating cocos2d-console.
|
2013-08-07 18:06:31 +08:00 |
Lee, Jae-Hong
|
5a8ec8ca5e
|
[Tizen] Enable LocalStorage
- add sqlite3 headers and libraries.
- use sqlite3 library.
|
2013-08-07 19:01:41 +09:00 |
zhangbin
|
2077bc6d2f
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-08-07 17:57:45 +08:00 |
Lee, Jae-Hong
|
b42868fd69
|
[Tizen] Remove Tizen 2.1 headers and libraries.
|
2013-08-07 18:52:15 +09:00 |
godyZ
|
674fe025b0
|
update s3tc #3 ,standard of code
|
2013-08-07 16:39:05 +08:00 |
James Chen
|
166f7d1c66
|
Merge pull request #3386 from CocosRobot/updategeneratedsubmodule_1375857220
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-08-07 01:30:10 -07:00 |
CocosRobot
|
98aae97de3
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-08-07 06:33:44 +00:00 |
minggo
|
910215fa89
|
Merge pull request #3377 from boyu0/iss2345_refactor_ccimage
issue #2345 refactor CCImage and CCTexture2D
|
2013-08-06 23:29:38 -07:00 |
James Chen
|
c2c1bb45d8
|
Updating Bindings-generator.
|
2013-08-07 14:19:36 +08:00 |
boyu0
|
684e005ce7
|
issue #2345: edit for linux compile error
|
2013-08-07 14:10:42 +08:00 |
boyu0
|
ffd821ee13
|
issue #2345: update generated index
|
2013-08-07 13:48:12 +08:00 |
James Chen
|
39084750db
|
[Android] Updating launch activity name. ".TestJavascipt" --> "android.app.NativeActitiy" for TestJavascript project.
|
2013-08-07 13:46:09 +08:00 |
minggo
|
a6a8db0fd4
|
Merge pull request #3384 from minggo/improved_readme
Improved readme
|
2013-08-06 22:43:25 -07:00 |
boyu0
|
d61d3d1a24
|
issue #2345: fix mac crash due to libjpeg
|
2013-08-07 11:59:52 +08:00 |
minggo
|
397c8ccdd2
|
fix some format in ReadMe.md
|
2013-08-07 11:20:56 +08:00 |
boyu0
|
a9d26d3fdc
|
issue #2345: edit getPixelFormatInfoMap method to return reference.
|
2013-08-07 11:20:41 +08:00 |
minggo
|
9b2398dfd5
|
add missing in ReadMe.md
|
2013-08-07 11:18:19 +08:00 |
godyZ
|
0f007d2bd9
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-08-07 10:58:13 +08:00 |
boyu0
|
ec6343a9b8
|
fix js and linux compile error
|
2013-08-07 10:34:30 +08:00 |
James Chen
|
6fdd95e3aa
|
issue #2483: The callback type of 'delete' property has been changed from 'JS_PropertyStub' to 'JS_DeletePropertyStub' in v23.
|
2013-08-07 10:29:12 +08:00 |
James Chen
|
aa97e223d8
|
issue #2483: Upgrading spidermonkey library to v23 for all supported platforms.
|
2013-08-07 10:29:12 +08:00 |
minggo
|
9f65961a96
|
Merge pull request #3348 from azmeuk/makefile
Toplevel Makefile refactoring
|
2013-08-06 19:13:23 -07:00 |
minggo
|
f447398211
|
Merge pull request #3376 from folecr/android_redesign_update_template
Update templates to match newer, mostly-NDK Android port
|
2013-08-06 19:11:00 -07:00 |
James Chen
|
4f740809dd
|
The target needs to be set to 'spidermonkey' when generating jsbindings since we has added 'lua' target yet.
|
2013-08-07 10:08:00 +08:00 |
James Chen
|
5d5712178a
|
Merge pull request #3383 from dumganhar/develop
[ci skip]Updating bindings-generator to the latest version.
|
2013-08-06 19:03:14 -07:00 |
James Chen
|
710b895aaa
|
Updating bindings-generator to the latest version.
|
2013-08-07 10:02:20 +08:00 |
minggo
|
04ed8557d5
|
Merge pull request #3382 from ricardoquesada/improved_readme
Improved README.md
|
2013-08-06 19:00:56 -07:00 |
godyZ
|
27baf5b961
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-08-07 09:32:42 +08:00 |
Ricardo Quesada
|
6a8e5fe25a
|
small change in instructions
|
2013-08-06 15:14:48 -07:00 |
Ricardo Quesada
|
1ef6965260
|
Improved README.md
Renamed README.mdown to READM.md
Added more useful information in the README.md
'create-multi-platform-projects.py' converted to "unix" format.
|
2013-08-06 15:07:42 -07:00 |
carlo morgantini
|
ef919aea91
|
more cleanup
|
2013-08-06 14:37:19 -07:00 |
carlo morgantini
|
fbe615f292
|
remove classes not used anymore
|
2013-08-06 13:49:24 -07:00 |
carlo morgantini
|
16412fc885
|
more cleanup
|
2013-08-06 13:43:29 -07:00 |
James Chen
|
d02b227558
|
Merge pull request #3379 from dumganhar/develop
Resetting JS-Test, It was modified in https://github.com/cocos2d/cocos2d-x/pull/3357.
|
2013-08-06 01:28:55 -07:00 |
James Chen
|
989f350e39
|
Resetting JS-Test, It was modified in https://github.com/cocos2d/cocos2d-x/pull/3357.
|
2013-08-06 16:27:40 +08:00 |
boyu0
|
eb989db3de
|
issue #2345: fix some coding style
|
2013-08-06 16:14:36 +08:00 |
godyZ
|
02419ccb00
|
update s3tc #3 ,android test
|
2013-08-06 15:33:38 +08:00 |
James Chen
|
b3bfe2401a
|
Merge pull request #3378 from pyrasis/tizen_2.2
[Tizen] fix acceleration wrong coordinates.
|
2013-08-06 00:17:25 -07:00 |
Lee, Jae-Hong
|
5cc906f798
|
[Tizen] fix acceleration wrong coordinates.
|
2013-08-06 16:10:13 +09:00 |
James Chen
|
a5067f63dd
|
Merge pull request #3372 from pyrasis/tizen_2.2
[Tizen] Fix Debug Settings
|
2013-08-05 22:51:06 -07:00 |
Lee, Jae-Hong
|
1acfca45b2
|
[Tizen] CC_ENABLE_CHIPMUNK_INTEGRATION=1
|
2013-08-06 14:42:53 +09:00 |
boyu0
|
dc6503f7d4
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage
|
2013-08-06 13:37:38 +08:00 |