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

9266 Commits

Author SHA1 Message Date
minggo 8b627aee8c Merge pull request #2511 from ricardoquesada/xcode_warnings 
updates Xcode project to detect more warnings
 2013-05-04 08:29:52 -07:00
savdalion bade1f086d Added example for russian language in TestCpp / LabelTest / BMFontUnicode. 2013-05-04 15:28:24 +03:00
savdalion 5f549dd011 Added const modifier for classes CCArray, CCObject - fine code! 2013-05-04 15:05:06 +03:00
Adrien Béraud 6fb586028e Revert unrelated change commited by mistake 2013-05-04 17:20:59 +10:00
Adrien Béraud b9fe35901a Moved most CCPointExtension functions to CCPoint OO-equivalents 2013-05-04 17:18:22 +10:00
Ricardo Quesada ea30d21799 updates Xcode project to detect more warnings 2013-05-03 11:59:44 -07:00
Michael Chinen d47759cc32 EAGLView.mm: fix indent 2013-05-03 19:46:58 +09:00
Adrien Béraud b34dc25346 Cleaner constructors and overloads for CCSize; Cross-assignement and conversion constructors between CCPoint and CCSize. 2013-05-03 13:24:52 +10:00
Adrien Béraud b627cd4674 overloading operators +-*/ in CCPoint 2013-05-02 15:13:03 +10:00
Adrien Béraud 9fb0081add direct constructor for CCPoint 2013-05-02 14:59:50 +10:00
minggo f7053d0f9d Update AUTHORS 2013-05-02 09:20:52 +08:00
minggo c1992a5abc Merge pull request #2500 from DarraghCoy/add_ccdirector_poptoscenestacklevel 
Add CCDirector::popToSceneStackLevel(int level)
 2013-05-01 18:17:38 -07:00
minggo cd6d74f8b1 Update AUTHORS 2013-05-02 09:07:01 +08:00
minggo df242a15a9 Merge pull request #2503 from minggo/evalString 
fixed #2099:fixed a bug in ScriptingCore::evalString not setting the out...
 2013-05-01 18:04:21 -07:00
minggo 0c721096ec fixed #2099:fixed a bug in ScriptingCore::evalString not setting the outval 2013-05-02 09:03:24 +08:00
James Gregory 737d51a05b Merge branch 'emscriptenate' of github.com:j4m3z0r/cocos2d-x into emscriptenate 
Conflicts:
	Emscripten.TODO
	cocos2dx/proj.emscripten/cocos2dx.mk
	external/chipmunk/proj.emscripten/Makefile
	samples/Cpp/TestCpp/proj.emscripten/Makefile
 2013-05-01 13:45:15 -07:00
James Gregory 675bf53a4e Add missing files to testcpp makefile 2013-05-01 13:33:56 -07:00
James Gregory ddbdae1988 Point Emscripten root to be the external referenced by the tree. 2013-05-01 13:33:56 -07:00
James Gregory c885822527 Use floats instead of doubles for Chipmunk. 2013-05-01 13:33:56 -07:00
James Gregory d1c76886ec Enable texture cache on Emscripten. Not sure yet if this is the best balance, since we're both short on memory *and* compute time. 2013-05-01 13:33:56 -07:00
James Gregory 227b357241 Compile Chipmunk as C++ rather than C so that calling from C++ code works under Emscripten. 2013-05-01 13:33:56 -07:00
James Gregory 19b67bc843 Add missing file from CocosDenshion. 2013-05-01 13:33:56 -07:00
James Gregory ff50c4e1fe Add myself to authors so folks know who to blame :) 2013-05-01 13:33:56 -07:00
James Gregory 7a4be17724 Interval test working now also -- update TODO. 2013-05-01 13:33:56 -07:00
James Gregory a7bcf33889 Add missing fonts to TestCpp makefile, fixing layertest. 2013-05-01 13:33:55 -07:00
James Gregory afa4283644 Updated TODO list 2013-05-01 13:33:55 -07:00
James Gregory c2711f32ee Add missing assets from TestCpp's Makefile 2013-05-01 13:33:55 -07:00
James Gregory 0eb12121c6 Add libtiff to Emscripten builds, plus some build flags. 2013-05-01 13:33:55 -07:00
James Gregory cb9c5688b2 Add libtiff build -- build with straight emconfigure, emmake, with a troublesome assert removed (assert(sizeof(uint64) == 8)). 2013-05-01 13:33:55 -07:00
James Gregory 4f9c14e06e Add missing assets from "Extentions" to TestCpp. 2013-05-01 13:33:55 -07:00
James Gregory be26883e2b Set orientation to 0 for Emscripten, thus avoiding a segfault. 2013-05-01 13:33:55 -07:00
James Gregory c92d4acbba Switch to O1 for now. 2013-05-01 13:33:55 -07:00
James Gregory 57a25c495a Remove LOG prefixes from emscripten makefiles 2013-05-01 13:33:55 -07:00
James Gregory da8cea4b0c Remove lua samples from emscripten makefile 2013-05-01 13:33:55 -07:00
James Gregory 11ad9db8e8 Updates to my TODO list. 2013-05-01 13:33:55 -07:00
James Gregory 03ed7ff772 Move to a separate Makefile for Emscripten. 2013-05-01 13:33:55 -07:00
James Gregory 93238572df Fix the ordering of vertex attributes for CCProgressTimer. 2013-05-01 13:33:55 -07:00
James Gregory 7a30b0e446 Implement primitive drawing methods for Emscripten 2013-05-01 13:33:54 -07:00
James Gregory 7bc1a200bf Move emscripten build to a separate Make target, remove Lua targets which I haven't tried to build. 2013-05-01 13:33:54 -07:00
James Gregory 3d6b073ea4 Enable -O2 optimization now that Emscripten seems to succeed. 2013-05-01 13:33:54 -07:00
James Gregory bd915513c2 Delete tmp directory after generating data file. 2013-05-01 13:33:54 -07:00
James Gregory f2d433b028 Bump Emscripten version 2013-05-01 13:33:54 -07:00
James Gregory 3c14d57a09 Rebuild libfreetype without references to my home dir in it. 2013-05-01 13:33:54 -07:00
James Gregory ae260785ae Correct the resolution in main.cpp for TestCpp for Emscripten 2013-05-01 13:33:53 -07:00
James Gregory b032fc2d61 Remove -DLINUX from Emscripten chipmunk makefile 2013-05-01 13:33:53 -07:00
James Gregory dafd1e6ceb Add note on origin of libxml binary. 2013-05-01 13:33:53 -07:00
James Gregory e58fff202e Don't set animation interval on emscripten builds since that is driven by the request frame API. 2013-05-01 13:33:53 -07:00
James Gregory 9033dd011e Add libxml2 build for Emscripten. 2013-05-01 13:33:53 -07:00
James Gregory 056ff5b5e6 Remove redundant -l flags from emscripten build -- it doesn't have fontconfig, and GL stuff is linked in automatically. 2013-05-01 13:33:52 -07:00
James Gregory a7a7b3c919 Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it. 2013-05-01 13:33:52 -07:00