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

7798 Commits

Author SHA1 Message Date
Rohan Kuruvilla f945f4efd6 Adding the generator config file. Includes CCGLProgram, CCShaderCache classes 2013-03-27 23:59:30 -07:00
Rohan Kuruvilla 1d89b137ed Adding new Javascript bindings for OpenGL to cocos2d-x. Modifying bindings generated in cocos2d-iphone 2013-03-27 23:59:29 -07: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
James Chen 4e37161c7a Update AUTHORS 2013-03-28 10:10:01 +08:00
James Chen 32cee20feb Merge pull request #2271 from Weeds/fontdimension-fix 
fixed #1932: [Linux] fixed font rendering crash for certain fonts.
 2013-03-27 19:08:54 -07:00
Andre Rudlaff 89f08bb441 [Linux] fixed font rendering crash for certain fonts 
face->size->metrics->ascender seems to be unreliable for some fonts,
additionally the freetype documentation says that it may be used
differently for different fonts.
Therefore it may happen that the ascender of a font face is less then
the glyphs bounding box resulting in accessing invalid memory.

The fix is to use the bbox attribute instead of the ascender
 2013-03-28 00:54:11 +01:00
nickveri fd35ebd4d4 Added support for setting integer uniforms 2013-03-26 18:20:38 +00:00
James Chen dccaedd20d Merge pull request #2265 from dumganhar/master 
Adding LabelTest.lua. Three tests in LabelTest works ok.
 2013-03-26 03:19:28 -07:00
James Chen 8c5f278d06 Updating mainMenu.lua 2013-03-26 18:18:37 +08:00
James Chen 567e1fa15f Adding LabelTest.lua. Three tests in LabelTest works ok. 2013-03-26 18:14:14 +08:00
James Chen 166ffbd218 Update AUTHORS 2013-03-26 10:12:44 +08:00
James Chen b9de14c8c7 Merge pull request #2261 from flaming0/gles20 
Null pointer check in order to prevent crashes.
 2013-03-25 19:11:07 -07:00
flamingo 4a313e0ffe Update CCLuaEngine.cpp 
Null pointer check in order to prevent crashes.
 2013-03-26 00:24:47 +04:00
James Chen 092eb30d06 Merge pull request #2259 from rohankuruvilla/ccbreader 
fixed #1861: CocosPlayer Android update.
 2013-03-25 02:10:43 -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 83c7874a7a Merge pull request #2258 from dumganhar/master 
Removing one line unused code in PerformanceNodeChildrenTest.cpp
 2013-03-24 23:31:30 -07:00
James Chen c9cdb81020 Removing unused codes. 2013-03-25 14:30:25 +08:00
James Chen f1a52c2df8 Update AUTHORS 2013-03-25 12:02:40 +08:00
James Chen 15d56f7f65 Merge pull request #2257 from dumganhar/master 
Fixing compilation errors when CC_ENABLE_PROFILERS is enabled.
 2013-03-24 20:58:46 -07:00
James Chen f7b2ca2125 Fixing compilation errors when enable CC_ENABLE_PROFILERS. 2013-03-25 11:47:27 +08:00
James Chen 92f278657e Merge branch 'fix_profiler_compile_error_android' of https://github.com/gelldur/cocos2d-x 
# 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-25 11:46:02 +08:00
James Chen 79f88fcf77 Update AUTHORS 2013-03-24 17:08:13 +08:00
James Chen 001769c985 Merge pull request #2252 from billy1380/master 
fixed #1856：Adding 64bit target for Mac project.
 2013-03-23 20:46:37 -07:00
billy1380 fc806d0496 added sample game xcode project for mac 2013-03-23 17:21:26 +00:00
billy1380 cdfe693583 - changed cocos2d mac project to support universal build and x86 
- fixed issues associated with that
 2013-03-23 16:04:51 +00:00
tianTian 9144946176 Fix bug: CCControl's touch priority is not set correctly; m_nDefaultTouchPriority is never used; 2013-03-23 12:18:00 +08:00
James Chen 636f07a43f Merge pull request #2243 from sbc100/fix_linux_build 
Fix linux compilation of CCTexturePVR.cpp
 2013-03-22 19:07:24 -07:00
Sam Clegg fe86b9d6df Fix linux compilation of CCTexturePVR.cpp 
On linux (and possibly other platforms)
GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG is simply not defined since we don't
include GLES/gl2ext.h.
 2013-03-22 10:40:35 -07:00
minggo 71659f4aa9 Merge pull request #2247 from hailongiPhone/master 
release && set nil
 2013-03-22 04:09:47 -07:00
James Chen e7c44ec77b Merge pull request #2248 from dumganhar/walzer-jsb_obfuscate 
Merging https://github.com/cocos2d/cocos2d-x/pull/2245 and updating JS Test.
 2013-03-22 00:21:02 -07:00
James Chen 54bd3c1925 Updating JSTest. 2013-03-22 15:11:56 +08:00
minggo 1538c72581 Merge pull request #2197 from dumganhar/ios-default-font 
[iOS] Using system font by `[UIFont systemFontOfSize]` when font name wasn't found.
 2013-03-22 00:10:09 -07:00
hailong 2ea447dbfd Update CCDirectorCaller.mm 
First destroy CCDirector instance with  cocos2d::CCDirector::sharedDirector()->end() 

Then create new CCDirector instance with
cocos2d::CCApplication::sharedApplication()->run();

APP will crash at 
CCApplication::setAnimationInterval

[[CCDirectorCaller sharedDirectorCaller] setAnimationInterval: interval ];
 2013-03-22 15:02:46 +08:00
Dawid Drozd 21cab34029 Fixing profiling compile error 2013-03-22 07:58:57 +01: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
James Chen 8bf7f96eef Merge pull request #2244 from dumganhar/master 
fixed #1855: std_string_to_jsval generates messy js string when passing non-ascii UTF8 std::string.
 2013-03-21 21:07:38 -07:00
walzer 42c73fb820 Fixed #1841, obfuscated js source can run on iOS correctly now. 2013-03-22 12:06:04 +08:00
James Chen d80d68f7e0 fixed #1855: std_string_to_jsval generates messy js string when passing non-ascii UTF8 std::string. 2013-03-22 12:01:08 +08:00
minggo 828b228239 Merge pull request #2239 from fape/android_eclipse2 
Eclipse Project import - Windows part 2
 2013-03-21 18:50:24 -07:00
fape 9c6a65d898 Update template android projects README files 2013-03-21 19:06:58 +01: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
minggo 61685762a8 Merge pull request #2236 from minggo/iss1848-pvrtc 
use CCConfiguration::supportsPVRTC() to determine if the device supports pvrtc format
 2013-03-21 02:22:08 -07:00
walzer 0a252aceaf update submodule scripting/javascript/bindings/generated to the same ref ptr as upstream/master branch. 2013-03-21 17:13:24 +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