Walzer
|
d2cfdf1d2f
|
change Network to Network-rename
|
2012-08-09 11:43:08 +08:00 |
Walzer
|
7863375cf8
|
issue #1424, http wrapper compiled pass on linux
|
2012-08-09 11:15:06 +08:00 |
James Chen
|
af1b58bea6
|
Merge branch 'iss1405_multi_resolution' of https://github.com/minggo/cocos2d-x into minggo_res
|
2012-08-09 10:53:14 +08:00 |
Walzer
|
08198c082e
|
issue #1424, http wrapper has been tested on iOS, mac, android port.
|
2012-08-09 10:45:11 +08:00 |
minggo
|
c34812567f
|
issue #1405: modify macro names and comment and add getVisibleSize and getVisibleOrigin in CCDirector
|
2012-08-09 10:23:39 +08:00 |
minggo
|
cc39dc55f4
|
issue #1405:remove unneeded functions of CCFileUtils
|
2012-08-08 18:39:33 +08:00 |
minggo
|
3395bba327
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution
|
2012-08-08 17:42:45 +08:00 |
minggo
|
3853611e62
|
issue #1405:support loading resources from directory defined by developer
|
2012-08-08 17:42:04 +08:00 |
Walzer
|
9ee50bb59a
|
issue #1424, add doxygen comments, use httpbin.org interfaces in GET/POST before setting up our website.
|
2012-08-08 12:05:02 +08:00 |
Walzer
|
b094f70ab3
|
issue #1424, http-get works ok. Tomorrow I will focus on post.
|
2012-08-07 18:28:07 +08:00 |
minggo
|
f6115d5667
|
issue #1405:zoom out work ok
|
2012-08-07 18:24:45 +08:00 |
minggo
|
5d8f909af4
|
issue #1405:multi resolution works ok
|
2012-08-07 14:29:46 +08:00 |
mustime
|
e6e43029e5
|
testlua: modified some pkg files
|
2012-08-06 16:02:49 +08:00 |
Walzer
|
39e45da8d9
|
Merge branch 'gles20' of https://github.com/greathqy/cocos2d-x into network
|
2012-08-06 15:36:13 +08:00 |
qingyun
|
054fe4993c
|
fix CCLog stack overflow
|
2012-08-06 14:47:23 +08:00 |
minggo
|
1b01659221
|
Merge pull request #1158 from John-cdy/gles20
issue #1404:Modify directory structure
|
2012-08-05 23:24:10 -07:00 |
Caidongyang
|
37d84ba6bb
|
issue #1404:Add new files
|
2012-08-06 11:59:37 +08:00 |
Caidongyang
|
3fce97e62e
|
issue #1404:Modify directory structure
|
2012-08-06 11:55:05 +08:00 |
minggo
|
c799bd3c15
|
Merge pull request #1157 from minggo/iss1417_mac
add header search path and add CCTouch.cpp into mac project
|
2012-08-05 20:31:18 -07:00 |
minggo
|
9ccf3cefdf
|
fixed #1417:add header search path and add CCTouch.cpp into mac project
|
2012-08-06 11:08:06 +08:00 |
minggo
|
658f2e78c5
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-08-06 10:44:03 +08:00 |
qingyun
|
b3206737e3
|
add group for CCHttpRequest.h
|
2012-08-04 18:30:05 +08:00 |
qingyun
|
24136dc575
|
add CCHttpRequest and related tests to repository
|
2012-08-04 18:27:27 +08:00 |
qingyun
|
dc35596ce9
|
add greathqy to AUTHORS
|
2012-08-04 18:12:39 +08:00 |
James Chen
|
e9aa3743fa
|
issue #1405: muti-resolution works ok on linux.
|
2012-08-03 13:56:18 +08:00 |
minggo
|
bb0eaaca37
|
Merge pull request #1153 from John-cdy/gles20
issue 1404:Fixed the problem of rootconfig.sh to modify build_native.sh
|
2012-08-02 22:48:10 -07:00 |
James Chen
|
bfb4ebcbc1
|
Merge pull request #1154 from dumganhar/linux_gles20
fixed #1419: Merge gles20 linux port.
|
2012-08-02 20:18:32 -07:00 |
James Chen
|
ed69b62461
|
fixed #1419: Update cocos2d.h.
|
2012-08-03 11:16:34 +08:00 |
James Chen
|
086e63103d
|
fixed #1419: Merge gles20 linux port.
There are still some issues:
1. CocosDeshionTest crash.
2. FontTest result is not correct.
|
2012-08-03 11:07:59 +08:00 |
James Chen
|
848381ef0f
|
Fixed a compile in cocos2d_generated.cpp.
|
2012-08-03 10:44:48 +08:00 |
Caidongyang
|
71ada5b0a5
|
issue 1404:Fixed the problem of rootconfig.sh to modify build_native.sh
|
2012-08-03 10:42:39 +08:00 |
James Chen
|
9c26e38563
|
Merge branch 'gles20' of https://github.com/tongpengfei/cocos2d-x into linux_gles20
|
2012-08-03 10:10:33 +08:00 |
minggo
|
9ea793d0e2
|
Merge pull request #1151 from mustime/bug1284
issue #1284: fixed the problem that if the same effect is played for two times, it will stop and restart
|
2012-08-02 02:07:55 -07:00 |
minggo
|
4af40c670a
|
Merge pull request #1150 from John-cdy/gles20
Issue1404 Modify *.sh files and add xcode4 (debug and release) build scr...
|
2012-08-02 01:59:08 -07:00 |
pengfei tong
|
014d7ea864
|
[LOG] make-all-linux-project.sh add clean
|
2012-08-02 16:34:01 +08:00 |
pengfei tong
|
a37fd743e0
|
[FIX] testjs
|
2012-08-02 16:23:31 +08:00 |
Caidongyang
|
f578fc8a90
|
Issue1404 Modify *.sh files and add xcode4 (debug and release) build scripts,include ios and mac
|
2012-08-02 14:31:07 +08:00 |
mustime
|
6beae122da
|
issue #1284: fixed the problem that if the same effect is played for two
times, it will stop and restart
|
2012-08-02 14:28:40 +08:00 |
pengfei tong
|
c82c8412a8
|
[LOG] fix makefile
|
2012-08-02 13:19:40 +08:00 |
pengfei tong
|
b93d0b5ebf
|
[LOG] add linux port
|
2012-08-02 13:02:59 +08:00 |
minggo
|
5399aac590
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution
|
2012-08-02 10:50:15 +08:00 |
minggo
|
4e5f69fd9e
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-08-02 10:48:59 +08:00 |
minggo
|
60983e8a02
|
Merge pull request #1147 from folecr/morefixandroidbuildscript
Further clean up of android build scripts and template
|
2012-08-01 19:45:18 -07:00 |
minggo
|
d02c620844
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-08-02 10:02:39 +08:00 |
minggo
|
2cbf58c0db
|
Merge pull request #1148 from walzer/geometry-oo
fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float"
|
2012-08-01 18:50:45 -07:00 |
minggo
|
306e5e13f2
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-08-02 09:35:06 +08:00 |
minggo
|
426a52447d
|
issue #1405:correct touch coordinate when enable retina with retina supportted device
|
2012-08-01 18:44:10 +08:00 |
minggo
|
0b2396c54b
|
issue #1405:support three type of resolution
|
2012-08-01 16:56:12 +08:00 |
Walzer
|
cc3d850892
|
fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float"
|
2012-08-01 15:30:12 +08:00 |
folecr
|
868d768156
|
Cleaner template for build_native.sh
* used by projects generated with create-android-project.sh
|
2012-07-31 22:56:18 -07:00 |