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

17390 Commits

Author SHA1 Message Date
CaiWenzhi d608a9e98f Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-05 17:14:27 +08:00
CaiWenzhi 7a4ba91f29 Modify project file 2014-03-05 17:08:59 +08:00
minggo d06d105520 Merge pull request #5564 from minggo/install 
make setup script smart
 2014-03-05 17:07:18 +08:00
heliclei 55080d713b refactor string tag to name 2014-03-05 17:03:25 +08:00
minggo 3099faa47b make setup script more smart 2014-03-05 17:00:07 +08:00
CaiWenzhi ab47cafb31 Merge branch 'develop' into develop_nutty_modify_framework_for315 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/gui/UIButton.cpp
	cocos/gui/UIButton.h
	cocos/gui/UIWidget.h
 2014-03-05 16:52:31 +08:00
Dhilan007 dfdf19daff remove unused shader and also did adjust FontAtlas::getTexture 2014-03-05 16:51:16 +08:00
minggo 40d9e78f5a Merge pull request #5563 from lihex/develop 
update submodule
 2014-03-05 16:16:38 +08:00
lihex 389811d9e5 update submodule 2014-03-05 16:14:56 +08:00
boyu0 b0414a88ed Delete Box2DView::tick() method. 2014-03-05 15:55:08 +08:00
Dhilan007 23501b40aa issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline 2014-03-05 15:54:40 +08:00
James Chen 12415a2579 Update CHANGELOG [ci skip] 2014-03-05 15:40:28 +08:00
boyu0 8a4f16fec6 Move Box2dTestBed step method to onDraw 2014-03-05 15:40:16 +08:00
James Chen b1a8334ec7 Merge pull request #5553 from natural-law/develop 
Solve the bug: debug frames are not shown in ChipmunkTest.
 2014-03-05 15:37:20 +08:00
James Chen 06cd98076a Merge pull request #5560 from dumganhar/develop 
Some warning fixes in cpp-tests.
 2014-03-05 15:26:56 +08:00
James Chen b2cf78bd51 Update CHANGELOG [ci skip] 2014-03-05 15:26:14 +08:00
James Chen 20146c3ecb Merge pull request #5558 from Dhilan007/develop_label 
close #4276:fixed crash on CocoStudioGuiTest->LabelBMFontTest.
 2014-03-05 15:24:36 +08:00
James Chen 8e28400725 Some warning fixes in cpp-tests. 2014-03-05 15:04:47 +08:00
James Chen 9652da06f8 Merge pull request #5554 from koowolf/#5550_win 
closed #4278: Upgrading kazmath to the latest version.
 2014-03-05 14:58:24 +08:00
James Chen 818cc1f71e Update CHANGELOG [ci skip] 2014-03-05 14:53:50 +08:00
James Chen ec70d067d7 Merge pull request #5556 from boyu0/v3.0_final_test 
Fix particle test->AddAndRemove test crash.
 2014-03-05 14:53:05 +08:00
Dhilan007 c3c3e12ee6 close #4276:fixed crash on CocoStudioGuiTest->LabelBMFontTest. 2014-03-05 14:41:59 +08:00
Huabing.Xu b866a16503 fix: shader RetroTest by using new label 2014-03-05 14:41:13 +08:00
boyu0 06faad7020 Fix partical test->add and remove particle system crash. 2014-03-05 14:32:22 +08:00
boyu0 e0de7efa8e Rename ActionManagerTest->RemoveTest to StopActionTest 2014-03-05 14:32:00 +08:00
koowolf 3365280a0a build kazmath on win32 2014-03-05 14:30:55 +08:00
Huabing.Xu 88c2c72cef Merge branch 'develop' into develop_fixControlSwitchBug 
* develop:
  Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE.
  Feature #4236: Refactor is/setFlipX/Y to is/setFlippedX/Y in gui classes
 2014-03-05 14:05:20 +08:00
Huabing.Xu 61ae219a5c fix: controlSwitch Bug 2014-03-05 14:03:44 +08:00
James Chen d1a0218a3b Merge pull request #5542 from pandamicro/myfix 
Feature #4236: Refactor is/setFlipX/Y to is/setFlippedX/Y in gui classes
 2014-03-05 12:45:41 +08:00
zhangbin 6462c0bfaf Solve the bug: debug frames are not shown in ChipmunkTest. 2014-03-05 11:41:46 +08:00
minggo 4fd7916e14 install.py -> setup.py 2014-03-05 11:33:11 +08:00
James Chen b2c13ee2e3 Merge pull request #5552 from dumganhar/develop 
Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE.
 2014-03-05 11:31:34 +08:00
James Chen 02572da9dc Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE. 2014-03-05 11:28:21 +08:00
minggo 574d8554e8 Merge pull request #5545 from lihex/develop 
add sln file
 2014-03-05 10:33:07 +08:00
James Chen 6404623be5 Merge pull request #5551 from samuele3hu/bug_fix 
fix:make TimerScriptHandler do nothing in the `cancel` function
 2014-03-05 10:21:23 +08:00
Ricardo Quesada 0d69617a6c Adds CC_DLL to kazmath for windows compatibility 2014-03-04 18:07:03 -08:00
samuele3 3edeba5001 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug_fix 2014-03-05 09:52:37 +08:00
samuele3 53851151d9 fix:TimerScriptHandler can’t do anything in the `cancel` function 2014-03-05 09:51:57 +08:00
Ricardo Quesada aa4248ae10 kazmath updates for templates 2014-03-04 17:29:48 -08:00
Ricardo Quesada 4b57d41fd2 updates templates for Linux 2014-03-04 17:27:37 -08:00
Ricardo Quesada f269ec1f8f Compiles on Linux 2014-03-04 17:24:04 -08:00
Ricardo Quesada c63f210e26 Compiles on Android 2014-03-04 16:59:39 -08:00
Ricardo Quesada 4fe3b16287 Updates to latest version of kazmath 2014-03-04 16:33:00 -08:00
Ricardo Quesada bf1413e71f Merge pull request #5549 from ricardoquesada/changelog_updates 
Updates CHANGELOG with GLProgram changes
 2014-03-04 15:01:33 -08:00
Ricardo Quesada cdab088fc5 Updates CHANGELOG with GLProgram changes 2014-03-04 15:01:02 -08:00
Ricardo Quesada 273a42a234 Merge pull request #5548 from ricardoquesada/glprogram_api_fixes 
Glprogram api fixes
 2014-03-04 14:38:32 -08:00
Ricardo Quesada 0bbc1cf5c3 fixes more warnings 2014-03-04 14:00:32 -08:00
Ricardo Quesada 7ac663e02c GL Program API fixes 2014-03-04 13:51:43 -08:00
CaiWenzhi 353f6fb42c Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-05 01:09:51 +08:00
lihex c4cad757c4 add sln file 2014-03-05 00:26:22 +08:00