minggo
|
f38629fbfc
|
Merge pull request #1109 from NatWeiss/addmac4
Adding Mac support!
|
2012-07-22 19:48:52 -07:00 |
James Chen
|
27ee691132
|
Merge branch 'gles20-adjust-structure' of https://github.com/cocos2d/cocos2d-x into iss1399
|
2012-07-23 10:35:23 +08:00 |
minggo
|
59045d39a4
|
Merge pull request #1100 from yasithv/patch-1
CCControlSlider: re-assigning of texture rect to consider SpriteFrame orientation
|
2012-07-22 19:34:54 -07:00 |
James Chen
|
c171f24d8e
|
issue #1399: Updated win32 template.
|
2012-07-23 10:31:26 +08:00 |
Nat Weiss
|
fcfea04bbc
|
iPad detection is now where it belongs in CCApplication.
|
2012-07-21 11:46:42 -07:00 |
Nat Weiss
|
a4760698ca
|
Determines whether to use iPad graphics statically, so if the window is resized the graphics loaded are consistent.
|
2012-07-21 11:35:28 -07:00 |
Nat Weiss
|
dc7ce1cd0f
|
Improved mac file utils and event responsiveness.
|
2012-07-21 02:19:03 -07:00 |
James Chen
|
afa5636994
|
Merge branch 'gles20-adjust-structure' of https://github.com/cocos2d/cocos2d-x into iss1399
|
2012-07-21 13:52:35 +08:00 |
James Chen
|
5e5b008742
|
issue #1399: Built four android projects(HelloCpp, HelloLua, TestJavascript, TestCpp) successfully on Ubuntu System.
|
2012-07-21 13:49:20 +08:00 |
Nat Weiss
|
d4b6d1262b
|
Adding Mac support!
|
2012-07-20 21:23:40 -07:00 |
minggo
|
cf685cc747
|
issue #1399:add execute permission for build_native.sh
|
2012-07-21 10:25:16 +08:00 |
James Chen
|
b2b0a0c3d5
|
Updated ios project settings and updated some files in CCBReader folder.
|
2012-07-20 18:02:18 +08:00 |
James Chen
|
755b29cb9d
|
Updated ios project settings.
|
2012-07-20 17:38:21 +08:00 |
James Chen
|
5b6497b0e4
|
Updated test_actions.js. 'new cc.Sprite.create' --> 'cc.Sprite.create'.
|
2012-07-20 17:12:17 +08:00 |
James Chen
|
557f654cf3
|
Built successfully on android.
|
2012-07-20 17:06:00 +08:00 |
James Chen
|
77f1fba566
|
issue #1399: Adjust folder structure, made it built successfully on win32.
|
2012-07-20 14:05:52 +08:00 |
James Chen
|
059fefba68
|
Merge branch 'iss1399_adjust_structure' of https://github.com/minggo/cocos2d-x into iss1399
|
2012-07-19 20:42:30 +08:00 |
minggo
|
7467d254d4
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399_adjust_structure
|
2012-07-19 17:26:39 +08:00 |
minggo
|
f9c40f7372
|
issue #1399: work ok on iOS after adjusting directory structure
|
2012-07-19 17:22:36 +08:00 |
James Chen
|
fe13388de4
|
Merge pull request #1102 from nicolasgramlich/patch-2
LUA: Fixed isSingleRefrence->isSingleReference typo.
|
2012-07-17 20:38:14 -07:00 |
Nicolas Gramlich
|
b76b5710c4
|
LUA: Fixed isSingleRefrence->isSingleReference typo.
|
2012-07-17 20:33:44 -07:00 |
Yasith Vidanaarachchi
|
59a3bd1a9a
|
Fix the re-assigning of texture rectangle to consider sprite frame's orientation.
If the progress sprite is vertical, in the sprite sheet it's rendered incorrectly without this fix.
|
2012-07-17 15:56:58 -03:00 |
James Chen
|
a7eeda52b5
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-07-17 13:38:14 +08:00 |
minggo
|
6819862d35
|
Merge pull request #1099 from minggo/iss1393_fps
add fps_images-hd.png and fps_images-ipadhd.png into plist info
|
2012-07-15 19:41:21 -07:00 |
minggo
|
6b1ee71517
|
fixed #1393: add fps_images-hd.png and fps_images-ipadhd.png into plist info
|
2012-07-16 10:30:55 +08:00 |
Walzer
|
5bec3b3ac3
|
CCTextureCache.cpp:L532, tex -> texture
|
2012-07-14 23:44:56 +08:00 |
Walzer
|
1fd0fd7967
|
Merge pull request #1098 from walzer/gles20
consistent the variable name in different functions.
|
2012-07-14 00:30:15 -07:00 |
Walzer
|
a46c53421c
|
consistent the variable name in different functions.
|
2012-07-14 15:21:42 +08:00 |
Walzer
|
3ea9874e2f
|
Merge pull request #1097 from walzer/gles20
fixed #1095 on github issue, which is issue #1395 in cocos2d-x issue system
|
2012-07-14 00:08:56 -07:00 |
Walzer
|
e6ae45e1b2
|
fixed issue #1395, which was reported at https://github.com/cocos2d/cocos2d-x/issues/1095
|
2012-07-14 15:06:11 +08:00 |
Walzer
|
5f64e4c167
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-07-14 14:52:15 +08:00 |
Walzer
|
2d28c02fcf
|
Merge pull request #1096 from lvallejo/gles20
Fixed Spelling CCObject::isSingleRefrence to CCObject::isSingleReference
|
2012-07-13 19:48:13 -07:00 |
Luis Vallejo
|
c9408b7b75
|
Fixed Spelling Error CCObject::isSingleRefrence to CCObject::isSingleReference
|
2012-07-14 09:56:07 +08:00 |
minggo
|
fd04f2024b
|
Merge pull request #1094 from NatWeiss/fixxcode42
Fixes a compilation error for Xcode 4.2
|
2012-07-10 21:08:32 -07:00 |
Nat Weiss
|
d77d10a974
|
Fixes a compilation error for Xcode 4.2 and still maintains compatibility with Xcode 4.5.
|
2012-07-10 21:01:32 -07:00 |
James Chen
|
5c19237126
|
Merge pull request #1092 from mustime/bug1381
fixed #1381: fixed different declaration on CCLayerColor::setContentSize
|
2012-07-09 18:36:20 -07:00 |
mustime
|
50289655a5
|
fixed #1381: fixed different declaration on CCLayerColor::setContentSize
|
2012-07-10 09:13:49 +08:00 |
James Chen
|
502982fda7
|
Merge pull request #1091 from NatWeiss/fixwin32il
fixed #1390: Fixes Win32 error "The application failed to initalize properly".
|
2012-07-09 01:37:20 -07:00 |
minggo
|
37f535c95d
|
Merge pull request #1090 from mustime/bug1379
fixed #1379: Fixed typing error in CCNode.cpp line74
|
2012-07-09 00:00:09 -07:00 |
Nat Weiss
|
ee12785c6a
|
Fixes Win32 error "The application failed to initalize properly 0xc000000d"
|
2012-07-08 23:54:29 -07:00 |
mustime
|
e289ce628c
|
fixed #1379: Fixed typing error in CCNode.cpp line74
|
2012-07-09 14:45:04 +08:00 |
minggo
|
27a6182055
|
Merge pull request #1089 from NatWeiss/fixxcode45
fixed #1389: Fixes a few Xcode 4.5-specific error messages.
|
2012-07-08 23:04:41 -07:00 |
Nat Weiss
|
43d40bd5a0
|
Fixes a few Xcode 4.5-specific error messages.
|
2012-07-08 22:37:19 -07:00 |
James Chen
|
cc718ea406
|
Merge pull request #1087 from ngocdaothanh/patch-4
fixed #1372: Fix compilation error: platform/android/CCEGLView.h:30.
|
2012-07-08 18:57:16 -07:00 |
minggo
|
006e879665
|
Merge pull request #1082 from simdm/gles20
fixed #1384 cocosbuilder , error when loading CCControlButton from ccbi
|
2012-07-05 20:27:37 -07:00 |
Ngoc Dao
|
14a23ced56
|
Fix compilation error: platform/android/CCEGLView.h:30:39: error: platform/CCPlatFormMacros.h: No such file or directory
|
2012-07-06 10:32:54 +09:00 |
simdm
|
d3d42f12c4
|
fixed #1081 cocosbuilder , error when loading CCControlButton from ccbi
|
2012-07-05 00:49:51 +08:00 |
James Chen
|
b14627b6ae
|
Merge pull request #1077 from dumganhar/gles20
fixed #1371: Particle crashes if setAutoRemoveOnFinish(true).
|
2012-07-01 06:20:29 -07:00 |
James Chen
|
fa1f8fe8f6
|
fixed #1371: Particle crashes if setAutoRemoveOnFinish(true).
Scheduler: removeUpdateFromHash calls [target release] at the very end to prevent a possible crash.
|
2012-07-01 21:17:44 +08:00 |
James Chen
|
427845e2e7
|
Merge pull request #1075 from dumganhar/gles20
Renamed namespace 'cocos' to 'cc' in javascript bindings.
|
2012-06-29 00:51:23 -07:00 |