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

6761 Commits

Author SHA1 Message Date
James Chen 48cc756d88 Merge branch 'gles20' of https://github.com/ImperialPenguin/cocos2d-x into iss1024-bb-ttf 2012-10-17 09:49:13 +08:00
minggo f0e7d5a87b Update AUTHORS 2012-10-17 09:33:56 +08:00
minggo 0cca1cb023 Merge pull request #1462 from wenbin1989/gles20 
fix getDeviceModel bug in android CocosDenshion
 2012-10-16 18:32:13 -07:00
John Garrison 8e7b939f61 Added TTF support to Blackberry 2012-10-16 13:47:04 -04:00
johnangel cd82403638 Fix to make MultiTouchTest work properly 2012-10-16 19:02:24 +02:00
johnangel 054128c5ee Correction for touch and display area 2012-10-16 18:53:31 +02:00
James Chen 36f8308720 Merge pull request #1463 from dumganhar/gles20 
Updated mozjs.lib and mozjs.dll for win32 port. Built with Release mode.
 2012-10-16 03:25:07 -07:00
James Chen b51ff47ed7 Updated mozjs.lib and mozjs.dll for win32 port. Built with Release mode. 2012-10-16 18:24:00 +08:00
wenbin1989 5cfff102ad fix bug in android CocosDenshion 
the method called by JNI is moved from Cocos2dxActivity.java to
Cocos2dxHelper.java.
 2012-10-16 16:20:41 +08:00
wenbin1989 bb6a2c58de fix getDeviceModel bug in android CocosDenshion 
deviceModel must be used before release, otherwise it will cause
garbled character when getDeviceModel sometimes.
 2012-10-16 16:10:14 +08:00
johnangel a2e1400402 Merge remote branch 'upstream/gles20' into gles20 2012-10-16 08:42:30 +02:00
johnangel cc8b2556a9 Revert accidentally deleted submodule 2012-10-16 08:33:25 +02:00
James Chen fddd1eceeb Merge pull request #1460 from dumganhar/gles20 
fixed #1510: Application will freeze when 'numberOfCellsInTableView' returns zero.
 2012-10-15 20:32:56 -07:00
James Chen fb657f674d fixed #1510: Application will freeze when 'numberOfCellsInTableView' returns zero. 2012-10-16 11:31:04 +08:00
minggo f96e558b66 Merge pull request #1459 from folecr/jenkinsscript 
Add capability to generate pull requests
 2012-10-15 18:40:41 -07:00
folecr a22c84d3d1 Update examples and documentation 2012-10-15 16:30:03 -07:00
folecr b109c75cef cd to submodule directory for git operations on submodule 
* instead of using the --git-dir and --git-worktree options
 * cd-ing to the submodule directory seems to behave differently
 * ... and more reliably
 2012-10-15 16:26:01 -07:00
folecr ae90c09666 Fix order of git operations 2012-10-15 15:58:44 -07:00
folecr 689ceec780 Generate pull requests 
* Commit changes to generated branch of cocos2d-x repo instead of gles20
 * Generate pull request from the generated branch to the specified base
 2012-10-15 15:58:31 -07:00
folecr 93b5667ffe Exit on error except in the one case where a non-zero return value is expected 2012-10-15 14:27:54 -07:00
folecr 5780f0aabd Diff with origin/master 
* rather than the default - HEAD
 2012-10-15 13:23:44 -07:00
James Chen 27dba63d9b Merge pull request #1458 from dumganhar/gles20 
Updated AppDelegate of SampleGame for iOS port.
 2012-10-15 03:51:45 -07:00
James Chen deed3ddc33 Updated AppDelegate of SampleGame for iOS port. 2012-10-15 18:50:46 +08:00
James Chen 133047e021 Merge pull request #1457 from dumganhar/gles20 
Using UIInterfaceOrientationLandscapeLeft and UIInterfaceOrientationLandscapeRight for TestCpp iOS project.
 2012-10-15 03:10:13 -07:00
James Chen d3ddbb6c10 Using UIInterfaceOrientationLandscapeLeft and UIInterfaceOrientationLandscapeRight for TestCpp iOS project. 2012-10-15 18:09:24 +08:00
James Chen 2f98efeba7 Merge pull request #1456 from dumganhar/gles20 
Update to latest generated bindings.
 2012-10-15 02:32:41 -07:00
