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

5588 Commits

Author SHA1 Message Date
minggo 7bfc88c568 Merge pull request #1130 from mustime/bug1284 
issue #1284: using OpenSL for playing effects on I9100
 2012-07-26 20:31:51 -07:00
mustime b4e7e1152f issue #1284: fix the problem that effect still plays after stop->resume 2012-07-27 10:36:05 +08:00
minggo ad22f67386 Merge pull request #1131 from John-cdy/gles20 
Issue #1404 Add automatic testing tools
 2012-07-26 18:56:22 -07:00
mustime 491c05b25c issue #1284: unify the static variables' name to s_pXX 2012-07-26 16:45:21 +08:00
Caidongyang 5dc604ebfc Issue #1404 Add automatic testing tools 2012-07-26 16:25:54 +08:00
mustime 2e335f6dee issue #1284: changed some names to make the code more readable 2012-07-26 16:22:23 +08:00
mustime bfc53e3453 issue #1284: using OpenSL for playing effects on I9100 2012-07-26 15:30:09 +08:00
James Chen 18b1d097c7 Merge pull request #1126 from dumganhar/gles20 
fixed a compile error on win32.
 2012-07-25 22:56:46 -07:00
minggo 16c469fa4e Merge pull request #1127 from mustime/bug1381 
issue #1381: change the setContentSize interface in the subclasses of CCNode
 2012-07-25 21:39:44 -07:00
mustime 9ad241c8f8 issue #1381: change the setContentSize interface in the subclasses of 
CCNode
 2012-07-26 12:03:37 +08:00
James Chen b716f4ff62 fixed a compile error on win32. 2012-07-26 11:42:31 +08:00
minggo 7a1e35492c Merge pull request #1125 from NatWeiss/mactests 
Added Mac cpp HelloWorld and Tests
 2012-07-24 19:38:31 -07:00
Nat Weiss 9f0be2de05 Added Mac cpp HelloWorld and Tests. 2012-07-24 19:07:31 -07:00
minggo 5814dbd8ca Merge pull request #1124 from minggo/iss1403_png8 
fixed #1403:support png8
 2012-07-24 01:47:43 -07:00
minggo ed6b396782 fixed #1403:support png8 2012-07-24 16:43:48 +08:00
minggo 9374767fae Merge pull request #1121 from minggo/iss1383_userdefault_path 
fixed #1383:save UserDefault.xml to Library/caches
 2012-07-23 20:36:14 -07:00
minggo 0a2570fec7 fixed #1383:save UserDefault.xml to Library/caches 2012-07-24 11:34:20 +08:00
James Chen 5343da0bcd Merge pull request #1120 from dumganhar/gles20 
fixed #1385: Logic error in BitmapFontMultiLineAlignment.
 2012-07-23 20:33:00 -07:00
James Chen fda669510a fixed #1385: Logic error in BitmapFontMultiLineAlignment. 2012-07-24 11:32:02 +08:00
James Chen 85533cf3ef Merge pull request #1119 from dumganhar/gles20 
fixed #1386: PauseResumeActionsTest crashes.
 2012-07-23 20:22:49 -07:00
James Chen e7d7ff99c7 fixed #1386: PauseResumeActionsTest crashes. 2012-07-24 11:21:08 +08:00
Walzer 221d06509a Merge pull request #1118 from walzer/gles20 
fixed #1402, résolve conflicting "create" functions
 2012-07-23 09:40:51 -07:00
Walzer 685b70e6fb fixed #1402, résolve conflicting "create" functions 
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
 2012-07-23 22:49:11 +08:00
minggo 851241d3c3 Merge pull request #1116 from minggo/iss1399_adjust_structure 
Iss1399 adjust structure
 2012-07-23 02:19:30 -07:00
minggo 59db9f0c6f issue #1399:lua building works ok after adjusting directory structure 2012-07-23 17:14:18 +08:00
minggo 4eb59cd3d0 issue #1399:xcode template works ok after adjusting directory structure 2012-07-23 17:10:56 +08:00
James Chen 446b63d32a Merge pull request #1115 from dumganhar/iss1399 
issue #1399: Updated android template. Added cocos_extension_static dependence for created project by default.
 2012-07-23 01:44:29 -07:00
James Chen 722084bbaa issue #1399: Updated android template. Added cocos_extension_static dependence for created project by default. 2012-07-23 16:42:07 +08:00
minggo 2dcaffdfbc Merge pull request #1114 from minggo/modify_xcode_project 
Modify project information of TestJavascript
 2012-07-23 00:50:30 -07:00
minggo 790b6b775e remove some icon informations of TestJavascript 2012-07-23 15:48:03 +08:00
minggo aea895c45b remove some icon informations of TestJavascript 2012-07-23 15:42:17 +08:00
minggo e249d6b0ce Merge branch 'gles20' of https://github.com/walzer/cocos2d-x into modify_xcode_project 2012-07-23 15:38:24 +08:00
Walzer cc23d0667d unify Bundle ID for all xcodeprojects to "org.cocos2d-x.*", add icons for iphone/ipad * retina. 2012-07-23 15:23:26 +08:00
James Chen e314c7da9d Merge pull request #1112 from dumganhar/iss1399 
issue #1399: Updated android template.
 2012-07-23 00:14:24 -07:00
James Chen d5f783b681 issue #1399: Updated android template. 2012-07-23 14:56:40 +08:00
James Chen 808623225a Merge pull request #1111 from dumganhar/iss1399 
issue #1399: Added vs2010 support, and set the flag 'LinkIncremental' value to false.
 2012-07-22 21:03:02 -07:00
James Chen 9a6729551c Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399 2012-07-23 11:59:47 +08:00
James Chen 2ab5e4ab9c issue #1399: Added vs2010 support. 2012-07-23 11:57:34 +08:00
James Chen 7f6ffef8cf issue #1399: Set the flag 'LinkIncremental' value to false. 2012-07-23 11:47:27 +08:00
minggo ac70f8def5 Merge branch 'gles20-adjust-structure' into merge 2012-07-23 11:36:46 +08:00
minggo 5163b17a8a make CCBReaderTest work ok 2012-07-23 11:33:11 +08:00
James Chen 8291b7aef6 Reverted 'cocosdenshion' to 'CocosDenshion'. 2012-07-23 11:07:31 +08:00
James Chen baaf9dc930 issue #1399: Renamed 'cocosDeshion' to 'CocosDeshion'. 2012-07-23 10:56:45 +08:00
James Chen acd4a5dc9d issue #1399: Updated build-win32.bat and libExtensions.vcproj. 2012-07-23 10:55:24 +08:00
minggo f38629fbfc Merge pull request #1109 from NatWeiss/addmac4 
Adding Mac support!
 2012-07-22 19:48:52 -07:00
James Chen 27ee691132 Merge branch 'gles20-adjust-structure' of https://github.com/cocos2d/cocos2d-x into iss1399 2012-07-23 10:35:23 +08:00
minggo 59045d39a4 Merge pull request #1100 from yasithv/patch-1 
CCControlSlider: re-assigning of texture rect to consider SpriteFrame orientation
 2012-07-22 19:34:54 -07:00
James Chen c171f24d8e issue #1399: Updated win32 template. 2012-07-23 10:31:26 +08:00
Nat Weiss fcfea04bbc iPad detection is now where it belongs in CCApplication. 2012-07-21 11:46:42 -07:00
Nat Weiss a4760698ca Determines whether to use iPad graphics statically, so if the window is resized the graphics loaded are consistent. 2012-07-21 11:35:28 -07:00