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

969 Commits

Author SHA1 Message Date
James Gregory ac2986139a Copy resources in HelloCpp makefile 2013-05-06 20:59:47 -07:00
James Gregory 749c92a572 Basis of Makefile for SimpleGame sample. 2013-05-06 20:59:47 -07:00
James Gregory 297f0fb0ac Add resources to TestCpp makefile 2013-05-06 20:59:47 -07:00
James Gregory 130ab4b584 Disable libcurl tests for Emscripten. 2013-05-06 20:59:47 -07:00
James Gregory 51d42d7392 Add index.html for SimpleGame and TestCpp. Set resolution on all canvases to 800x500 to match code. 2013-05-06 20:59:47 -07:00
James Gregory aa2739a109 Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html 2013-05-06 20:58:45 -07:00
James Gregory 9d6db6953e Instruct Emscripten to emit .html file for HelloCpp sample. 2013-05-06 20:58:45 -07:00
James Gregory 5a23190672 Add main.cpp files for app samples 2013-05-06 20:58:43 -07:00
James Gregory c45e5797cf Add Makefiles for Emscripten + Emscripten external 2013-05-06 20:58:02 -07:00
minggo 923234a095 Merge pull request #2399 from gelldur/linking_errors_linux_lub_curl 
Fixing linking errors for TestCPP with libcurl
 2013-05-06 20:52:58 -07:00
minggo 80dfd4d493 Merge pull request #2407 from sergey-shambir/attribute_format 
Added __attribute__(__format__()) for CCLog and CCString
 2013-05-06 20:06:52 -07:00
minggo 73dba9ef2c Merge pull request #2514 from savdalion/extend-tests 
Added example for russian language in TestCpp / LabelTest / BMFontUnicode
 2013-05-05 23:52:30 -07:00
James Chen f12d118cb9 Merge branch 'travis' of https://github.com/sbc100/cocos2d-x into sbc100-travis 2013-05-06 10:24:28 +08:00
savdalion bade1f086d Added example for russian language in TestCpp / LabelTest / BMFontUnicode. 2013-05-04 15:28:24 +03:00
Darragh Coy 212feb8d8c Add CCDirector::popToSceneStackLevel(int level) 
This replicates a change made to cocos2d-iphone in the following commit:
59c5272bff

The cocos2d-iphone change was originally discussed in the following pull request:
http://github.com/cocos2d/cocos2d-x/pull/2210
 2013-04-30 23:33:22 +01:00
Sam Clegg 924d271410 Fix warnings. 2013-04-29 16:46:48 -07:00
minggo 55e4de40f6 make AssetsManagerTest and TestLua run on iOS device 2013-04-28 11:19:03 +08:00
minggo cd0cf6eee9 Merge https://github.com/cocos2d/cocos2d-x 2013-04-27 18:30:41 +08:00
James Chen 52efa87b69 Updating JS-Test. 2013-04-27 17:59:22 +08:00
minggo afb91e752d include cocos2d.h to make android template work 2013-04-27 17:16:27 +08:00
James Chen 50255d772e [CocoPlayer] Small fix for iOS project. 2013-04-27 17:15:57 +08:00
James Chen 8f6a271b54 Merge branch 'cocosplayer' of https://github.com/rohankuruvilla/cocos2d-x into rohankuruvilla-cocosplayer 2013-04-27 16:55:29 +08:00
minggo 651a42beaf set design resolution for WatermelonWithme 2013-04-27 14:54:53 +08:00
James Chen 7f70a4c6e8 Merge pull request #2474 from dumganhar/bb-fixes 
Some fixes for Blackberry port.
 2013-04-26 23:48:12 -07:00
James Chen 0d18032f38 [Blackberry] Adding the resources of TestCpp for TestLua. 2013-04-27 14:41:30 +08:00
James Chen 6f5970491e [Blackberry] Adding resources for TestLua. 2013-04-27 14:17:14 +08:00
James Chen edc8444ca4 Updating blackberry project configurations. 2013-04-27 14:07:54 +08:00
minggo de60057621 Merge pull request #2472 from minggo/master 
disable depth test for clipping test
 2013-04-26 20:34:38 -07:00
minggo fa0370bba5 disable depth test for clipping test 2013-04-27 11:33:23 +08:00
minggo 9f7d091e95 Merge pull request #2470 from minggo/master 
disable menutest in lua
 2013-04-26 20:18:23 -07:00
minggo ff207b68e0 disable menutest in lua 2013-04-27 11:17:10 +08:00
James Chen 5b45f85216 [HelloLua] print ~> cclog 2013-04-27 09:48:35 +08:00
Rohan Kuruvilla d7020a7ab2 Adding new status messages for Android 2013-04-26 13:47:26 -07:00
Rohan Kuruvilla 8209fa56a2 Fixing bug where screen rotate would keep creating new NSD services 2013-04-26 13:47:26 -07:00
Rohan Kuruvilla eb85a6c1fb Handle evalScript from JNI. Also adds helpers for settings status 2013-04-26 13:47:25 -07:00
Rohan Kuruvilla 615329eee5 Add evalScript over the network code and force portrait mode on stop 2013-04-26 13:47:25 -07:00
Rohan Kuruvilla 374c456749 change orientation to Portrait on CCB Stop 2013-04-26 13:47:25 -07:00
Rohan Kuruvilla ece710c4d8 Adding eval script wrapper for ScriptingCore to AppDelegate 2013-04-26 13:41:15 -07:00
minggo d40fdd24b7 fixed #2075:add SpiteTest into Android.mk 2013-04-26 14:02:13 +08:00
minggo 89591fdccc fixed #2084:add lua loader for all platforms 2013-04-26 12:12:19 +08:00
minggo 62231912be Merge https://github.com/cocos2d/cocos2d-x 2013-04-26 10:36:46 +08:00
Rohan Kuruvilla c12268bd70 Modifying little log statements 2013-04-25 18:44:59 -07:00
Rohan Kuruvilla 56a1ba9e42 Removing unneeded code 2013-04-25 18:41:58 -07:00
Rohan Kuruvilla e2edc04946 Fixing handling starting and stopping of NSD service in Android 2013-04-25 18:41:53 -07:00
Rohan Kuruvilla 8a59680175 Removing onSurfaceChange update since it was being executed after ccb_run. This resulted in frame size being changed after game was running (bug) 2013-04-25 18:41:48 -07:00
Rohan Kuruvilla 188f0354f3 Fixing configChanges flag to disable GL context being deleted on rotate 2013-04-25 18:41:43 -07:00
Rohan Kuruvilla b1f9dd30e7 Using iOS specific text entry for setting pairing code 2013-04-25 18:41:38 -07:00
Rohan Kuruvilla 76f334797d Refactoring applicationDidFinishLaunching. Also adding scaling for large non-retina Android tablets 2013-04-25 18:41:33 -07:00
Rohan Kuruvilla 2636bafd0c Fixing network logging for Android and iOS 2013-04-25 18:41:29 -07:00
Rohan Kuruvilla cecb157f22 Fixing rotation for iOS 2013-04-25 18:41:24 -07:00