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

6838 Commits

Author SHA1 Message Date
James Chen 2cf4ee0b94 Merge pull request #1895 from dumganhar/iss1683-refactor-ccfileutils 
issue #1683: Fixed compilation errors for Win32.
 2013-01-25 06:35:38 -08:00
James Chen 2235f745d3 issue #1683: Fixed compilation error for Win32. 2013-01-25 22:30:16 +08:00
James Chen ef131beed1 Merge pull request #1885 from dumganhar/refactor-ccfileutils 
issue #1683 :Refactoring CCFileUtils.TO BE DONE: 
Making the api of CCFileUtils more c++ friendly.
 2013-01-25 05:55:10 -08:00
James Chen fde39c6dcb Adding cache support for CCFileUtils. 2013-01-25 21:52:35 +08:00
James Chen 55af1fd3bf Removing unneeded codes in CCFileUtils.mm for iOS port. 2013-01-25 21:17:28 +08:00
James Chen a1574fe9f6 Reverted this commit (be305f84b6) since i didn't find the crash. 2013-01-25 20:59:58 +08:00
James Chen 6f3b22031f Using new API of getting full path for file name. 2013-01-25 20:51:52 +08:00
James Chen 4d900c2d15 Removing `assets/` in the full path since it isn't needed for the API of playing sound. 2013-01-25 20:51:00 +08:00
minggo 4ebb0dcb13 Merge pull request #1892 from minggo/master 
update JSB submodule
 2013-01-25 02:26:46 -08:00
minggo 71defcba99 update JSB codes to latest 2013-01-25 18:24:39 +08:00
minggo f8c4a5638d Merge pull request #1888 from folecr/s9sprite 
Fix some bugs in CCScale9Sprite
 2013-01-25 02:14:59 -08:00
James Chen cf93281419 Updating JS Tests. 2013-01-25 17:29:35 +08:00
James Chen b3f54f6c1d Merge remote-tracking branch 'origin/refactor-ccfileutils' into refactor-ccfileutils 2013-01-25 17:23:58 +08:00
James Chen 70b8e624d6 Merge pull request #8 from rohankuruvilla/fileutils_test 
Merged @Rohan's improvements for CCFileUtils.
 2013-01-25 01:20:51 -08:00
Rohan Kuruvilla f050fc9f08 Allowing resolution being sent to CocosBuilder to be set by AppDelegate 2013-01-25 00:30:12 -08:00
Rohan Kuruvilla 6fdbff537a Fixing run and reset buttons being enabled by default 2013-01-24 23:32:00 -08:00
Rohan Kuruvilla 6d0d9e7375 Refactoring a bit to allow JNI cleanCache call 2013-01-24 23:27:19 -08:00
minggo f26f34ad57 Merge pull request #1891 from minggo/iss1679-prebuilt-libs 
fixed #1679: use unstripped libs for armeabi-v7a
 2013-01-24 22:56:13 -08:00
minggo dcaa3900a4 fixed #1679: use unstripped libs for armeabi-v7a 2013-01-25 14:49:25 +08:00
Rohan Kuruvilla 9532e5e6c7 Chaning name sent to CCB 2013-01-24 22:19:49 -08:00
Rohan Kuruvilla dcde99d568 Adding Binary Plist parsing library 2013-01-24 22:19:45 -08:00
James Chen 805067b046 Refactored CCFileUtils for blackberry port. 2013-01-25 14:09:56 +08:00
James Chen 314445e1ca Refectored CCFileUtils for MAC port. 2013-01-25 11:12:38 +08:00
James Chen 6a31f4edaf Fixed a logical error in CCNodeLoader.cpp. 2013-01-25 11:04:41 +08:00
Rohan Kuruvilla 9750bbab95 removing absolute path lookup in fullPathForFilename 2013-01-24 19:04:27 -08:00
Rohan Kuruvilla f5c74d9022 Adding support for getInstance in Cocos2dxGLSurfaceView, to allow for running tasks on GL Thread 2013-01-24 18:37:24 -08:00
Rohan Kuruvilla 578b1c741e Fixing bug in resetting context that fails because of setting UTf8 string twice 2013-01-24 18:37:24 -08:00
Rohan Kuruvilla 43229cb440 Adding CocosPlayerJS for Android 2013-01-24 18:37:24 -08:00
Rohan Kuruvilla be305f84b6 Fixing bug where it doesn't use embedded texture data, if texture filename is not available 2013-01-24 18:37:23 -08:00
Rohan Kuruvilla 287b5575f4 Changing architecture of CCFileUtils 2013-01-24 18:37:23 -08:00
folecr dcda7ad240 Use instances only if valid 2013-01-24 15:43:59 -08:00
James Chen cefef60e11 Refactored CCFileUtils for Marmalade port. 2013-01-24 17:38:43 +08:00
James Chen 73389d68d5 Refactor CCFileUtils for Linux port. 2013-01-24 16:44:13 +08:00
James Chen 5e65745795 Updated iOS project configuration. 2013-01-24 14:44:44 +08:00
James Chen e954ce4f75 Made compatibility with old api CCFileUtils::setResourceDirectory. 2013-01-24 14:07:48 +08:00
James Chen 7589be6fb7 Refactoring CCFileUtils for win32. CrystalCraze works ok on WIN32 now. 2013-01-24 13:56:50 +08:00
James Chen 9b3f9503ea Updated JS Tests. 2013-01-24 11:39:11 +08:00
James Chen dcf1127d31 Merge branch 'master' into refactor-ccfileutils 2013-01-24 11:21:23 +08:00
James Chen 9b21aac263 Update AUTHORS 2013-01-24 10:31:45 +08:00
James Chen 9f767210e0 Merge pull request #1886 from FlowerpotGames/master 
fixed #1680: CCTableView update. CCMenu bug fix.
 2013-01-23 18:27:23 -08:00
folecr 3f41b361d3 CCScale9Sprite : handles default modes correctly. Bugs when the source is a sprite that is stored rotated in a spritesheet. 2013-01-23 16:42:14 -08:00
Ed Bartley 39a39fb9f4 CCTableView: Added a delegate method to inform the implementor that a cell as about to be recycled. CCTableView no longer crashes if a CCTableViewDelegate is not provided. 2013-01-23 14:04:49 -05:00
Ed Bartley 908035bdee Fixed a CCMenu bug that prevented the touch priority from being set to the value specified by a call to CCMenu::setTouchPriority(int). 2013-01-23 14:00:23 -05:00
James Chen 1180a98eb9 Updated submodule reference for cocos2d-js-tests. 2013-01-24 00:37:39 +08:00
James Chen 46f38c57fb issue #1661: CrystalCraze works ok on android. 2013-01-24 00:32:22 +08:00
James Chen 8cfd912a06 CrystalCraze works ok on iOS. 2013-01-23 23:17:44 +08:00
James Chen 388e1d82c3 Added resource structure which is the same as cocos2d-iphone. 2013-01-23 22:29:00 +08:00
James Chen 294509c4c0 Merge branch 'master' of https://github.com/dumganhar/cocos2d-x into myccfileutils 2013-01-23 19:52:17 +08:00
James Chen d28a29ab98 Merge pull request #1884 from dumganhar/iss1678-ccnode-doxygen 
fixed #1678: Fixed a typo, and regenerated luabinding codes.
 2013-01-23 00:00:45 -08:00
James Chen f2303b854a Fixed a typo, and regenerated luabinding codes. 2013-01-23 15:59:13 +08:00