Walzer
|
62b52b37be
|
Merge remote branch 'origin/master'
|
2011-07-13 16:13:20 +08:00 |
Walzer
|
1b1fd7446c
|
[maramalade] add new test cases (bugs, DirectorTests) into test.mkb. Both HelloWorld & Tests are tested on marmalade
|
2011-07-13 16:00:22 +08:00 |
minggo
|
692d8450c2
|
Merge pull request #397 from minggo/master
fix a bug of orientation
|
2011-07-13 00:36:52 -07:00 |
minggo
|
a26fb13604
|
fix a bug of orientation
|
2011-07-13 15:32:03 +08:00 |
natural-law
|
9755ff59aa
|
When click the "BACK" button in test case Bug-899. The button "MainMenu" is not visible if the device support retina.
|
2011-07-13 14:37:06 +08:00 |
minggo
|
d5850224e4
|
[win32] modify configuration of vs2101 release version
|
2011-07-13 12:05:02 +08:00 |
minggo
|
fcb2006fdc
|
Merge pull request #392 from natural-law/master
fixed #599
|
2011-07-12 03:10:27 -07:00 |
minggo
|
faa1c8ee16
|
Merge pull request #393 from minggo/master
[win32] modify for vs2010
|
2011-07-12 03:09:44 -07:00 |
minggo
|
760ec3201e
|
[win32] modify for vs2010
|
2011-07-12 18:05:44 +08:00 |
natural-law
|
7b10874d5e
|
The menu of BugsTest position is wrong when exit one bug test.
|
2011-07-12 18:02:40 +08:00 |
natural-law
|
d4e575c4b2
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-12 17:47:24 +08:00 |
natural-law
|
e6bc8d7c98
|
fixed #599, Resolve the wrong orientation when exit the TouchesTest.
|
2011-07-12 17:46:57 +08:00 |
liswei
|
21ce679992
|
resolve the effect of PageTransitionForward&PageTransitionBackward ,via to add setDepthTest.
|
2011-07-12 17:35:15 +08:00 |
natural-law
|
e8ac968b3b
|
Add the resource files to the ios project which used by BugsTest. And clean a warning in TileMapTest.cpp.
|
2011-07-12 15:56:42 +08:00 |
natural-law
|
8b5282a0cf
|
fixed #603, The test case TMXGIDObjectsTest in TileMapTest not crash any more.
|
2011-07-12 14:21:29 +08:00 |
minggo
|
d48c3fdfb1
|
upgrade to 1.0.0-final 07-11
|
2011-07-12 11:20:41 +08:00 |
natural-law
|
58733417e0
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-11 15:17:24 +08:00 |
natural-law
|
fcbe0443be
|
Resolve a bug in ZipUtils.cpp. And modify the Makefile of tests on wophone.
|
2011-07-11 15:16:29 +08:00 |
minggo
|
21b1af5f1c
|
Merge pull request #377 from minggo/master
[Android] break string & wrap word
|
2011-07-11 00:09:43 -07:00 |
minggo
|
fb436a6339
|
[Android] break string & wrap word
|
2011-07-11 15:02:41 +08:00 |
Walzer
|
28bf48f665
|
issue #569 #601, fix ChipmunkTest/Sensors crash after update to Chipmunk v5.3.5
|
2011-07-11 11:21:11 +08:00 |
Walzer
|
aa12ea838e
|
Merge remote branch 'origin/master'
|
2011-07-11 10:34:47 +08:00 |
Walzer
|
63ffc574d7
|
fixed #601, update Chipmunk from 5.3.4 to 5.3.5. Only tested on iOS now.
|
2011-07-11 10:34:03 +08:00 |
natural-law
|
7bc3983f04
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-11 10:12:07 +08:00 |
natural-law
|
36474b2131
|
Add DirectorTest and BugsTest on wophone.
|
2011-07-11 10:11:40 +08:00 |
Walzer
|
4e12ba3015
|
Merge pull request #374 from axmx/master
[airplay] fix - it solves the problems related to incorrect memory allocation..
|
2011-07-10 00:44:30 -07:00 |
Max Aksenov
|
7f07574630
|
[airplay] fix - if you do not use this "MemFlags0 = USE_STACK_ALLOCATOR" then it solves the problems related to incorrect memory allocation ... I tested it on Marmalade Mac Simulator and IPad device. Not tested on Maramlade Windows Simulator....
|
2011-07-09 13:05:22 -07:00 |
minggo
|
2066cebd08
|
Merge pull request #371 from natural-law/master
Add DirectorTest and BugsTest on android.
|
2011-07-08 03:49:30 -07:00 |
minggo
|
487ba5c02d
|
merge confict
|
2011-07-08 18:29:03 +08:00 |
minggo
|
87adeb6f92
|
upgrade xcode3 template
|
2011-07-08 18:24:58 +08:00 |
natural-law
|
1ffa7fbc19
|
Add DirectorTest and BugsTest on android.
|
2011-07-08 18:13:03 +08:00 |
Walzer
|
e39fca389f
|
Merge remote branch 'origin/master'
|
2011-07-08 18:01:52 +08:00 |
Walzer
|
944b03df5c
|
issue #599 orientation is wrong in ios tests. Most test cases are ok now, but it still have problem when TouchesTest back to MainMenu.
|
2011-07-08 18:01:28 +08:00 |
natural-law
|
1bdce00740
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
cocos2dx/include/ccConfig.h
|
2011-07-08 17:08:57 +08:00 |
minggo
|
6c37f42414
|
Merge pull request #368 from minggo/master
fixed #586
|
2011-07-08 01:46:54 -07:00 |
minggo
|
4e5306a46b
|
fixed #596
|
2011-07-08 16:27:13 +08:00 |
natural-law
|
cba538d5d0
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-08 15:58:14 +08:00 |
natural-law
|
602c5f1894
|
fixed #595
|
2011-07-08 15:57:46 +08:00 |
Walzer
|
5c8b04bc25
|
fixed #585
|
2011-07-08 14:48:25 +08:00 |
Walzer
|
08b26402d5
|
fixed #594, but find a new bug #597
|
2011-07-08 14:27:37 +08:00 |
natural-law
|
0cb3b0ce06
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-08 11:23:03 +08:00 |
natural-law
|
ca4281904a
|
fixed #574, Add bugs test case.
|
2011-07-08 11:22:35 +08:00 |
minggo
|
b08788d810
|
change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*
|
2011-07-07 15:41:42 +08:00 |
minggo
|
8ca8f4d9bc
|
fixed #569: change the free sequence to avoid bug
|
2011-07-07 15:20:13 +08:00 |
natural-law
|
26513d6b7e
|
issue #574, Add DirectorTest for win32.
|
2011-07-07 14:55:11 +08:00 |
minggo
|
211878dc44
|
add animation
|
2011-07-07 10:24:01 +08:00 |
minggo
|
ff50997eb0
|
issue #574
|
2011-07-06 14:56:05 +08:00 |
Walzer
|
80c819d8b6
|
Merge remote branch 'origin/master'
|
2011-07-04 16:25:29 +08:00 |
Walzer
|
d325f1991e
|
[ios] 1. debug builds can run on device (add “Valid Architectures") 2. add correct header search paths for HelloLua release build
|
2011-07-04 16:25:11 +08:00 |
natural-law
|
7d7f3a9241
|
fixed #562, Upgrade folder sprite_nodes to rc3.
|
2011-07-01 16:11:31 +08:00 |
natural-law
|
4d5dab4a40
|
fixed #558, Upgrade folder layers_scenes_transitions_nodes to rc3.
|
2011-07-01 11:26:26 +08:00 |
minggo
|
25b3b15151
|
Merge pull request #339 from minggo/iss549
[Android] fixed #549: Add comments for playEffect()
|
2011-06-30 18:28:08 -07:00 |
minggo
|
67b85322ed
|
[Android] fixed #549: Add comments for playEffect()
|
2011-07-01 09:24:40 +08:00 |
minggo
|
12f816687d
|
Merge pull request #336 from liswei/master
update wophone setup project (such as helloworld,tests)
|
2011-06-29 20:08:01 -07:00 |
minggo
|
2a39fe0aa4
|
Merge pull request #335 from minggo/iss547
[Android] fixed #547: line wrap OK on Android
|
2011-06-29 19:46:25 -07:00 |
liswei
|
39fb944297
|
update wophone setup project (such as helloworld,tests)
|
2011-06-30 09:36:51 +08:00 |
minggo
|
6c47f53b13
|
[Android] fixed #547: line wrap OK on Android
|
2011-06-29 15:45:30 +08:00 |
liswei
|
b23409a942
|
fixed #545 [Wophone] The effect of ChipmunkTest is wrong.
reset glOrthof param value in wophone
|
2011-06-29 15:24:04 +08:00 |
minggo
|
e8853583df
|
Merge pull request #329 from minggo/master
Fix some bug
|
2011-06-27 18:23:26 -07:00 |
minggo
|
7099b24ccb
|
Merge pull request #326 from liswei/issue521
issue #521 set depthtest value for true ,then set depthtest value for false
|
2011-06-27 18:20:10 -07:00 |
yangws
|
3b6265aa58
|
Compile ok on vs2010
|
2011-06-27 17:02:58 +08:00 |
minggo
|
5e15545dbd
|
[Android] fix an error when string is
|
2011-06-27 16:01:25 +08:00 |
liswei
|
bb59728543
|
issue #521 set depthtest value for true ,then set depthtest value for false
|
2011-06-27 15:34:26 +08:00 |
minggo
|
686b9ae179
|
fix the test title
|
2011-06-27 15:22:55 +08:00 |
natural-law
|
72f17ecbdf
|
fixed #542, Record the volume user specified though the background music is not playing.
|
2011-06-27 11:43:27 +08:00 |
Walzer
|
688131c958
|
[android] in main.cpp, change view->create(320,480) to (480,320) to fit the lastest modification, in both HelloWorld, HelloLua, Tests
|
2011-06-25 12:11:40 +08:00 |
Walzer
|
00568c229a
|
[android] back to shared library link
|
2011-06-25 11:21:16 +08:00 |
minggo
|
8440d6a267
|
[android] fixed #364: show string correct & line break ok
|
2011-06-24 13:55:00 +08:00 |
minggo
|
10cdd7f798
|
[android] fixed #364: line break ok on Android
|
2011-06-23 14:44:20 +08:00 |
minggo
|
71c13b34bf
|
Merge https://github.com/cocos2d/cocos2d-x into iss535
|
2011-06-22 17:00:11 +08:00 |
minggo
|
1122a7c7d0
|
[android] use Android widget Bitmap other than skia to drawstring
|
2011-06-22 16:58:50 +08:00 |
Walzer
|
96996d4d52
|
Merge pull request #311 from yangws/master
Sync java code in Helloworld and tests and Add icon for Helloworld and tests on Android..
|
2011-06-22 01:11:49 -07:00 |
Walzer
|
1485a35338
|
update tests.xcodeproject to add lua support in cocos2dx lib. I finished it in xcode4 but don't know if this xcodeproject file will work on xcode4
|
2011-06-22 15:36:53 +08:00 |
yangws
|
01f277674e
|
Add icon for Helloworld and tests on Android.
|
2011-06-22 13:59:31 +08:00 |
yangws
|
4d8596169e
|
Sync java code in Helloworld and tests.
|
2011-06-22 11:37:42 +08:00 |
minggo
|
022e2b9998
|
issue #528: refactor ok on win32
|
2011-06-20 17:31:38 +08:00 |
minggo
|
25de09e34b
|
lua support ok on win32
|
2011-06-15 15:50:16 +08:00 |
minggo
|
8003de7468
|
update to latest code and merge
|
2011-06-14 11:01:38 +08:00 |
Walzer
|
f600846d4b
|
Merge http://github.com/flyingpacer/cocos2d-x, resolve conflicts in cocos2dx/CCScheduler.cpp
|
2011-06-08 11:08:29 +08:00 |
RongHong
|
67eb87abfe
|
To fix the crash when the gles version is too low
|
2011-06-08 10:02:07 +08:00 |
RongHong
|
a13e8ae859
|
1.修正gles版本过低时会崩溃的问题
2.修正unscheduleAllSelectors()中遍历哈希表导致崩溃的问题
|
2011-06-03 15:22:50 +08:00 |
liswei
|
49410a2a07
|
Merge branch 'XXX'
|
2011-06-03 10:52:19 +08:00 |
liswei
|
54780b8cb7
|
fixed #521, Fix the effect of PageTurn3D.
|
2011-06-03 10:51:21 +08:00 |
minggo
|
83e1e0ebd1
|
tests run ok when it don't enable lua
|
2011-06-01 20:29:05 +08:00 |
minggo
|
a8b6b850de
|
use precompile macro to cantrol if enable lua support
|
2011-06-01 17:51:08 +08:00 |
yangws
|
7e2d1d5c48
|
fixed #490 Text input on android use a different way, TextInputTest OK now.
|
2011-05-30 16:36:12 +08:00 |
Walzer
|
58a63f7ec0
|
[airplay] following MaxAksenov's suggestion, I set HelloWorld & Tests to landscape as default. Users had to rotate the simulator in airplay's surface configuration.
|
2011-05-30 14:14:19 +08:00 |
Walzer
|
11c401e3ea
|
[ios] setDepthTest(false) for EffectsTest
|
2011-05-26 21:01:16 +08:00 |
Walzer
|
bf95e4e7a5
|
Merge pull request #286 from natural-law/master
[android] fixed #510
|
2011-05-26 01:39:11 -07:00 |
natural-law
|
7e716f9d80
|
[android] fixed #510, Delete the onDestroy method override in TestsDemo.java
|
2011-05-26 16:34:10 +08:00 |
yangws
|
476d86283f
|
Remove unnecessary code for digit in Cocos2dxGLSurfaceView.java.
|
2011-05-26 14:35:44 +08:00 |
minggo
|
dfbb0096e8
|
Merge pull request #283 from natural-law/master
Compile tests OK on wophone.
|
2011-05-24 18:45:18 -07:00 |
natural-law
|
8ab7057fe6
|
Resolve the memory leak of tests.
|
2011-05-24 18:00:59 +08:00 |
natural-law
|
f89a93fcf8
|
Compile tests OK on wophone.
|
2011-05-24 17:52:24 +08:00 |
yangws
|
c757dd4aeb
|
fixed #503 new chipmunk code compiled ok on vs2010.
|
2011-05-24 16:18:47 +08:00 |
yangws
|
d93a2f046e
|
android can input number form soft keyboard.
|
2011-05-23 16:30:45 +08:00 |
yangws
|
ec23d7ed55
|
fixed #508 Dynamic switch retina display support.
|
2011-05-23 16:21:31 +08:00 |
yangws
|
533949a736
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-05-23 10:11:13 +08:00 |
Walzer
|
6b24b6fb8d
|
issue #503, i forget to add chipmunk_private.h into xcodeproj
|
2011-05-21 21:35:05 +08:00 |
Walzer
|
e8835ee4c2
|
issue #503, add chipmunk new files into win32 vcproj
|
2011-05-21 17:10:29 +08:00 |