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

1294 Commits

Author SHA1 Message Date
Darragh Coy d64603a856 Attempt to fix the linux build. 2014-04-08 22:29:40 -07:00
Darragh Coy 14b210a082 RefPtr<T> - add move semantics 
Add support for move semantics to the RefPtr<T> class. Implement a move constructor and a move assignment operator.
 2014-04-08 11:34:27 -07:00
Darragh Coy 440a0adcde Whoops... Shouldn't remove the test cpp. 2014-04-08 10:40:32 -07:00
Darragh Coy a34b952e8d Revert "Fix Android build for RefPtr addition." 
This reverts commit 586383a05e.
 2014-04-08 10:35:55 -07:00
Darragh Coy 586383a05e Fix Android build for RefPtr addition. 2014-03-26 16:30:04 -07:00
Darragh Coy 036dc5542c Add cocos2d::RefPtr<T> 
This class which acts a smart pointer type class for cocos2d::Ref objects. Can be used to help automate memory management and remove manual retain/release calls from code, resulting in less code and less chance of errors. Also useful to implement the RAII idiom in certain scenarios, ensuring that an object gets released upon exiting a scope.
 2014-03-26 15:30:15 -07:00
James Chen 2c616fc9da Merge pull request #6005 from flashjay/develop 
remove deprecated code in lua tests & template
 2014-03-26 20:12:10 +08:00
faryang-rmbp 491dc202df remove deprecated code in lua tests & template 2014-03-26 19:42:07 +08:00
James Chen 849d7b9109 Merge pull request #5996 from chengstory/AddNewCreateNodeWay 
Adding support of using CCComRender as parent for attached component
 2014-03-26 18:20:34 +08:00
zhangcheng 58a61d94fb add use CCComRender as parent for attaching component 2014-03-26 16:39:32 +08:00
James Chen 22fdbbb198 Merge pull request #5980 from Dhilan007/develop_label2 
Refactor implementation of label's shadow and fixed stroke was not 'outside stroke' for Label generated by 'Font name'
 2014-03-26 16:32:04 +08:00
andyque 876f643bc4 issue #4401, fix a typo 2014-03-26 16:00:55 +08:00
James Chen 21ba509a35 Merge pull request #5989 from dumganhar/iss4559-ios-64bit 
closed #4559: Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
 2014-03-26 15:27:57 +08:00
James Chen c1faad7e2c Warning fixes in SocketIOTest.cpp/ FileUtilsTest.cpp. 2014-03-26 15:04:45 +08:00
andyque 57d8f155df issue #4401. resolve conflicts 2014-03-26 14:54:50 +08:00
minggo a374241f65 Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes 
Windows Phone 8,0 cocos2d-x 3.0  changes
 2014-03-26 13:58:46 +08:00
James Chen 7a8db8271f Merge pull request #5930 from andyque/Branch_issue4429 
closed #4429: Boolean value could not be written to specified plist file
 2014-03-26 11:46:56 +08:00
Dhilan007 1247760d95 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs 
Conflicts:
	cocos/2d/CCLabel.cpp
 2014-03-26 11:15:48 +08:00
Ricardo Quesada 473a6b19ee Upgrades to Chipmunk 6.2.1 2014-03-25 10:37:35 -07:00
James Chen f6c6d428ad Merge pull request #5926 from andyque/fix_tests_warnings 
issue #4401, remove warnings under win32
 2014-03-25 18:17:42 +08:00
zhangbin 36892c3a98 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue2880 2014-03-25 16:21:41 +08:00
zhangbin d6ad9274c4 closed #2880, Generate mipmap for the texture has mipmaps when reload textures. 2014-03-25 16:19:34 +08:00
Dhilan007 674dffce21 Merge branch 'develop-label-stroke' of https://github.com/dumganhar/cocos2d-x into develop_label_fixs 2014-03-25 16:10:47 +08:00
James Chen 34245d4bd0 Merge pull request #5953 from dumganhar/merge5934 
closed #4541: [ui] Removed Widget::addNode, added ProtectedNode.
 2014-03-25 15:46:56 +08:00
