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

5677 Commits

Author SHA1 Message Date
walzer 926ed0a2f7 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-10-18 17:26:53 +08:00
minggo fa044d3cee Merge pull request #1472 from wenbin1989/gles20 
Fix stack overflow in CCLog
 2012-10-18 01:57:27 -07:00
James Chen a66e44848a Merge pull request #1473 from dumganhar/iss1516-fps-size 
fixed #1516: The font size of labels for displaying FPS,SPF,DrawCount is  incorrect in different design resolutions.
 2012-10-18 00:54:59 -07:00
James Chen 549dd92d8e fixed #1516: The font size of labels for displaying FPS,SPF,DrawCount is incorrect in different design resolutions. 2012-10-18 15:53:08 +08:00
wenbin1989 29a63a3b0f Fix stack overflow in CCLog 2012-10-18 14:39:56 +08:00
minggo d68f7c76f6 Merge pull request #1471 from minggo/iss1466-shader-test 
reloading shader when coming to foreground
 2012-10-17 20:03:22 -07:00
minggo 501ceb21eb fixed #1466:restore shader when comming to background 2012-10-18 11:00:44 +08:00
minggo b6426f01ff fixed #1466:restore shader when comming to background 2012-10-18 10:39:56 +08:00
minggo bfa7991a94 fixed #1466:restore shader when comming to background 2012-10-18 10:15:46 +08:00
James Chen 1e45a72db0 Merge pull request #1469 from dumganhar/gles20 
fixed #1511: Changed '#if(WINVER >= 0x0601)' to '#if(_MSC_VER >= 1600)'.
 2012-10-17 18:56:25 -07:00
James Chen c1ab8a6ead fixed #1511: Changed '#if(WINVER >= 0x0601)' to '#if(_MSC_VER >= 1600)'. 2012-10-18 09:54:24 +08:00
James Chen cfb1f11d44 Merge pull request #1467 from dumganhar/gles20 
Fix a bug about calculating client area on win32.
 2012-10-17 01:53:45 -07:00
James Chen 9f7019e48c Updated a comment. 2012-10-17 16:52:09 +08:00
James Chen 5ab37c86b2 Fix a bug about calculating client area on win32. 2012-10-17 16:50:07 +08:00
James Chen 7f97041b49 Merge pull request #1466 from dumganhar/gles20 
Fix a bug about wrong touch area for windows.
 2012-10-17 00:39:44 -07:00
James Chen 249ef92697 fix a bug about wrong touch area for windows. 2012-10-17 15:38:03 +08:00
James Chen 08507dba31 Merge pull request #1465 from dumganhar/iss1511-glframebuffer-check 
issue #1511: fixes as follows:
[1] OpenGL framebuffer access violation fix
[2] Fixing include paths to be able to compile cocos2d-x using external Visual Studio solution
[3] Application built in release mode will get writable directory in system disk.
[4] Multi-Touch support for win7/8 tablet or ultrabook.
 2012-10-17 00:22:08 -07:00
James Chen 3f7b79fb08 issue #1511: Rename some static variables. 2012-10-17 15:14:34 +08:00
James Chen 2779b4f1ab Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into johnangel 2012-10-17 15:08:25 +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
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