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

89 Commits

Author SHA1 Message Date
minggo 221be759c6 issue #1324: merge James Chen's codes 2012-06-14 18:54:05 +08:00
minggo 9321a8d025 fixed #1322: vertical alignment works ok on android 2012-06-13 18:33:44 +08:00
minggo 94235d3602 issue #1310: make tests and HelloWorld work ok 2012-06-11 10:41:52 +08:00
minggo 6cf8ea283d Merge pull request #973 from minggo/iss1278_effect_android 
fixed #1278: stop effect when unloading effect
 2012-06-06 00:41:26 -07:00
minggo 1ff04700b5 fixed #1278: stop effect when unloading effect 2012-06-06 15:38:25 +08:00
James Chen 37aa196c73 Removed some unused codes. 2012-06-06 14:31:49 +08:00
James Chen cfbf29ccfc Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1282_ati 2012-06-01 13:47:23 +08:00
James Chen ebcc78497f fixed #1282: Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error. 2012-06-01 13:44:28 +08:00
minggo dfa1216ba9 add CCBReader into project 2012-06-01 11:01:09 +08:00
James Chen 9be586e4ec Updated main.cpp for each project of android. 2012-05-31 10:13:05 +08:00
James Chen ff0dde984c fixed #1240: Updated vs2008 project setting (release target). 2012-05-29 18:29:56 +08:00
James Chen b4fad0bb2b fixed #1240: Updated vs2010 project setting (release target). 2012-05-29 18:06:52 +08:00
James Chen 228bc1e044 fixed #1240: Updated vs2010 project setting. 2012-05-29 17:50:27 +08:00
James Chen 1ddb5d51b5 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-05-29 17:13:21 +08:00
minggo a09bbbd0ba fixed #1177: modify project setting, because CCStd.h is moved into platform/ios 2012-05-29 16:23:57 +08:00
James Chen 19c96632b5 fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces. 2012-05-29 16:21:23 +08:00
James Chen 05cc49a751 fixed #1263: Removed some unused files. 2012-05-28 17:33:32 +08:00
minggo 70443dfabb fixed #1265: add testjs.xml 2012-05-28 17:24:42 +08:00
minggo 0fdd9f3fd7 move js files into Resources 2012-05-28 17:21:42 +08:00
minggo 770654de1a fixed #1265: js support for android 2012-05-28 16:58:16 +08:00
James Chen 1b7cc47a34 issue #1263: Removed unused files. Fixed an issue in uthash.h. 2012-05-28 13:59:18 +08:00
James Chen 8076082b8d issue #1263: Used release version library of spidermonkey. Added testjs.win32.vcproj.user. 2012-05-28 11:27:50 +08:00
James Chen 330b019361 Added jstest project for vs2008. 2012-05-27 22:53:48 +08:00
minggo 71e333f312 fixed #1258: add fps png/fnt 2012-05-25 11:00:59 +08:00
Walzer fecab7f3b1 fixed #1258, all js test cases passed. 2012-05-24 18:34:00 +08:00
Walzer 1e732930b7 fixed #1258, testjs and spidermonkey-ios is merged. But only test_actions.js works. 2012-05-24 17:48:05 +08:00
Rolando Abarca bed6efa3cd adds "require" to the global namespace 2012-05-21 16:08:34 -07:00
Rolando Abarca 68ce2bd70c adds more bindings 
adds CCApplication, CCUserDefault and fixes a few
things in addChild
 2012-05-21 13:09:46 -07:00
Rolando Abarca 1dcce90b6d adds test for enums on native class 2012-05-18 15:21:24 -07:00
Rolando Abarca fb146129c1 adds TMX support for bindings 2012-05-14 15:55:27 -07:00
Rolando Abarca 57b3a9bdb5 adds simple transition test 2012-05-14 15:13:01 -07:00
Rolando Abarca 43387176b8 adds more bindings 2012-05-14 15:06:22 -07:00
Rolando Abarca 025da69340 more bindings 2012-05-14 12:57:14 -07:00
Rolando Abarca 326e1752fb updates readme 2012-05-11 12:07:10 -07:00
Rolando Abarca 5f57e72eae adds the files for the bindings example 2012-05-11 12:03:32 -07:00
Rolando Abarca c0c42171bd updates generated cocos2d bindings 2012-05-10 16:04:18 -07:00
Rolando Abarca 8b5e30d71f minor edit (whitespace) 2012-05-10 16:04:04 -07:00
Rolando Abarca 2692de7de8 fixes evalString, error checking in runScript 2012-05-08 16:44:17 -07:00
Rolando Abarca 856ce0757c fixes addChild in order to match native version 2012-05-08 10:16:29 -07:00
Rolando Abarca 0c408d98e5 adds test_sound.js to the list 2012-05-04 10:18:24 -07:00
Rolando Abarca 596b9fc450 some minor refactoring and adding resources 2012-05-04 10:17:59 -07:00
Rolando Abarca 8e4ab8edbc adds cocos denshion bindings 2012-05-04 10:17:41 -07:00
Rolando Abarca df7273086a test sound 2012-05-04 10:17:07 -07:00
Rolando Abarca 97bd8c356f renamed out.cpp to something more meaningful 2012-05-04 10:16:40 -07:00
Rolando Abarca f3a37cc8b3 added more classes 2012-05-03 17:45:28 -07:00
Rolando Abarca 22e9fd86d6 adds TextureAtlas and SpriteBatchNode 2012-05-03 17:14:56 -07:00
Rolando Abarca a6785e18d0 defaults to test_actions 2012-05-03 17:14:44 -07:00
Rolando Abarca cad87cd16e missing semi colon 2012-05-03 16:56:51 -07:00
Ricardo Quesada 7e655ae915 color works on particles 2012-05-03 16:56:51 -07:00
Ricardo Quesada 7e0c16c53d particle test: uses texturecache 2012-05-03 16:56:50 -07:00