James Chen
|
2ec34d6011
|
Update AUTHORS
|
2012-12-06 10:30:46 +08:00 |
James Chen
|
c1eded787a
|
Merge pull request #1724 from FlowerpotGames/gles20
fixed #1599: CCScrollView and CCTableView updates.
|
2012-12-05 18:28:30 -08:00 |
minggo
|
6bf52b22b8
|
Update AUTHORS
|
2012-12-06 09:41:23 +08:00 |
minggo
|
cfd6e6c82a
|
Merge pull request #1726 from fape/hungarian_language_support
Add Hungarian language support
|
2012-12-05 17:39:46 -08:00 |
Ed Bartley
|
73239a07e0
|
* Fixed improper behavior of horizontally scrolling ScrollView
|
2012-12-05 09:55:06 -05:00 |
fape
|
e488361e3b
|
cosmetics: fix formating
|
2012-12-05 11:43:04 +01:00 |
fape
|
320d532e15
|
add Hungarian language support
|
2012-12-05 11:31:05 +01:00 |
minggo
|
d858ce2fe2
|
some android devices can not compile this frag
|
2012-12-05 17:15:47 +08:00 |
minggo
|
c620b0f5bf
|
Update AUTHORS
|
2012-12-05 14:45:06 +08:00 |
minggo
|
99781368c4
|
Merge pull request #1677 from chenium/gles20
Fix for CCRenderTexture on Android sleep/resume
|
2012-12-04 22:40:00 -08:00 |
minggo
|
c3a5e870af
|
Merge pull request #1725 from minggo/merge_jp_support
Merge jp support
|
2012-12-04 22:11:42 -08:00 |
minggo
|
a256d35a5b
|
fix some confilcs
|
2012-12-05 14:01:05 +08:00 |
minggo
|
75d7df5bcf
|
Merge pull request #1684 from lvklabs/gles20-for-pull
Added removeAllObjects() to CCSet
|
2012-12-04 20:05:56 -08:00 |
Ed Bartley
|
3ed97165a5
|
* Add documentation to CCTableViewDelegate methods.
|
2012-12-04 15:46:27 -05:00 |
Ed Bartley
|
9f04817235
|
* CCScrollView did not scroll correctly if the container items do not fill the ScrollView. The issue can be observed by modifying TableViewTestLayer::numberOfCellsInTableView(…) in the ExtensionsTest/TableViewTest project from 20 cells to 2 cells.
|
2012-12-04 15:32:13 -05:00 |
James Chen
|
7ed5b4a58f
|
Merge pull request #1723 from dumganhar/gles20
[Marmalade fix] Added development.icf for HelloCpp. Added Marker Felt.ttf for SampleGame.
|
2012-12-04 06:00:26 -08:00 |
James Chen
|
bd471b7ee9
|
[Marmalade fix] Added development.icf for HelloCpp. Added Marker Felt.ttf for SampleGame.
|
2012-12-04 21:54:19 +08:00 |
James Chen
|
938b2d54e0
|
Merge pull request #1722 from dumganhar/gles20
Updated samples/MoonWarriors/proj.android/build_native.sh. Because the boot file has been changed from MoonWarriors-native.js to MoonWarriors-jsb.js.
|
2012-12-04 04:09:16 -08:00 |
James Chen
|
d02cb3f320
|
Updated samples/MoonWarriors/proj.android/build_native.sh. Because the boot file has been changed from MoonWarriors-native.js to MoonWarriors-jsb.js.
|
2012-12-04 20:07:23 +08:00 |
minggo
|
646a513424
|
Merge pull request #1721 from minggo/gles20
do some bug fixes
|
2012-12-04 02:45:48 -08:00 |
minggo
|
58a187f774
|
do some bug fixes
|
2012-12-04 18:44:32 +08:00 |
James Chen
|
9617d5cba3
|
Merge pull request #1720 from dumganhar/gles20
fixed missing level.js for WatermelonWithMe.
|
2012-12-04 01:47:34 -08:00 |
James Chen
|
eed78507bf
|
fixed missing level.js for WatermelonWithMe.
|
2012-12-04 17:46:51 +08:00 |
James Chen
|
049c6b4699
|
Merge pull request #1719 from dumganhar/gles20
fixed missing main.js for CocosDragonJS.
|
2012-12-04 01:39:13 -08:00 |
James Chen
|
060698e195
|
fixed missing main.js for CocosDragonJS.
|
2012-12-04 17:38:15 +08:00 |
minggo
|
4ad979eae7
|
Merge pull request #1718 from minggo/gles20
do some modification
|
2012-12-04 01:26:59 -08:00 |
minggo
|
cb2427e780
|
do some modification
|
2012-12-04 17:25:40 +08:00 |
James Chen
|
df87c0717d
|
Merge pull request #1717 from dumganhar/gles20
Commented JS_SetGCZeal.
|
2012-12-04 01:24:02 -08:00 |
James Chen
|
34eb3a88c2
|
Commented JS_SetGCZeal.
|
2012-12-04 17:23:08 +08:00 |
minggo
|
2e2f9a8edd
|
Merge pull request #1716 from minggo/gles20
update version in doxygen configuration
|
2012-12-04 00:51:11 -08:00 |
James Chen
|
5408f3d947
|
Merge pull request #1715 from dumganhar/gles20
Fixed some issues for linux port.
|
2012-12-04 00:51:03 -08:00 |
minggo
|
afec056ab3
|
update version in doxygen configuration
|
2012-12-04 16:50:14 +08:00 |
James Chen
|
3e88f8d2e4
|
fix compilation errors in eclipse project for linux.
|
2012-12-04 16:48:23 +08:00 |
James Chen
|
8a8038b342
|
Enable stencil buffer for linux.
|
2012-12-04 16:48:23 +08:00 |
James Chen
|
6aa15e0636
|
Added -DCOCOS2D_DEBUG=1 for linux if building in debug mode.
|
2012-12-04 16:48:23 +08:00 |
James Chen
|
cedd58bb77
|
#extension GL_OES_standard_derivatives : enable only valid in GL_ES, this fixes crashes on some Linux machines.
|
2012-12-04 16:47:57 +08:00 |
minggo
|
21d01ae5c0
|
Merge pull request #1714 from minggo/gles20
Do some changes before releasing
|
2012-12-04 00:26:37 -08:00 |
minggo
|
9691886582
|
make TestLua work ok on iOS
|
2012-12-04 16:03:27 +08:00 |
minggo
|
98e0123731
|
add icons for WatermelonWithMe and CocosDragon
|
2012-12-04 15:54:03 +08:00 |
James Chen
|
b2581ff456
|
Merge pull request #1713 from dumganhar/gles20
Reverted chipmunk_types.h
|
2012-12-03 22:48:16 -08:00 |
James Chen
|
ba3a183856
|
Reverted chipmunk_types.h
|
2012-12-04 14:46:10 +08:00 |
minggo
|
e6c55f6cfb
|
Merge pull request #1712 from minggo/gles20
update CHANGELOG
|
2012-12-03 22:45:40 -08:00 |
minggo
|
b961f2a439
|
update CHANGELOG
|
2012-12-04 14:44:11 +08:00 |
James Chen
|
574b979571
|
Merge pull request #1711 from dumganhar/gles20
Removed libExtensions dependence for win32 template.
|
2012-12-03 22:29:51 -08:00 |
James Chen
|
77ad17bbd1
|
Removed libExtensions dependence for win32 template.
|
2012-12-04 14:29:05 +08:00 |
James Chen
|
b521327572
|
Merge pull request #1710 from dumganhar/gles20
Updated build-win32.bat and win32 template.
|
2012-12-03 22:10:13 -08:00 |
James Chen
|
dbeb85fa5d
|
Updated build-win32.bat and win32 template.
|
2012-12-04 14:09:19 +08:00 |
minggo
|
f8277f50c1
|
Merge pull request #1709 from minggo/gles20
update cocos2d-js-tests to up-stream
|
2012-12-03 22:02:32 -08:00 |
minggo
|
f4656ad00f
|
update cocos2d-js-tests to up-stream
|
2012-12-04 14:00:29 +08:00 |
minggo
|
c62aa37413
|
Merge pull request #1708 from minggo/gles20
modify js-binding related samples according the modification of cocos2d-js-tests
|
2012-12-03 20:09:53 -08:00 |