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

3824 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
dumganhar 707f2c2561 fix buffer count wrong 2011-10-19 17:15:21 +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
Leon 70a4942ea6 fix some warning 2011-10-19 15:24:19 +08:00
Leon 77b3a32e16 fix compile error on 64 bit Linux 2011-10-19 15:12:38 +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
dumganhar a59fa1d596 use AudioOut to play effect 2011-10-18 18:10:53 +08: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
dumganhar 40cf322d60 don't use CCAudioOut 2011-10-18 11:11:36 +08:00
dumganhar 3c4c4e515a modify project settings 2011-10-18 11:11:09 +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
dumganhar e247668ee0 AudioOut support ogg format 2011-10-18 09:45:04 +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
dumganhar 6af6257fa9 Merge branch 'testf1016' of github.com:dumganhar/cocos2d-x into FishGameBada 
Conflicts:
	CocosDenshion/bada/CCAudioOut.cpp
	CocosDenshion/bada/CCAudioOut.h
 2011-10-17 13:45:16 +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
dumganhar 064014aeae make some special configure 2011-10-16 22:44:29 +08: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
dumganhar ee53c29e5c switch to 2.0 WVGA 2011-10-16 13:23:48 +08: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
dumganhar 7d9ff2af6f rename some files 2011-10-14 18:33:14 +08:00
dumganhar eaad344762 resert some files 2011-10-14 17:57: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
dumganhar f1614fb4de open media file succeed, insert list 2011-10-14 17:30:36 +08:00
dumganhar f7bd325d2b use Osp::Media::Player for playing effect 
remove old AudioOut method
 2011-10-14 16:03:06 +08:00
dumganhar 1ffd3a4350 add language support 2011-10-14 15:54:18 +08:00
dumganhar 8dfa18efb9 commit some file for private use 2011-10-14 15:38:58 +08:00
Walzer 47c9020b85 fixed #738: caculate label height if not set 2011-10-14 14:33:08 +08:00
dumganhar 987def2f47 add FishGame Project 2011-10-14 09:23:38 +08:00
dumganhar 3f89f3088b remove mouse test log 2011-10-14 09:21:03 +08:00
dumganhar 5fa24269b7 use Osp::Media::Player to playing effect.support mp3, aac, ... 2011-10-14 09:20:03 +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
dumganhar fd3f496b76 use system orientation 2011-10-13 11:55:48 +08:00
minggo 6b4f8b9489 Merge pull request #546 from minggo/iss750 
fix Iss750
 2011-10-12 19:57:24 -07:00