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

9464 Commits

Author SHA1 Message Date
James Chen 6e9fcf8c05 fixed #2048: Adding test case for variable cell sizes in CCTableView. 2013-04-10 16:38:00 +08:00
James Chen 3f695d1934 Merge branch 'master' of https://github.com/SevInf/cocos2d-x into SevInf-master 2013-04-10 16:07:54 +08:00
James Chen 0c0cea791b Update AUTHORS 2013-04-10 15:54:00 +08:00
James Chen 862d4d6316 Merge pull request #2195 from folecr/androidlinkerflags 
fixed #2047: Clean up linked libraries for Android.
 2013-04-10 00:53:00 -07:00
James Chen d252cd4cff Update AUTHORS 2013-04-10 14:41:27 +08:00
James Chen 64fa434064 Merge pull request #2346 from dumganhar/iss2046-newlines 
fixed #2046: Stripping newlines from log message and fixing linux library location.
 2013-04-09 23:28:47 -07:00
James Chen 32406efec2 Merge branch 'newlines_in_cclog' of https://github.com/sbc100/cocos2d-x into sbc100-newlines_in_cclog 
Conflicts:
	cocos2dx/proj.linux/cocos2dx.mk
 2013-04-10 14:17:23 +08:00
James Chen 487b4f8a89 Merge pull request #2340 from rohankuruvilla/cocosplayer 
fixed #2045: Small fixes to CocosPlayer.
1)Fixing AppDelegate to include OpenGL bindings
2)Adding orientation change JNI stubs
3)Commenting out cache clean on receiving new zip file (was causing consistency issues)
4)Fixing bug where "Connected!" message was displayed on a different thread
 2013-04-09 23:07:24 -07:00
James Chen 223ff18c56 Update AUTHORS 2013-04-10 12:52:13 +08:00
James Chen 68867b8798 Merge pull request #2212 from rogerzanoni/linux_link 
fixed #2044: Fix linux build, libpthread and libGL libraries need to be linked on linux.
 2013-04-09 21:50:54 -07:00
James Chen 556cbaff23 Merge pull request #2345 from natural-law/master 
issue #1471 : Resolve the encoding bug in modifyAppMk.sh
 2013-04-09 21:01:18 -07:00
minggo 6bbf4517b7 Merge pull request #2344 from minggo/userdefault-hotfix 
fixed #2034:use previous path to get UserDefault.xml
 2013-04-09 21:00:34 -07:00
zhangbin 2d82c05547 issue #1471 : Resolve the encoding bug in modifyAppMk.sh 2013-04-10 11:54:25 +08:00
yodesoft e193dbc4cf Linux: Set writable path to "<user's home>/.config/<app name>" 2013-04-10 11:45:55 +08:00
minggo a0dc39ca38 fixed #2034:use previous path to get UserDefault.xml 2013-04-10 11:39:01 +08:00
minggo 2c24fdc5e5 Merge pull request #2342 from minggo/remove-libxml2 
fixed #2042: remove libxml2
 2013-04-09 20:36:33 -07:00
James Chen d45765ccc4 fixed #2043: Upgrading SpiderMonkey to Firefox20.0. 2013-04-10 11:19:43 +08:00
yodesoft d03b95ca46 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	cocos2dx/platform/linux/CCFileUtilsLinux.cpp
 2013-04-10 11:16:04 +08:00
yodesoft ba591b0980 Linux: Set writable path to "<user's home>/.config/<app name>" 2013-04-10 10:55:50 +08:00
minggo df888eef65 fixed #2042: remove libxml2 2013-04-10 09:56:31 +08:00
minggo f4d579edd3 Merge pull request #2341 from minggo/strip-libs 
Strip libs
 2013-04-09 18:45:31 -07:00
minggo 5d2c67ee8a fixed #1904:strip libcurl.a on x86 architecture 2013-04-10 09:40:44 +08:00
minggo 3c8b26813e delete libxml2 2013-04-10 09:39:48 +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 c7bbbeb751 Merge pull request #2337 from dumganhar/master 
Fixing a typo.
 2013-04-09 03:09:37 -07:00
James Chen 9c563a883f Fixing a typo. 2013-04-09 18:08:43 +08:00
James Chen 783e7492c6 Merge pull request #2335 from dumganhar/master 
Updating iOS template.
 2013-04-09 00:32:03 -07:00
James Chen 854944c272 Updating iOS template. 2013-04-09 15:30:37 +08:00
James Chen eecdf3ad82 Merge pull request #2334 from CocosRobot/updategeneratedsubmodule_1365490150 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-08 23:52:11 -07:00
CocosRobot 40c5280527 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-09 14:49:20 +08:00
James Chen 95a907aeac Merge pull request #2333 from dumganhar/master 
[PLUGIN] Removing the bindings glue codes for CCApplication since it was bound in cocos2dx.
 2013-04-08 23:48:29 -07:00
James Chen 90ad5410c7 [PLUGIN] Removing the bindings glue codes for CCApplication since it was bound in cocos2dx. 2013-04-09 14:46:49 +08:00
James Chen a2c71f8e89 Exposing CCApplication to js. 2013-04-09 14:42:12 +08:00
James Chen b8ea3dfe99 Merge pull request #2332 from dumganhar/master 
cxx-generator ~> bindings-generator.
 2013-04-08 22:58:04 -07:00
James Chen 6d57d691f5 Updating bindings-generator. 2013-04-09 13:56:45 +08:00
James Chen 0d5d2e54fd cxx-generator ~> bindings-generator. 2013-04-09 13:47:12 +08:00
folecr e91ec3ede5 Clean up linked libraries 
* LOCAL_LD_LIBS and LOCAL_EXPORT_LDLIBS are the same
 * Remove unused -lEGL
 2013-04-08 22:46:25 -07:00
James Chen ab0549b575 cxx-generator ~> bindings-generator for plugin. 2013-04-09 13:41:24 +08:00
James Gregory 1e1c4156e7 Switch to using GL_DYNAMIC_DRAW. 2013-04-08 22:08:44 -07:00
James Chen 59d8356eae Update AUTHORS 2013-04-09 12:57:07 +08:00
James Chen 55ec9de216 Merge pull request #2326 from harikrishnar/master 
fixed #2037: Major problem with initWithObjects method of CCArray.
 2013-04-08 21:50:33 -07:00
James Gregory 7fe7dee3c7 Remove debug print statement 2013-04-08 21:41:21 -07:00
James Gregory a807ee97d3 Switch makefile over to using Emscripten headers for freetype. 2013-04-08 21:09:53 -07:00
James Gregory 1ef5b398f9 List of things left to do to get Emscripten working 100%. Living document. 2013-04-08 21:09:21 -07:00
James Gregory d2eced4188 More client side buffer fixes. 2013-04-08 21:09:09 -07:00
James Gregory eca46e9bee More client side buffer fixes. 2013-04-08 21:08:34 -07:00
James Gregory b9d3bfd545 More client side buffer fixes. 2013-04-08 21:08:06 -07:00
James Gregory 77dda8c828 More client side buffer fixes. 2013-04-08 21:07:49 -07:00
James Gregory eac9fba261 Add warning messages if any of the raw primitive drawing methods are used (they seem not to be, in pratice). 2013-04-08 21:06:36 -07:00
James Gregory 1f457d4ac9 Add freetype2 headers that match the .a we're using. 2013-04-08 21:06:07 -07:00