James Chen c202671636 Update to latest generated bindings. 2012-10-15 17:31:25 +08:00
minggo 2ded8ea034 Merge pull request #1442 from dumganhar/iss1486-multi-res 
Multiresolution support
 2012-10-15 02:15:21 -07:00
johnangel 8d0dc8d2a7 Windows Touch support for desktop 2012-10-15 10:39:42 +02:00
minggo bafb77272f Merge pull request #1455 from folecr/jenkinsscript 
Updated auto-generation script
 2012-10-15 01:04:28 -07:00
James Chen a6b57f7d79 Merge pull request #1451 from micahli/gles20 
fixed #1508: Potential observer array modification while it's traversed in CCNotificationCenter.
 2012-10-14 22:50:47 -07:00
folecr d2ed5567b7 Test for diffs in existing files 
* before proceeding with committing and pushing changes
 * remove "set -e" so that above test makes sense
 * verbose git operations where possible
 2012-10-14 22:23:31 -07:00
folecr 4955c14928 Fix --git-dir parameter for git submodule operations 2012-10-14 22:12:24 -07:00
James Chen a65f13defe issue #1486: Fix bugs for CCEditBox iOS port. 2012-10-15 13:01:36 +08:00
minggo 8f2f11a09d Merge pull request #1454 from minggo/font_label 
fixed #1491:remove dependency of FontLabel lib
 2012-10-14 21:05:51 -07:00
minggo 93d702e3cc fixed #1491:remove dependency of FontLabel lib 2012-10-15 12:03:15 +08:00
micahli c69a11296e fix the potential Container iterator bug with CCNotification 
revert last fix which may contain other bugs
 2012-10-15 09:55:37 +08:00
minggo 67383ff7ce Merge pull request #1453 from shinriyo/patch-2 
getDelta() is delta function
 2012-10-14 18:34:03 -07:00
minggo 5663f18989 Merge pull request #1449 from folecr/updategeneratedsubmodule_1350060509 
Update to latest generated bindings
 2012-10-14 18:29:53 -07:00
minggo eadbbf6928 Merge pull request #1447 from minggo/android-effect 
use SoundPool.OnLoadCompleteListener to play effect if it is not preloaded
 2012-10-14 18:29:35 -07:00
James Chen 39a4af57cc issue #1486: Using relative position for ActionsTest and Box2dView. 2012-10-14 22:21:57 +08:00
James Chen 0e76827b7e issue #1486: Commenting one line to avoid something like mosaic in 'CCControlExtensionTest', especially the display of 'huePickerBackground.png' when in 800*480 window size with 480*320 design resolution and hd(960*640) resources. 2012-10-14 22:03:23 +08:00
shinriyo 1569550528 getDelta() is delta function 
I'm sorry, I mistook the pull request.
 2012-10-14 21:20:31 +09:00
James Chen 2c670a9efc issue #1486: Fix a bug in CCRenderTexture.cpp about calculate width and height by multiply CC_CONTENT_SCALE_FACTOR(). 2012-10-13 18:19:37 +08:00
walzer 084fe2d081 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-10-13 17:46:32 +08:00
micahli 7d1d46ee3f fix a bug with CCNotificationCenter that observer->performSelector(observer) may call CCNotificationCenter::removeObserver and cause CCARRAY_FOREACH(m_observers, obj) access invalid address 2012-10-13 16:44:46 +08:00
James Chen 6cf602ea3b issue #1486: CCDirector::getWinSizeInPixel return 'winSize* CC_CONTENT_SCALE_FACTOR()'. This change fixes the wrong display bug in CCRenderTexture. 2012-10-13 10:18:03 +08:00
folecr 2ac7a5cbe4 microlattice : updating submodule reference to latest autogenerated bindings 2012-10-12 09:48:37 -07:00
minggo 8b650794e6 Merge pull request #1445 from minggo/gles20 
make TestJavascript work on iOS
 2012-10-12 02:47:55 -07:00
minggo 0a39fa8bef fixed #1507: use SoundPool.OnLoadCompleteListener to play effect if it is not preloaded 2012-10-12 17:43:43 +08:00