Nicolas Gramlich
fea4401681
CCBReader: Named a whole bunch of parameters in the CCNodeLoader headers.
2012-06-18 13:41:48 -07:00
Nicolas Gramlich
227683bfa4
Cleaned up CCNodeLoaders by using the Marco instead of having a boilerplate createCCNode method in all the cpp files.
2012-06-18 13:33:19 -07:00
Nicolas Gramlich
aa83408ba7
Addded virtual destructors to all classes in the CCBReader extension. CCBReader: named some parameters in the header.
2012-06-18 12:03:06 -07:00
Nicolas Gramlich
2f3fed2562
CCNodeLoader: Replaced manual deletes with 'safe' Macros.
2012-06-18 11:43:46 -07:00
minggo
de18bbb103
Merge pull request #1040 from minggo/iss1333_scroll_view
...
Iss1333 scroll view
2012-06-18 04:25:32 -07:00
minggo
6d0608d0f1
fixed #1333 : add CCScrollView for iOS
2012-06-18 19:24:47 +08:00
James Chen
c3653f651a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20-ccbi
2012-06-18 19:02:02 +08:00
James Chen
f346d09449
issue #1333 : Added CCScrollViewLoader. Not implement.
2012-06-18 19:00:26 +08:00
James Chen
579e6a1100
issue #1333 : export CCTouch class.
2012-06-18 18:32:17 +08:00
James Chen
b66be55156
issue #1333 : Use CC_PROPERTY instead of CC_PROPERTY_PASS_BY_REF for m_tContenSize
2012-06-18 18:31:29 +08:00
James Chen
85ff705415
fixed #1333 : added CCScrollView to extension.
2012-06-18 18:30:07 +08:00
minggo
341c9f5fbc
Merge pull request #1037 from minggo/version
...
fixed #1332 : add cocos2d version
2012-06-18 01:17:06 -07:00
minggo
c1f5d173ef
fixed #1332 : add cocos2d version
2012-06-18 16:16:09 +08:00
minggo
7434804419
Merge pull request #1036 from minggo/gles20
...
modify xcode project setting for HelloWorld HelloLua and testjs
2012-06-17 20:50:08 -07:00
minggo
d53a9fc06e
modify xcode project setting for HelloWorld HelloLua and testjs
2012-06-18 11:48:03 +08:00
James Chen
62256a75d5
Merge pull request #1035 from dumganhar/gles20-ccbi
...
fixed #1330 : merge PR#1034 and made it works on win32, android and ios.
2012-06-17 19:47:11 -07:00
James Chen
3cf0f3555c
issue #1330 : Removed virtual for callback functions.
2012-06-16 15:22:23 +08:00
James Chen
453a7c63d3
issue #1330 : Some memory leaks fixes.
2012-06-16 14:31:57 +08:00
James Chen
ec75695a4f
issue #1330 : Added virtual destructor for interfaces.
2012-06-16 13:04:23 +08:00
James Chen
73c9707d5d
CCBIReader fixes + building and running flawless on iOS and Android.
...
Made it works on win32.
2012-06-16 12:48:20 +08:00
James Chen
ab3dd66167
Merge branch 'gles20-ccbi' of https://github.com/nicolasgramlich/cocos2d-x into gles20-ccbi
2012-06-16 11:05:28 +08:00
James Chen
69283b7ee0
Merge pull request #1032 from folecr/android_matchrename
...
fixed #1329 : Updated build scripts and Ant build file to match renamed directory.
2012-06-15 20:01:40 -07:00
Nicolas Gramlich
13bcf2180c
Merge with gles20.
2012-06-15 16:26:10 -07:00
Nicolas Gramlich
c38bfd0a24
Updated xcode project file.
2012-06-15 16:16:08 -07:00
Nicolas Gramlich
54944ab1f9
Fixed a comment.
2012-06-15 16:06:54 -07:00
Nicolas Gramlich
d175884f79
Added ParticleSystemTest.
2012-06-15 14:48:36 -07:00
Nicolas Gramlich
f0c1a4001c
Removed CC_FONT_LABEL_SUPPORT since it wasn't defined anywhere and now custom TTF fonts work.
2012-06-15 14:06:01 -07:00
Nicolas Gramlich
420d9ef41b
Fixed fntFile and fontTTF properties not having the full path prexifed, if they are non system fonts.
2012-06-15 14:01:57 -07:00
folecr
90a6a65404
Modify source.dir to match updated directory name
2012-06-15 09:24:10 -07:00
folecr
06f941b8c0
Script uses updated directory name when copying files
2012-06-15 09:17:42 -07:00
James Chen
06f41b8982
Merge pull request #1031 from dumganhar/folecr_android
...
fixed #1329 : Moved all java files part of engine into a certain directory, then all projects refer to them.
2012-06-15 03:30:32 -07:00
James Chen
cc572ab8e7
fixed #1329 : Moved all java files part of engine into a certain directory, then all projects refer to them.
2012-06-15 18:15:43 +08:00
James Chen
24cc0796b6
Merge branch 'cocos2dxandroidlibrary' of https://github.com/folecr/cocos2d-x into folecr_android
2012-06-15 17:47:04 +08:00
minggo
d0e308444d
Merge pull request #1030 from minggo/gles20
...
fixed #1292:fix some bugs that caused by modify function name
2012-06-15 02:41:44 -07:00
minggo
899022d107
fixed #1292:fix some bugs that caused by modify function name
2012-06-15 17:39:13 +08:00
James Chen
daf93df610
Merge pull request #1029 from dumganhar/gles20
...
fixed #1310 : Updated vs2010 project configuration after synchronizing to rc2.
2012-06-15 02:28:54 -07:00
James Chen
1d0fa4a9aa
fixed #1292 : Updated lua bindings.
2012-06-15 17:26:11 +08:00
James Chen
61719d813e
fixed #1292:make some function names more readable.
2012-06-15 16:47:54 +08:00
James Chen
595a402c83
fixed #1292:make some function names more readable.
2012-06-15 16:47:30 +08:00
James Chen
e7628de857
fixed a warning in CCScale9Sprite::initWithBatchNode.
2012-06-15 15:36:36 +08:00
James Chen
0afdfe33da
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-15 15:25:37 +08:00
James Chen
c17091ac70
fixed #1310 : Updated vs2010 project configuration after synchronizing to rc2.
2012-06-15 15:24:22 +08:00
minggo
266a5e5e66
Merge pull request #1028 from minggo/iss1292_moidify_function_name
...
issue #1292:make some function names more readable
2012-06-15 00:14:13 -07:00
minggo
d0f905992a
issue #1292:make some function names more readable
2012-06-15 15:10:40 +08:00
James Chen
ec6573c461
Merge pull request #1027 from dumganhar/gles20
...
Fixed a logic error in ActionScaleTest.
2012-06-14 22:57:30 -07:00
James Chen
159b91b6cd
Fixed a logic error in ActionScaleTest.
2012-06-15 13:56:27 +08:00
James Chen
22959a2a0f
Merge pull request #1026 from dumganhar/gles20
...
fixed #1327 : Exported 'create' method for lua bindings.
2012-06-14 20:49:08 -07:00
James Chen
bc150ea5a9
fixed #1327 : Exported 'create' method for lua bindings.
2012-06-15 11:46:51 +08:00
James Chen
77d7f44b3f
Merge pull request #1025 from dumganhar/gles20
...
fixed #1326 : The compilation of Hellolua and testjs project was broken after synchronizing to rc2.
2012-06-14 19:58:50 -07:00
folecr
6fc2dc5ed9
Use Java code instead of XML to define layout
...
* Android layout for cocos apps are very simple (full screen)
* Avoids creation of R.java for loading the layout
* Can package entire library in jar
* Remove unused layout resource
2012-06-14 19:52:45 -07:00