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

154 Commits

Author SHA1 Message Date
Rohan Kuruvilla 0378a97fa0 Adding sending of filelist when reset is pressed on iOS 2013-04-25 18:41:18 -07:00
Rohan Kuruvilla 7bd3f2a260 Fixing resolution handling for iOS and Android 
1. Adding iPhone5 support
2. Changing Android resolution management based on DPI (Tablet mode or Phone mode)
3. Modifying distribution of xlarge,large,medium,small and xsmall assets to do it properly
4. Using kResolutionFixedWidth (kResolutionFixedHeight for landscape games) to properly calculate aspect ratio
5. Tested on all iOS devices and Nexus 4 (which is correctly identified as Retina phone)
 2013-04-25 18:41:14 -07:00
Rohan Kuruvilla f95b802866 Adding rudemntary support for Rotation in Android 2013-04-25 18:41:01 -07:00
Rohan Kuruvilla bb91f1eb30 Adding rudementary support for Rotation in iOS 2013-04-25 18:40:56 -07:00
Rohan Kuruvilla d8c30e0c5b Adding log redirect over the network for iOS. Also fixing Stop command crash in Android 2013-04-25 18:39:51 -07:00
Rohan Kuruvilla e6fc611346 Commiting out orientation change code. was causing gl errors with landscape games 2013-04-25 18:39:47 -07:00
Rohan Kuruvilla 9b86791eef Adding CocosPlayer for iOS 2013-04-25 18:39:43 -07:00
James Chen 7bd1d8cde1 Updating cocos2d-js-tests. 2013-04-25 16:16:39 +08:00
James Chen 9913358dde Updating TestJavascript project configuration. 2013-04-25 14:31:11 +08:00
James Chen 631b08e984 Updating project configuration for iOS. 2013-04-25 11:30:35 +08:00
James Chen f129b94e2d Removing unused file(uthash.h) in JSB projects. 2013-04-19 11:09:02 +08:00
James Chen 41b0345e9c Removing unused file (uthash.h) in Project.pbxproj. 2013-04-18 13:52:25 +08:00
minggo 78d3c7f048 fixed #1613:not reload resources on Android platform after return from background 2013-04-17 15:34:57 +08:00
Rohan Kuruvilla 3d7e8f0d84 Fixing CocosPlayer AppDelegate to include openGL bindings. Also adding JNI stubs for changing orientation 2013-04-09 15:29:35 -07:00
James Chen ec7a2f4c5c fixed #1944: The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore. 2013-04-02 11:35:55 +08:00
James Chen 374024cefd Updating JS Test. OpenGLTest works ok now. 2013-03-28 16:58:36 +08:00
James Chen 4220fd4ca5 fixed #1936: Updating project configuration for TestJavascript. 2013-03-28 16:55:23 +08:00
James Chen 201dc74ecb fixed #1936: Updating obfuscate.xml. 2013-03-28 16:54:49 +08:00
James Chen b6556bd41f fixed #1936: Updating the obfuscated file, game.js in TestJavascript. 2013-03-28 16:54:18 +08:00
Rohan Kuruvilla 57fd3cdb9c Modifying JS files to load OpenGL bindings. Also modify AppDelegate and Project files and generator template 2013-03-27 23:59:29 -07:00
Rohan Kuruvilla 596acfda09 Adding all CocosPlayer Android resource folders for CCB and updating to latest version 2013-03-25 01:28:13 -07:00
Rohan Kuruvilla 6b428aa3eb Updating CocosPlayer to latest version. Includes following changes: 
1. Adding support for changing orientation
2. Updating communication protocol to latest CocosPlayer protocol. Including UUID and filelist messages
3. Fixing unzipping of ccb files to maintain proper directory structure
 2013-03-25 01:24:24 -07:00
James Chen 54bd3c1925 Updating JSTest. 2013-03-22 15:11:56 +08:00
James Chen 0faeb5da5e Merge branch 'jsb_obfuscate' of https://github.com/walzer/cocos2d-x into walzer-jsb_obfuscate 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2013-03-22 14:12:38 +08:00
walzer 9371bbf799 roll back samples/Javascript/Shared to the ref before. 2013-03-22 12:10:21 +08:00
walzer 42c73fb820 Fixed #1841, obfuscated js source can run on iOS correctly now. 2013-03-22 12:06:04 +08:00
fape e9343c2d8a - update README files 
- format javascript sample README files like cpp samples
 2013-03-21 16:04:53 +01:00
fape 77207ea494 Remove "-o igncr" from CocosPlayer Android Eclipse project 2013-03-21 15:05:02 +01:00
walzer c52bbec5bc add icons into TestJavascript.xcodeproj 2013-03-21 20:50:21 +08:00
walzer 6f41b7c4ea Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into jsb_obfuscate 2013-03-21 17:37:28 +08:00
walzer d1e2cf8b4c remove jsb_*_.js from compile list 2013-03-21 17:35:36 +08:00
walzer a590a27606 update submodule samples/Javascript/Shared to the same ref ptr as master branch 2013-03-21 17:10:14 +08:00
walzer 67cda2bfd4 issue #1841, TestJavascript is obfuscated successfully 2013-03-21 16:55:55 +08:00
James Chen 668d3ce638 Updating TestJavascript.vcxproj and WatermelonWithMe.vcxproj. 2013-03-20 22:07:30 +08:00
minggo f33a8fe6f1 remove unsupported parameter in android 2013-03-20 15:37:16 +08:00
James Chen d68db7e873 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-03-20 15:19:30 +08:00
James Chen cf9c01cecf Updating JSTest, adding new resources. 2013-03-20 15:19:16 +08:00
James Chen 89c4f3a5ba Updating JSTest. 2013-03-20 14:58:36 +08:00
James Chen 46335a06b8 Updating JSTest 2013-03-20 14:50:20 +08:00
James Chen e728d5d6d0 Updating JS Test. 2013-03-20 14:45:39 +08:00
Rohan Kuruvilla 38f86acd23 Updating CocosPlayer AppDelegate files 2013-03-19 23:42:59 -07:00
walzer 582e35014f issue #1841, improve tools/closure-compiler/obfuscate.py to general usage, with input params 2013-03-19 23:53:01 +08:00
walzer 0d73934f5c issue #1841, TestJavascript-ios is obfuscated successfully 2013-03-19 17:21:01 +08:00
minggo 6577279ff7 Merge pull request #2200 from minggo/test-before-release 
delete parameter(-o igncr) when running build_native.sh in eclipse project
 2013-03-18 23:26:45 -07:00
minggo 0a8b4f923f delete parameter(-o igncr) when running build_native.sh in eclipse project 2013-03-19 13:48:32 +08:00
James Chen b4c52f9c5a Regenerating all resources with the latest CocosBuilder. 2013-03-19 13:05:17 +08:00
James Chen 3380c7cdca fixed #1838: Updating iOS project setting for CocosDragonJS. 2013-03-19 13:05:06 +08:00
James Chen 6a98553633 Synchronizing the submodule reference of cocos2d-js-test to the latest one. 2013-03-18 18:24:37 +08:00
minggo 58618172e6 merge pull request and fix some conflicts 2013-03-18 16:15:48 +08:00
minggo 19cf6665c4 Merge pull request #2176 from folecr/easierandroidbuild 
Improvements to android build setup and samples' build scripts
 2013-03-17 18:58:11 -07:00