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

2630 Commits

Author SHA1 Message Date
Walzer 5986a9da74 Merge commit '8aa014d3cd0ff82d40f801d3740829925fff5d87' from github.com/cocos2d/cocos2d-x.git 2011-10-19 21:00:21 +08:00
minggo 8aa014d3cd Merge pull request #558 from minggo/iss755 
fixed #743
 2011-10-19 05:05:23 -07:00
minggo 2490388f28 remove unneeded packages 2011-10-19 20:03:18 +08:00
minggo 68d03de677 fixed #743: let nativeInit() get correct screensize when running on device with software android buttons 2011-10-19 19:55:23 +08:00
minggo 7e8e7c7e87 Merge pull request #557 from minggo/iss755 
fixed #755
 2011-10-19 02:03:19 -07:00
minggo 2d3bfd4a1a fixed #755: get x y coordinate from existing array to avoid crashing on sunsumg devices 2011-10-19 17:01:35 +08:00
minggo a37e87b69b Merge pull request #555 from minggo/master 
add ignore file types
 2011-10-18 23:51:01 -07:00
minggo d8825594a1 add ignore file types 2011-10-18 23:50:06 -07:00
minggo 866401e5d8 add ignore file types 2011-10-18 23:47:40 -07:00
minggo e9c133351d Merge pull request #554 from minggo/master 
make script more strongable
 2011-10-18 23:27:56 -07:00
minggo cc1c29c0ca Merge branch 'master' of https://github.com/minggo/cocos2d-x 2011-10-18 23:21:53 -07:00
minggo 3a17163897 make script more strongable 2011-10-18 23:21:39 -07:00
Walzer 43ee194833 Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2011-10-18 17:42:30 +08:00
Walzer ae411f9503 fix some warnings detected by xcode4.2, fix a stupid typo in RayCasts.h 2011-10-18 17:41:19 +08:00
minggo cdbdef573c Merge pull request #553 from minggo/master 
copy files from HelloWorld/Classes and delete unneeded files
 2011-10-17 18:57:13 -07:00
minggo 8b3ce10ece copy files from HelloWorld/Classes and delete unneeded files 2011-10-18 09:55:56 +08:00
minggo 5c3c0e4983 Merge pull request #551 from minggo/master 
change effect file to make CocosDenshionTest work ok in win32
 2011-10-16 23:24:53 -07:00
minggo 43d64360cf Merge branch 'master' of https://github.com/minggo/cocos2d-x 2011-10-17 14:22:53 +08:00
minggo 1ccfcc1e94 change effect file 2011-10-17 14:22:10 +08:00
minggo 1eaa5a3f6f Merge pull request #550 from minggo/master 
modify the path to relative path in project setting
 2011-10-16 20:55:25 -07:00
minggo 9a834585bb modify the path to relative path in project setting 2011-10-16 20:53:48 -07:00
minggo 602a7b5bc1 Merge pull request #549 from minggo/master 
make HelloWorld and tests work ok on linux with eclipse
 2011-10-16 02:23:23 -07:00
minggo 80cd3266df make HelloWorld and tests work ok on linux with eclipse 2011-10-16 02:21:17 -07:00
minggo a56145d613 change include path of HelloWorld vs2010 configuration, add CurrentLanguageTest into tests of vs2010 configuration 2011-10-16 12:00:44 +08:00
minggo be42eec8db Merge pull request #548 from minggo/master 
add link path & copy cocosdenshion depended libs into lib/linux/Debug
 2011-10-14 02:33:40 -07:00
zhangxm 0086da0ee0 add link path & copy cocosdenshion depended libs into lib/linux/Debug 2011-10-14 02:30:49 -07:00
Walzer 47c9020b85 fixed #738: caculate label height if not set 2011-10-14 14:33:08 +08:00
minggo 1996d2e90e Merge pull request #547 from natural-law/master 
fixed #747
 2011-10-13 00:10:37 -07:00
natural-law a8511f0cd3 fixed #747, Rename the resource folder name of win32 template to Resources. 2011-10-13 14:58:36 +08:00
minggo 6b4f8b9489 Merge pull request #546 from minggo/iss750 
fix Iss750
 2011-10-12 19:57:24 -07:00
minggo 2b2405e2dc fixed #750: add comment 2011-10-13 10:56:02 +08:00
minggo aaa16b4a4f fixed #750: change the key to full path, because retrieve it use full path 2011-10-13 10:54:22 +08:00
Walzer ea2a428a57 Merge pull request #545 from moadib/detect_russian_language 
More simple and correct way to detect language for win32 application
 2011-10-11 23:26:13 -07:00
moadib 5feee662e7 More simple and correct way to detect language for win32 application, also added detection of all languages contained in ccLanguageType enumeration . 
Added support for detect russian language.
 2011-10-12 09:32:59 +04:00
minggo 66b20d7f7d Merge pull request #544 from moadib/export_saxparser 
Added dll-export macro to CCSaxParser declaration
 2011-10-11 19:19:51 -07:00
moadib 0283a4b254 Added dll-export macro to CCSaxParser declaration 2011-10-11 22:44:18 +04:00
minggo b1f88201b3 Merge pull request #543 from minggo/master 
fixed #749: fix the crash of SpriteNilTexture, a test case of SpriteTest.
 2011-10-11 00:38:53 -07:00
minggo be1f4e3042 fixed #749: fix the crash of SpriteNilTexture, a test case of SpriteTest. 2011-10-11 15:36:18 +08:00
minggo 8b3bbd1994 Merge pull request #542 from minggo/master 
fixed a compiling error
 2011-10-10 21:04:43 -07:00
minggo 9b72d36671 fixed a compiling error because .cpp & .h of HelloWorld are moved into folder Classes 2011-10-11 12:03:19 +08:00
minggo 3995408efc Merge pull request #539 from minggo/iss745 
fixed #745: export CCTime to dll
 2011-10-08 19:26:40 -07:00
minggo 9695b6df86 fixed #745: export CCTime to dll 2011-10-09 10:19:12 +08:00
minggo ba2f2fbc8b Merge https://github.com/reflog/cocos2d-x into reflog 2011-10-08 11:28:16 +08:00
Eli Yukelzon d23b044782 fill for polygon drawing 2011-10-05 10:50:00 +02:00
minggo 7e4efc7f73 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-09-29 02:15:04 -07:00
minggo 6d358cfad7 make linux template work ok 2011-09-29 02:14:17 -07:00
minggo 33c7caf555 Merge pull request #535 from minggo/master 
fixed a assert error
 2011-09-29 01:13:49 -07:00
minggo a56034f177 fixed a assert error 2011-09-29 16:07:18 +08:00
minggo 333e08330b make create-linux-android-project.sh works ok 2011-09-29 00:49:49 -07:00
minggo a6b42c3aa5 Merge pull request #534 from minggo/master 
Do some fixes
 2011-09-28 02:38:25 -07:00