Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,540 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

4540 Commits

Author SHA1 Message Date
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
folecr 4e5a64fd9e Minimal layout directives in XML 2012-06-14 19:52:45 -07:00
folecr 172b90cbfe Android project generation script copies library sources 
* mkdir parent folder with project name
 * create android project in proj.android subfolder
 * copy library sources to generated project
 * remove unnecessary function that moves files from top directory to proj.android
 2012-06-14 19:52:40 -07:00
James Chen 3a5ba4a24c Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-15 10:52:31 +08:00
James Chen 4c1ca36aa8 fixed #1326: The compilation of Hellolua and testjs project was broken after synchronizing to rc2. 2012-06-15 10:51:53 +08:00
minggo 522fcf9018 Merge pull request #1024 from minggo/iss1181_rendertexture 
Iss1181 rendertexture
 2012-06-14 19:29:22 -07:00
minggo c965c8d770 fixed 1181: synchronize latest codes 2012-06-15 10:27:52 +08:00
folecr d651da6f0d Tests : Ant build project files 2012-06-14 19:21:03 -07:00
folecr d86e088e9f Tests : Use cocos2dandroid library 
* Remove code and resources that are now in a library
     * Add library as a dependency for HelloWorld
     * Use cocos2dx_default_ resources
 2012-06-14 19:21:03 -07:00
folecr 4a4d051cee HelloLua : Ant build and configuration files 2012-06-14 19:21:03 -07:00
folecr 0529ccf340 HelloLua : Use cocos2dandroid library 
* Add reference to android library project
 * Remove code and resources that are now in a library
 2012-06-14 19:21:03 -07:00
folecr 32497bb3d6 HelloWorld : Ant build file 2012-06-14 19:21:03 -07:00
folecr 6bd444913c HelloWorld : Use cocos2dandroid library 
* Add library as a dependency for HelloWorld
 * Use cocos2dx_default_ resources
 2012-06-14 19:21:02 -07:00
folecr b6164c7590 Create a library named cocos2dandroid 
* Based on sources from HelloWorld that should be common across all cocos2d-x android projects
 * Rename, use prefix cocos2dx_default_ for items in layout
 * Project files for android library, targeted to android-8
 2012-06-14 19:21:02 -07:00
folecr 6aa1879f84 Add gen/ and local.properties to gitignore 2012-06-14 19:21:02 -07:00
Nicolas Gramlich 8d7dce0999 Added glue macros to reduce boilerplate code when implementing CCBSelectorResolver and CCBMemberVariableAssigner. Added LabelTest, MenuTest and SpriteTest. 2012-06-14 18:16:54 -07:00
Nicolas Gramlich a7ad34864f CocosBuilderTest: Simplified the 'XYZLoader' classes to be header only, with nice and short macros to do the boilderplate stuff. 2012-06-14 14:23:53 -07:00