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

5984 Commits

Author SHA1 Message Date
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
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
James Chen 32a9d51618 issue #1486: Commented some unused codes. 2012-10-12 17:37:49 +08:00
James Chen 36600d95b1 issue #1486: Calculate content scale factor by screen height. 2012-10-12 17:37:26 +08:00
James Chen 6178594068 issue #1486: Updated lua templates. 2012-10-12 16:19:33 +08:00
James Chen 04a4ebc571 issue #1486: Using relative coordinate for HelloLua. 2012-10-12 16:18:28 +08:00
James Chen 99a7dcefa4 issue #1486: Updated lua bindings. 2012-10-12 16:04:26 +08:00
James Chen 965540ecec issue #1486: fix a warning in CCAutoreleasePool.cpp. 2012-10-12 16:03:53 +08:00
James Chen f5abe422ea Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1486-multi-res 2012-10-12 15:50:11 +08:00
James Chen f928fb3dcb Merge pull request #1446 from dumganhar/win32-js-tests 
Updated TestJavascript project configuration for VS2008 & VS2010.
 2012-10-12 00:46:51 -07:00
James Chen 6fd24c469b Updated *.user for vs2010 & vs2008. 2012-10-12 15:45:57 +08:00
James Chen e876b997e7 Updated TestJavascript.vcproj 2012-10-12 15:42:00 +08:00
James Chen 21491317c0 Fix compilation errors. 2012-10-12 15:41:45 +08:00
James Chen a4e41c924d Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into surith-js-tests 2012-10-12 15:15:12 +08:00
James Chen 3b0a989200 Updated TestJavascript project configuration for VS2008 & VS2010. 2012-10-12 15:14:47 +08:00
minggo 572460e60a make TestJavascript work on iOS 2012-10-12 12:00:36 +08:00
minggo e2c734f7b3 Merge pull request #1444 from rohankuruvilla/gles20 
Adding JS bindings for additional Classes and functions
 2012-10-11 20:59:04 -07:00
James Chen 98aa5dd489 issue #1486: Updated AppDelegate.cpp and proj.win32/main.cpp. 2012-10-12 10:02:49 +08:00
James Chen e1c0ea761b issue #1486: Removed some unused codes, made it works on WINDOWS. 2012-10-12 09:58:42 +08:00
Rohan Kuruvilla eafd6ebf08 Fixing restart of context to not leak memory 2012-10-11 18:48:37 -07:00
Rohan Kuruvilla e7ac758b9f Updating bindings to match cocos2d-html5 2012-10-11 18:45:22 -07:00
Rohan Kuruvilla 0c1c5a432d Adding support to pass array of CCPoints from JS 2012-10-11 18:44:46 -07:00
Rohan Kuruvilla 540b41c091 Fixing LabelAtlas to read texture relative to path of plist file 2012-10-11 18:44:46 -07:00
minggo 77f4469a1a Merge pull request #1443 from folecr/tests 
Run cocos2d-html5-tests on cocos2d-x
 2012-10-11 18:41:29 -07:00
folecr 36f8b31efc Define some helper functions and comment out references to chipmunk 2012-10-11 17:56:44 -07:00