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

2455 Commits

Author SHA1 Message Date
minggo 9609885437 Merge pull request #481 from minggo/iss689 
assert the width and height of rect is positive
 2011-08-22 00:36:46 -07:00
minggo 19244406d6 fixed #689: assert the width and height of rect is big than 0 2011-08-22 14:55:51 +08:00
minggo cd4a08aa6a Merge pull request #479 from minggo/iss678 
fixed #679: add constructor for CCArray
 2011-08-21 20:14:06 -07:00
minggo a0be83d043 Merge pull request #480 from moadib/mutable_array_optimization 
CCMutableArray optimization
 2011-08-21 19:59:29 -07:00
Walzer 65576acb5b Create a license folder, add license file of CocosDenshion, FontLabel, iconv, libjpeg, libxml2, and zlib. I apologize to authors of these libraries for my laziness. 2011-08-21 21:05:25 +08:00
moadib 807ae36d6a CCMutableArray optimization 2011-08-20 01:30:33 +04:00
minggo 1f9f1f59d4 fixed #679: add constructor for CCArray 2011-08-19 16:15:06 +08:00
minggo 0a9f6c1f09 Merge pull request #478 from minggo/iss684 
add test for displaying current language
 2011-08-18 23:19:00 -07:00
minggo 11e9acb7c8 fixed #684: add test for displaying current language 2011-08-19 11:32:30 +08:00
minggo 733e582d12 fixed #684: add test for displaying current language 2011-08-19 11:26:14 +08:00
minggo cfd605311c Merge pull request #476 from minggo/iss685 
fixed #685: add label test for displaying Chinese characters
 2011-08-18 18:32:17 -07:00
minggo d830f1f846 Merge pull request #475 from minggo/iss683 
[android] fixed #683
 2011-08-18 18:32:04 -07:00
Walzer d9e12ac7e1 Merge pull request #477 from minggo/master 
fix compile error of release version of HelloLua
 2011-08-18 05:19:33 -07:00
minggo 24340826e1 fix compile error of release version of HelloLua 2011-08-18 20:14:43 +08:00
minggo edb8b4639d fixed #685: add label test for displaying Chinese characters 2011-08-18 18:40:24 +08:00
minggo 5087f6ddb2 [android] fixed #683: remove unneeded includes 2011-08-18 16:19:36 +08:00
minggo b4ab3f6b75 [android] fixed #683: remove unneeded includes 2011-08-18 16:18:26 +08:00
minggo 1640e48d5a [android] fixed #683: let getCurrentLanguageJNI() & getPackageNameJNI() return valid pointer 2011-08-18 16:09:49 +08:00
minggo e0b804f2f9 Merge pull request #474 from moadib/pass_params_by_reference 
Non-trivial arguments passed by reference now.
 2011-08-17 23:23:51 -07:00
moadib a8d87a9976 Non-trivial arguments passed by reference now. 
Removed unnecessary cocos2d:: prefix inside namespace.
 2011-08-17 17:26:26 +04:00
Walzer 82afec843b changelog & authors for 0.9.1 2011-08-17 20:12:46 +08:00
Walzer 2075f3d269 Merge remote branch 'origin/master' 2011-08-17 20:11:51 +08:00
Walzer 4244fdb62b fixed #643, swap accelerometer input x/y according to the orientation (on ios devices) 2011-08-17 20:11:33 +08:00
Walzer ac94c31077 Merge pull request #473 from minggo/master 
Do some fixes for win32
 2011-08-17 04:01:38 -07:00
minggo ab781654d7 all tests works ok on vs2010 & fix a bug that HelloLua may crashed on win32 when it eixt 2011-08-17 18:24:36 +08:00
Walzer a8835649fe preload sound effect in HelloLua 2011-08-17 17:08:06 +08:00
Walzer d721f4d3c0 Merge pull request #472 from minggo/iss680 
fixed #680
 2011-08-17 01:06:39 -07:00
