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

8722 Commits

Author SHA1 Message Date
James Chen 407998619a Merge pull request #2517 from dumganhar/iss2105-travis 
fixed #2105: Adding Travis build support for linux and NaCl.
 2013-05-05 19:58:47 -07:00
James Chen fead37eab3 fixed #2105: Adding Travis build support for linux and NaCl. 2013-05-06 10:55:39 +08:00
James Chen f12d118cb9 Merge branch 'travis' of https://github.com/sbc100/cocos2d-x into sbc100-travis 2013-05-06 10:24:28 +08:00
minggo 26081961c4 Update AUTHORS 2013-05-06 10:20:20 +08:00
minggo cc3f75c789 Merge pull request #2516 from rtissera/ios43_jpeg_fix 
Fix iOS 4.3 JPEG loading (darken picture, alpha issue)
 2013-05-05 19:18:50 -07:00
Adrien Béraud 3661e34695 Bug fix: width and height reversed in CCSize operators 2013-05-05 19:51:44 +10:00
Romain Tisserand d2690d8942 Fix iOS 4.3 JPEG loading (darken picture, alpha issue) 2013-05-04 19:14:23 +02:00
Adrien Béraud 637cc1a9ed CCPoint::getDistance() implemented, CCPoint::length() renamed to getLength(), bug fixes 2013-05-05 02:58:46 +10:00
minggo 587dfb8e9f Update AUTHORS 2013-05-04 23:56:29 +08:00
minggo 1a0db3749e Merge pull request #2496 from mchinen/mchinensedit 
Fix missing protocol method warning for iOS 6.0 addition
 2013-05-04 08:55:07 -07:00
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