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

3478 Commits

Author SHA1 Message Date
James Gregory 1e1c4156e7 Switch to using GL_DYNAMIC_DRAW. 2013-04-08 22:08:44 -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 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
James Gregory 47ed9c663a Switch to slot-based GL buffer loading code for CCSprite. 2013-04-08 19:16:22 -07:00
James Gregory b5a458fa3a Add missing Makefile reference to file utils for Emscripten. 2013-04-08 19:14:58 -07:00
James Gregory fbe36bb3c8 Increase heap size for Emscripten binaries, add in missing linkages. 2013-04-08 19:14:25 -07:00
James Gregory 61bc858360 Add pre-build dependencies for Emscripten libpng, libz. 2013-04-08 19:12:04 -07:00
James Gregory c50861aa1a Hack: use 800x500 resolution for window for emscripten so that mouse roughly lines up. 2013-04-08 19:10:29 -07:00
James Gregory bc3f5c9854 Enable texture caching with emscripten. 2013-04-08 19:10:12 -07:00
James Gregory 3e5acf992b Fix Motion streak client side buffers 2013-04-08 19:09:38 -07:00
James Gregory 09b7f165d2 Add platform files for Emscripten. 2013-04-08 18:21:53 -07:00
James Gregory f42254125f Get CCGrid to work. 2013-04-08 17:51:30 -07:00
James Gregory 662b8b595f Add method to CCNode class to allow uploading data to GPU. Call it from CCSprite. 2013-04-04 22:20:59 -07:00
James Gregory f675bb43a3 Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html 2013-04-04 22:19:39 -07:00
James Gregory 520832c1ed Build fixes for emscripten, add linkage to libfreetype.a 2013-04-03 21:43:31 -07:00
James Gregory 5f7ec9342b Remove freetype source and add libfreetype.a as built by the Emscripten test-suite. 
Revert "Add freetype 2.4.11 to repo"

This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-04-03 21:40:02 -07:00
James Gregory eefaae3413 ifdef tango around some symbols that aren't defined in Emscripten (nor a bunch of other platforms, it seems). 2013-04-03 18:30:40 -07:00
James Gregory 30e3111bec Add #defines for Emscripten platform 2013-04-03 18:28:27 -07:00
James Gregory ea88b3701f Add Makefiles for Emscripten + Emscripten external 2013-04-03 18:26:55 -07:00
Romain Tisserand 15d4e75cdb JNI fixes, added missing JNIEXPORT / JNICALL declarations 
This is needed if compiling with custom visibility settings (example :
-fvisibility=hidden)
 2013-04-02 22:15:12 +02:00
minggo 3d0a5e52c6 Merge pull request #2267 from nickveri/master 
Added some missing function for setting integer shader uniforms in CCGLProgram
 2013-04-01 19:52:11 -07:00
Darragh Coy 7f565bb2fa Fix CCUserDefault.cpp compiling on Android. 
CCUserDefault.cpp shouldn't compile on Android.
 2013-03-31 22:24:10 -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 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
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
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
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
minggo 949700ca1a issue #1848:use CCConfiguration::supportsPVRTC() to determine if the device support powertc format 2013-03-21 15:50:41 +08:00
James Chen e2e9bc8ce0 Fixing memoryleaks. 2013-03-21 09:00:55 +08:00
minggo 406ea3f69d Merge https://github.com/cocos2d/cocos2d-x into test-before-release 2013-03-20 15:19:19 +08:00
James Chen 9336ab710f fix a logic error and a memory leak in CCLabelBMFont. 2013-03-20 13:55:43 +08:00
minggo 9afc6729dc fix build error caused by libcurl on android x86 2013-03-20 11:53:19 +08:00
James Chen ac509f70db [iOS] Using system font by `[UIFont systemFontOfSize]` when font name wasn't found. 2013-03-19 13:11:33 +08:00
James Chen f52e56be20 Merge pull request #2184 from dumganhar/iss1837-jsb-schedule 
fixed #1837: Refactoring schedule binding codes.
1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since schedules need to be associated with _schedFunc_target_ht and _schedObj_target_ht.
2) Bind cc.Scheduler.unscheduleCallbackForTarget.
 2013-03-18 00:35:33 -07:00
James Chen f57a751a48 fixed #1837: Refactoring schedule binding codes. 
* 1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since `schedules` need to be associated with _schedFunc_target_ht and _schedObj_target_ht
* 2) Bind cc.Scheduler.unscheduleCallbackForTarget.
 2013-03-18 15:29:53 +08:00
minggo ac2a52e71b modify version 2013-03-18 11:25:27 +08:00
Andre Rudlaff a1602a992b fontcache map is now static, as we do not need external linkage for it. 2013-03-15 17:54:24 +01:00
Andre Rudlaff d3ecb09c9b Merge branch 'master' into feature-linux-fontcache 2013-03-15 08:54:15 +01:00
James Chen 9a5116e406 Merge pull request #2167 from Weeds/feature-linux-fontdimensions 
fixed #1834: [Linux] fixed font rendering artifacts, added simple line break.
This patch fixed the size calculations for true type fonts (especially for
italic fonts)
Additinally a very simple greedy line break algorithm has been added for
true type labels.
 2013-03-14 19:35:20 -07:00