minggo 3fc15e5e7d Merge pull request #5896 from splhack/remove_nativeactivity 
Remove NativeActivity
 2014-03-25 15:37:12 +08:00
CaiWenzhi 2dffcb9808 Add ProtectedNode and remove "addNode" 2014-03-25 14:28:58 +08:00
James Chen 32f647d38b Merge pull request #5940 from boyu0/iss4513_particle_readd_bug 
closed #4513: Particle doesn't animate when it was removed and re-added to another node.
 2014-03-25 14:05:12 +08:00
James Chen 8d28884c9f Merge pull request #5806 from Dhilan007/develop_reImplementationWithLabel 
issue #3821: Uses new label instead of LabelTTF in engine.
 2014-03-25 13:46:17 +08:00
James Chen 5625c98443 Merge pull request #5942 from Dhilan007/develop_label2 
label: 1) change default value of anchor point to Middle.
2) Shadow offset and outline size passed to new Label consider 'contentScaleFactor'
 2014-03-25 11:39:53 +08:00
boyu0 289e632a40 closed #4513: change 1.0 to 1.0f to avoid the warning. 2014-03-25 11:36:35 +08:00
Dhilan007 a3b83d68b2 update test case. 2014-03-25 11:10:48 +08:00
Dhilan007 b074890b57 update test case 2014-03-25 10:57:44 +08:00
Kazuki Sakamoto 3fba61f384 Remove NativeActivity 2014-03-24 19:57:29 -07:00
Dale Stammen 04b529d328 fixed use of nullptr in variable args for wp8 2014-03-24 15:09:24 -07:00
boyu0 1520f85b32 closed #4513: fix titles. 2014-03-24 18:20:11 +08:00
boyu0 759ec61639 closed #4513: Particle doesn't animate when readd it. 2014-03-24 18:08:55 +08:00
James Chen a2d00c8f95 Adds another test for stroke. 2014-03-24 17:39:23 +08:00
James Chen 99b65f0a7c LabelTest , changed stroke color to blue. 2014-03-24 17:05:24 +08:00
andyque 4a974e24df revert vcxproj files 2014-03-24 10:50:48 +08:00
andyque f5795c25b6 remove warnings under win32 2014-03-24 10:12:40 +08:00
Dale Stammen 62e45b37f9 disabled console for wp8/winrt. Don't quit app for winrt/wp8 2014-03-22 06:17:34 -07:00
Dale Stammen 912d316ae5 use ResolutionPolicy::SHOW_ALL for winrt/wp8. disabled console for wp8/winrt 2014-03-22 06:16:43 -07:00
Dale Stammen 0d4ae12f1e disables webp tests for wp8 and winrt 2014-03-22 06:15:45 -07:00
Dale Stammen 2a13bbccc9 disabled network tests for wp8/winrt until networking code is added 2014-03-22 06:15:18 -07:00
Dale Stammen 4c03c526c1 added missing virtual. disabled console for wp8/winrt until networking code is added 2014-03-22 06:14:44 -07:00
Dale Stammen 4df55dc6ee no mp3 support for wp8. Added define for .wav 2014-03-22 06:14:03 -07:00
Dale Stammen 44e6efea64 #pragma mark for ios and mac only 2014-03-22 06:08:05 -07:00
Dale Stammen b50a158b62 need to terminate variable args list with NULL. nullptr will not work with wp8 compiler 2014-03-22 06:04:36 -07:00
James Chen cecc00c650 Merge pull request #5893 from Dhilan007/develop_label 
closed #4489: Label: Refactoring relevant functions of setting text color.
 2014-03-21 14:52:55 +08:00
James Chen 6340547fc5 Merge pull request #5900 from heliclei/fix-test-memory-leak 
fix memory leak in CocosDenshionTest.
 2014-03-21 11:21:04 +08:00