Walzer 4532220ca8 fix xcode3 templates 
1. remove setDeviceOrientation since we use RootViewController now
2. fix a typo in box2d template
3. modify _XXX_Prefix.pch to Prefix.pch in proj file
 2011-08-17 16:02:56 +08:00
minggo e39d551294 fixed #680: fix the bug that CCTouchDispatcher::rearrangeHandlers() crashed 2011-08-17 15:00:32 +08:00
Walzer 4894f8c6ab update xcode3 templates 2011-08-17 14:08:47 +08:00
Walzer 3b97f4d73a fix all xcode4 templates before version release. 
1. modify version description in install-teampltes-xcode.sh
2. replace the deprecated methods in box2d/HelloWorldScene.cpp
3. fix the error usage in hello.lua
4. add effect & BGM in HelloLua
5. update baisc cocos2dx library file list
 2011-08-17 12:13:13 +08:00
Walzer e338779fb8 update version string in doxygen config 2011-08-17 11:38:10 +08:00
Walzer d73e8a5fd0 update authors, add zhuoshishun 2011-08-17 11:36:09 +08:00
Walzer 375faa09e6 add archs i386 to HelloLua.xcodeproj, and don't playEffect repeatly in hello.lua (so noisy...) 2011-08-17 11:23:50 +08:00
Walzer 286f92fc43 fix at smoke test, add arch=i386 into HelloWorld.xcodeproj, otherwise the proj cannot run in xcode4 + simulator 2011-08-17 11:09:12 +08:00
minggo 9eceb590d5 Merge pull request #471 from sunzhuoshi/master 
fixed #679: Added CocosDenshion lua support, tested with "HelloLua" on iOS, win32 and Android
 2011-08-16 18:32:02 -07:00
sunzhuoshi 82c5c0f9c8 Fixed "HelloLua" makefile on Android 2011-08-17 01:06:22 +08:00
sunzhuoshi 60eb5b7cb4 Fixed "HelloLua" project file(s) on win32 2011-08-17 00:39:10 +08:00
sunzhuoshi 9a9cb02405 Added CocsDenshion lua support and tested with HelloLua on iOS 
The test music and sound effect come from "tests" project
 2011-08-16 23:56:41 +08:00
Walzer 20db7b0fa2 Merge pull request #470 from walzer/master 
add support for pvr ccz format
 2011-08-15 23:00:06 -07:00
Walzer c0fdb2b794 Merge pull request #469 from minggo/master 
make HelloLua work ok on win32 release
 2011-08-15 20:56:50 -07:00
Walzer 3afe6ebfb2 fixed #638, add support for pvr ccz format. I've tested it on both ios & android, also with instrument memleak detection. But haven't tested on win32 & marmalde, in thoery it will work. 2011-08-16 11:56:17 +08:00
Walzer 7e4f44e9ff Merge commit '507de610ebffa759fabf4054ab1b02d934c51834' 2011-08-16 11:45:28 +08:00
minggo 9c67c5a71e make HelloLua work ok on win32 release 2011-08-16 11:21:57 +08:00
Walzer 507de610eb Merge pull request #467 from minggo/master 
make HelloLua work ok on win32
 2011-08-15 01:41:13 -07:00
minggo c6cb8f4980 make HelloLua work ok on win32 2011-08-15 16:23:23 +08:00
Walzer 0881668cc2 fixed #661. Thanks to GMTDev's previous resolvtion. And I fix the compilation error in the his patch: add float m_fContentScaleFactor declaration into CCTMXLayer.h, fix tile->setPositionIn to tile->setPosition. I just run TiledMapTest in retina mode, it works well 2011-08-15 12:10:11 +08:00
minggo 3b1ecfd3ff Merge pull request #465 from GMTDev/patch-1 
Fixed problems with iPhone Retina mode TMX Tiled map support. Uses "Conte
 2011-08-14 18:23:44 -07:00
Walzer 82dc0d02aa Merge commit 'bfcf75553e618f7604d97936a99376519a9da6f4' 2011-08-14 09:39:56 +08:00
Walzer bfcf75553e add FontLabel to HelloLua.xcodeproj 2011-08-13 11:31:11 +08:00