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

16531 Commits

Author SHA1 Message Date
Ricardo Quesada 04460750b8 culling working for both 2d and 3d projections 2014-02-23 01:09:52 -08:00
Ricardo Quesada fe1160cd8c changes in API to support 3D 2014-02-22 19:16:42 -08:00
Ricardo Quesada 94977930b5 Merge pull request #5437 from ricardoquesada/autoculling 
Autoculling
 2014-02-22 17:56:25 -08:00
Ricardo Quesada f37c606c4e removes unsued function 
keeps the code cleaner
 2014-02-22 17:55:03 -08:00
Ricardo Quesada 8ca746af17 Implements AABB culling for sprites 2014-02-22 17:47:56 -08:00
James Chen e133556268 Update CHANGELOG [ci skip] 2014-02-21 19:18:24 +08:00
James Chen e9c1335084 Merge pull request #5434 from Dhilan007/develop_label 
closed #3758:fixed character will not aligned on the the baseline when label using distance field.
 2014-02-21 18:29:47 +08:00
Dhilan007 821c8a73bc closed #3758:fixed character will not aligned on the the baseline when label using distance field. 2014-02-21 18:09:52 +08:00
James Chen 7493f6aeea Update CHANGELOG [ci skip] 2014-02-21 16:25:06 +08:00
James Chen 3c82c1a0b0 Update CHANGELOG [ci skip] 2014-02-21 16:21:29 +08:00
James Chen dc64504043 Update CHANGELOG [ci skip] 2014-02-21 13:53:32 +08:00
James Chen 3885772e5f Merge pull request #5263 from boyu0/iss2920_voice_recognition_input_crash_on_ios7 
closed #2920: fix bug: voice recognition input crash on ios7
 2014-02-21 13:46:31 +08:00
James Chen 7a7972b7d4 Merge pull request #5432 from CocosRobot/update_cocosfiles_1392955706 
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
 2014-02-21 12:45:45 +08:00
CocosRobot 6ab2547028 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-21 04:08:27 +00:00
James Chen ac59006ee5 Merge pull request #5431 from dumganhar/develop 
closed #4107: Director::setAnimationInterval could not work on Mac platform
 2014-02-21 11:58:36 +08:00
James Chen c3a77f8779 Merge pull request #5430 from CocosRobot/updategeneratedsubmodule_1392954528 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-21 11:57:58 +08:00
James Chen c5bf3950bc closed #4107: Director::setAnimationInterval could not work on Mac platform. Also removed unused files (CCDirectorCaller.h/.mm). 2014-02-21 11:55:37 +08:00
CocosRobot 2eadbefaeb [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-21 03:48:50 +00:00
James Chen 81d4525a6a Update AUTHORS [ci skip] 2014-02-21 11:40:13 +08:00
James Chen 30c479220f Update CHANGELOG [ci skip] 2014-02-21 11:39:07 +08:00
James Chen 1ce8f0ed82 Merge pull request #5428 from dumganhar/iss4106-vector-eraseObject 
closed #4106: Object which isn't in Vector would also be released when invoking Vector::eraseObject.
 2014-02-21 11:37:12 +08:00
James Chen d92e995f8c Merge pull request #5361 from Dhilan007/develop_label 
issue #3821: LabelBMFont re-implemented as a wrapper of Label.
 2014-02-21 11:36:23 +08:00
James Chen b300cfa1d2 issue #4106: Updates comments for 'Vector::eraseObject' 2014-02-21 11:30:55 +08:00
James Chen c6b2b86fe5 closed #4106: Object which isn't in Vector would also be released when invoking Vector::eraseObject. 
Also refactored 'Vector::eraseObject':
1) Removed 'toRelease' parameter, Vector class should manage reference count.
2) Added 'removeAll' parameter to decide wether to remove all elements with the same value or just the first occurrence .
3) Added relevant UnitTest for 'Vector::eraseObject'.
 2014-02-21 11:24:37 +08:00
James Chen 2eb1c1bb73 issue #4106: Ref class's constructor should be protected. 2014-02-21 11:21:08 +08:00
Dhilan007 d0e640d966 remove CC prefix. 2014-02-21 09:59:43 +08:00
Dhilan007 54f48b23e6 LabelBMFont re-implemented as a wrapper of Label. 2014-02-20 22:33:52 +08:00
James Chen 97a6ac65d3 Merge pull request #5424 from heliclei/console-autotest 
testcpp autotest:support next, back and restart test via console
 2014-02-20 22:22:55 +08:00
James Chen 0e154a2bec Merge pull request #5425 from dumganhar/develop 
closed #2535: TouchScriptHandlerEntry will release twice lua reference
 2014-02-20 21:59:33 +08:00
James Chen 68eaa746ea closed #2535: TouchScriptHandlerEntry will release twice lua reference 2014-02-20 21:58:20 +08:00
heliclei e64a647563 testcpp autotest:support next, back and restart test via console 2014-02-20 21:49:13 +08:00
James Chen 7277046ba8 Merge pull request #5423 from dumganhar/develop 
closed #4104: Crash if invoking Array::initWithObjects()
 2014-02-20 21:45:51 +08:00
James Chen 23082c0d6c closed #4104: Crash if invoking Array::initWithObjects() 2014-02-20 21:44:40 +08:00
James Chen 30d100296a Merge pull request #5422 from dumganhar/develop 
Added virtual and override keywords to Scene::init() method
 2014-02-20 21:37:46 +08:00
James Chen 0b6858bdde Added virtual and override keywords to Scene::init() method 2014-02-20 21:37:01 +08:00
James Chen 4cb0d336be Merge pull request #5421 from CocosRobot/updategeneratedsubmodule_1392901877 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-20 21:12:38 +08:00
CocosRobot 6f2f35ab7a [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-20 13:11:20 +00:00
James Chen abbc22b8fb Merge pull request #5420 from dumganhar/develop 
Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5058
 2014-02-20 21:04:47 +08:00
James Chen b06a98b8ee Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5058 2014-02-20 21:01:52 +08:00
James Chen 32383a7cfd Update CHANGELOG [ci skip] 2014-02-20 20:46:14 +08:00
James Chen 3168c87bdd Update AUTHORS [ci skip] 2014-02-20 20:45:34 +08:00
James Chen 0658355772 Merge pull request #4415 from HoGarfield/WsThreadHelper 
closed #4103: Potential crash when websocket connection closes
 2014-02-20 20:44:55 +08:00
James Chen 9d4f378116 Merge pull request #5417 from CocosRobot/update_cocosfiles_1392899613 
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
 2014-02-20 20:35:38 +08:00
James Chen 182d67f2b6 Update AUTHORS [ci skip] 2014-02-20 20:35:25 +08:00
CocosRobot b88ade5534 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-20 12:33:34 +00:00
James Chen e59a14f205 Merge pull request #5058 from zhiqiangxu/develop 
ScrollView should implement ActionTweenDelegate
 2014-02-20 20:33:04 +08:00
James Chen 4016d9074f Update AUTHORS [ci skip] 2014-02-20 20:30:46 +08:00
James Chen 95143da782 Merge pull request #4990 from daltomi/debug 
closed #4102: Uses 'cbegin/cend', 'const std::string' where it's reasonable.
 2014-02-20 20:29:56 +08:00
James Chen ee0fd8ea57 Update AUTHORS [ci skip] 2014-02-20 20:25:46 +08:00
James Chen 450d30b164 Merge pull request #5040 from martell/mingwclang 
closed #3809: Added clang support for Windows
 2014-02-20 20:24:36 +08:00