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

5984 Commits

Author SHA1 Message Date
johnangel acac470f7b Fixing GPF when old OpenGL version is detected 2012-09-19 19:36:09 +02:00
James Chen e6ac547cfe Merge pull request #1344 from dumganhar/iss1470_cocosbuilder 
fixed #1470: Made CCBReader support cocosbuilder v2.1-beta0.
 2012-09-19 03:48:00 -07:00
James Chen 9fabf3a45b fixed #1470: Made CCBReader support cocosbuilder v2.1-beta0. 2012-09-19 18:41:50 +08:00
James Chen 3d3af08228 Merge branch 'iss1470_cocosbuilder' of https://github.com/minggo/cocos2d-x into iss1470_cocosbuilder 2012-09-19 18:20:03 +08:00
minggo 8cdf73640b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1470_cocosbuilder 2012-09-19 18:08:17 +08:00
minggo 2f3cdc6538 issue #1470:modify linux makefile and re-create xcode template 2012-09-19 18:05:10 +08:00
minggo 5e169eb0af issue #1470: put hd/ipad resources into corresponding directory 2012-09-19 17:54:45 +08:00
minggo ebe092661b issue #1470: modify mac project and delete unneeded files 2012-09-19 17:50:30 +08:00
minggo 4bff6927b8 issue #1470:re-publish ccb 2012-09-19 17:43:11 +08:00
nichos1983 16d3466f39 fix bug of not checking object before post notification 2012-09-19 15:28:36 +08:00
minggo 099726025e Merge pull request #1338 from folecr/refactor_scripting_core 
Refactor usage of javascript bindings...
 2012-09-18 23:04:13 -07:00
minggo 705ec7fc1e Merge pull request #1337 from FlowerpotGames/gles20 
MSVS and MAC project updates
 2012-09-18 23:00:15 -07:00
minggo 9db2df3f7b issue #1470:modify resources path 2012-09-19 09:40:02 +08:00
folecr 5d816bfaf6 Verbose logging of build process 2012-09-18 17:08:37 -07:00
folecr c6f06ddced Refer to cocos2dx.cpp from the generated subdirectory 2012-09-18 17:02:21 -07:00
folecr 60fd3c5b9c Remove generated files... 
* ... in favour of automatically generated bindings
 * ... in the generated/ subfolder.
 2012-09-18 17:02:21 -07:00
folecr 2c1c58eeb9 Update path calculation. 2012-09-18 17:02:21 -07:00
folecr 4c1fad1c6c chmod u+x genbindings.sh 2012-09-18 17:02:21 -07:00
folecr e6275f5f27 Update gitignore for tojs 2012-09-18 17:02:21 -07:00
folecr 8a688ef424 Script and config file for generating bindings 2012-09-18 17:02:21 -07:00
folecr f54566ac03 More robust script exits on errors and ... 
* Remove source build command (source repos for dependencies are not submodules)
 2012-09-18 17:02:01 -07:00
Ed Bartley e837cad67b Revert "ignore and android updates" 
This reverts commit 22dba972d0.
 2012-09-18 18:56:26 -04:00
Ed Bartley 8fbceacb92 Merge branch 'gles20' of github.com:FlowerpotGames/cocos2d-x into gles20 2012-09-18 18:45:16 -04:00
Ed Bartley 22dba972d0 ignore and android updates 2012-09-18 18:43:50 -04:00
Ed Bartley 925c21cdde Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20 2012-09-18 18:42:41 -04:00
Byung Choi 4a4ef87163 Fixes #1317 by http://gcc.gnu.org/wiki/Visibility 2012-09-19 04:59:33 +09:00
Byung Choi ad5836a3ca debug & release makefiles for cocos2dx, box2d, chipmunk, cocosdenshion 2012-09-19 04:42:57 +09:00
Nicolas Gramlich 48062e222d Reverted change in scripting/javascript/bindings/Android.mk. 2012-09-18 11:01:31 -07:00
Nicolas Gramlich cd4b22a503 Merge branch 'gles20-official' into patch-5 2012-09-18 10:50:15 -07:00
minggo 4bc5e9e415 issue #1470:fix more logical errors 2012-09-18 17:55:03 +08:00
moadib 6df8233b03 Fixed statement which works but incorrect from point of C++ rules applied to ternary operator and can cause compilation error on compiler different from MSVC 2012-09-18 13:15:05 +04:00
minggo 8832b8e78d issue #1470:set correct call back function for Funky animation 2012-09-18 17:13:31 +08:00
minggo a0feb5f289 issue #1470:fix some logical errors 2012-09-18 17:04:10 +08:00
Walzer d098c5900a Merge pull request #1333 from jzgenius/modify_template_by_viewController 
[template] modify AppController, add viewController & window variant. al...
 2012-09-17 19:36:18 -07:00
minggo 6e890c96a8 Merge pull request #1328 from donaldalanmorrison/gles20 
Minor English Spelling Corrections.  A few grammar corrections.
 2012-09-17 18:57:02 -07:00
jzgenius 19b22be52e [template] modify AppController, add viewController & window variant. all Xcode template modified. 2012-09-18 09:55:28 +08:00
jzgenius 4cfb3af682 Revert "[template] modify AppController, add viewController & window variant. all Xcode template modified." 
This reverts commit d92aa8805a.
 2012-09-18 09:53:18 +08:00
jzgenius d92aa8805a [template] modify AppController, add viewController & window variant. all Xcode template modified. 2012-09-17 20:59:11 +08:00
minggo 4b969e35c8 issue #1470:implement animation 2012-09-17 18:49:05 +08:00
dualface cf5f3dedc7 [Win32] disable CCTextureAtlas use VAO, some windows display adapter driver cannot support VAO 2012-09-17 17:58:21 +08:00
dualface ded6e3edcf Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-17 17:55:41 +08:00
minggo 0c4b5dd3e9 issue #1470:fix some crashes 2012-09-17 15:31:07 +08:00
dualface 44e5bdf7a8 restore CCDirector 2012-09-17 15:12:13 +08:00
Donald Alan Morrison 4cbd993091 Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
dualface eba97a9b1e [Lua] fix luabinding overloaded functions 2012-09-17 14:40:42 +08:00
minggo 0845e08fd3 issue #1470:update CCBReader to support Cocosbuilder v2.1 beta0 2012-09-17 14:27:17 +08:00
Andre Rudlaff 394b64d61f [linux] fixed font rendering artifacts 
This patch fixes the black pixels
around fonts when rendered using
CCLabelTTF.

see http://www.cocos2d-x.org/issues/706
This fix is for linux only, but may
be applied to other platforms as well
 2012-09-17 02:33:23 +02:00
Andre Rudlaff 44ccc40269 [linux] use fontconfig to select system fonts 
This patch removes the hardcoded font paths
from the linux project and uses fontconfig
to find the best match for a given font-family
The implementation also adds the possibility
to load a font file from the applications
resource directory
 2012-09-18 00:57:29 +02:00
Walzer 4673977c31 Merge pull request #1325 from walzer/gles20 
bug fix: CCString::stringWithContentsOfFile should call CCString::createWithContentsOfFile, but not CCString::create
 2012-09-16 01:27:20 -07:00
Walzer f475bcf102 CCString::stringWithContentsOfFile should call CCString::createWithContentsOfFile, but not CCString::create 2012-09-16 16:21:42 +08:00