godyZ
|
0f007d2bd9
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-08-07 10:58:13 +08:00 |
samuele3hu
|
1175f2034a
|
Merge branch 'iss2433-lua-bindings-generator' of git://github.com/dumganhar/cocos2d-x into iss2433-lua-bindings-generator
|
2013-08-07 10:39:07 +08:00 |
samuele3hu
|
200c5de83f
|
issue #2433:lua binding generator
|
2013-08-07 10:37:20 +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 |
James Chen
|
0c4910ee95
|
Adding tools/tolua .
|
2013-08-07 10:12:45 +08: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 |
godyZ
|
195536097f
|
update s3tc #2
|
2013-08-06 11:52:48 +08:00 |
boyu0
|
d51db25a6f
|
issue #2345: delete the linux png libraries.
|
2013-08-06 11:41:03 +08:00 |
boyu0
|
94f9921d5e
|
issue #2345: edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D
|
2013-08-06 11:34:48 +08:00 |
godyZ
|
fd7b00681f
|
update s3tc#1
|
2013-08-06 11:19:45 +08:00 |
folecr
|
3176dddc83
|
Update Android JSON config files and project creation script
|
2013-08-05 19:29:08 -07:00 |
folecr
|
5295b85d8e
|
Update templates for Android
|
2013-08-05 19:14:47 -07:00 |
minggo
|
3c18151981
|
Merge pull request #3357 from folecr/android_redesign
Simpler, more modern Android port of cocos2d-x
|
2013-08-05 18:55:49 -07:00 |
James Chen
|
81fc0069cc
|
Updating travis-script/run-script.sh, don't build template projects for android.
|
2013-08-06 09:54:23 +08:00 |
carlo morgantini
|
66c5721fc7
|
clean up
|
2013-08-05 18:03:52 -07:00 |
carlo morgantini
|
c7c0b0e07a
|
more cleanup
|
2013-08-05 17:49:20 -07:00 |
carlo morgantini
|
eeffc76bb8
|
more cleanup
|
2013-08-05 16:52:24 -07:00 |
folecr
|
1721e90e3d
|
Update TestLua
|
2013-08-05 16:41:34 -07:00 |
folecr
|
07917429a0
|
Update HelloLua
|
2013-08-05 16:41:30 -07:00 |
carlo morgantini
|
a1168512f6
|
cleanup
|
2013-08-05 16:41:23 -07:00 |
carlo morgantini
|
03b1c0142b
|
refactoring
|
2013-08-05 16:35:15 -07:00 |
carlo morgantini
|
d1915d47cc
|
some more refactoring and cleaning up
|
2013-08-05 15:56:18 -07:00 |
carlo morgantini
|
b14f9f83e9
|
New label stuff cleanup and re factoring
|
2013-08-05 15:11:07 -07:00 |
Lee, Jae-Hong
|
3db495ab0e
|
[Tizen] Fix Debug Settings.
- fix debugging failure problem
|
2013-08-06 01:26:56 +09:00 |
James Chen
|
77a9c91b3d
|
We has to pass the target to bindings-generator since we have add lua target.
|
2013-08-05 18:33:13 +08:00 |
James Chen
|
ec49e7568f
|
Updating bindings-generator, adding lua target. It's not finished.
|
2013-08-05 18:31:20 +08:00 |
James Chen
|
904f85e0a8
|
Adding tools/tolua .
|
2013-08-05 18:30:36 +08:00 |
folecr
|
bf6b57fe19
|
Changes to match reverting of namespace simplegame for this sample
|
2013-08-05 02:05:48 -07:00 |