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

27710 Commits

Author SHA1 Message Date
SunLightJuly 2b269aab53 update sub-module "cocos2d-console" 2015-02-25 10:45:36 +08:00
lvlong 7437bfad15 recover bundle3D. 2015-02-25 10:33:16 +08:00
minggo 0e303536f7 Merge pull request #10564 from SunLightJuly/v3_fix 
support packages manager
 2015-02-25 09:56:49 +08:00
minggo c2479adc59 Merge pull request #10549 from mogemimi/fix-typo 
Fix typo in Image::Format
 2015-02-25 09:32:58 +08:00
minggo c460a5bfa4 Merge pull request #10569 from MSOpenTech/v3-wp8-fix 
fixed conflict with near and far already  defined in windows.h for Win32, WP8 and WinRT
 2015-02-25 09:27:38 +08:00
Dale Stammen b39b078593 fixed conflict with near and far defined in windows.h for Win32, WP8 and WinRT platforms 2015-02-24 14:39:21 -08:00
SunLightJuly 4dd4e7d703 call function "register_all_packages()" in default template of cpp 2015-02-25 00:25:40 +08:00
SunLightJuly ec22923aa9 modifed AppDelegate.cpp: add function "register_all_packages()" to support packages manager 2015-02-24 20:50:58 +08:00
minggo 0d2566c202 Merge pull request #10520 from mannewalis/v3 
adding CC_DEPRECATE(version) macro
 2015-02-24 09:30:21 +08:00
minggo ffd6c0f57f Merge pull request #10561 from CocosRobot/update_cocosfiles_1424741224 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-02-24 09:27:29 +08:00
CocosRobot 92806f7919 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-24 01:27:05 +00:00
minggo e8e40f202b Merge pull request #10542 from sun-ray/v3 
CocosStudio Sprite3D Reader
 2015-02-24 09:24:45 +08:00
mogemimi d384f7ce1e Fix typo: unkown -> unknown 2015-02-24 02:39:50 +09:00
mogemimi 9e7ce0cd85 Fix typo in Image::Format 2015-02-24 02:36:20 +09:00
Ray bd64321e30 fix commit 2015-02-23 23:57:41 +08:00
Krishna Narasimhan 80ea81884b Source refactor. Corrected compile issue 2015-02-23 13:01:19 +01:00
Krishna Narasimhan 239a5f307f Sourcr Refactor. Abstracted common functionality from two jni methods and saved space/resources 2015-02-23 10:20:12 +01:00
Ray c5cc1ebaa2 fix test project 2015-02-23 16:35:46 +08:00
Mazyad Alabduljaleel 839f1a851d One more memory leak fix: 
When you get the allHeaderFields, the net retain count is 0, because it is autoreleased.
Then, a copy message is issued +1
After that the property itself retains it +1
Total = 2, released once in the dealloc -> leak.
 2015-02-23 11:52:49 +04:00
Mazyad Alabduljaleel a2f9956d00 Fix major memory leaks in iOS http request 
... and other small fixes

Brief:

1. In iOS, whenever you have a new spawned thread with its own run loop (i.e. while true), you must wrap it with an autorelease pool, so it cleans up the objects at the end of each loop cycle.
2. There were a few "alloc" and "new" objects that weren't released.
3. The HttpAsync class itself was missing dealloc, also property assignment should use `self.property` so the previous value gets released as appropriate.
4. Resolved a small warning

**NOTE**: I have a cocos2d-x game that heavily relies on the HTTP requests, with cookies, but without SSL, so I couldn't test the SSL.
I haven't tested the cookies and SSL yet, but for starters, these improvements are meant to fix the memory issues only, not the logic.
 2015-02-23 10:38:33 +04:00
Ray fbe9e5b767 complate project file 2015-02-23 00:52:50 +08:00
Ray e6242e26b8 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-02-23 00:48:45 +08:00
Ray 35e3e8d62d Sprite3D Reader and tests 2015-02-23 00:34:30 +08:00
Bruce 95ba69c868 fix ld error when building 2015-02-22 00:08:27 +08:00
Bruce 9c2ecafeb4 fix ld error when building 2015-02-21 23:56:05 +08:00
Bruce 871489ec2d fix ld error when building 2015-02-21 22:55:35 +08:00
Krishna Narasimhan 36be1ec24b Source refactor. Abstracted common functionalities from 4 onTouches methods in Camera3dTest 2015-02-21 11:39:26 +01:00
minggo a303142da5 Merge pull request #10532 from CocosRobot/update_cocosfiles_1424394857 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-02-20 09:15:09 +08:00
CocosRobot 2947fd95d6 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-20 01:14:18 +00:00
minggo 224b60f930 Merge pull request #10526 from sun-ray/v3 
CocosStudio 3DReader
 2015-02-20 09:13:05 +08:00
Ray 8eb201797d 工程文件修改 2015-02-19 17:52:50 +08:00
Ray 80a5b201f8 3DNode Reader lua Test 2015-02-19 17:28:51 +08:00
Ray 73e40f1c4b Node3DReader Test 2015-02-19 16:18:54 +08:00
Ray 2f01deee89 3D Editor Reader 
Node3DReader
 2015-02-19 12:08:09 +08:00
Jongryul Kook c05dd4357d Fixed HttpClient-ios request to work when the data is started by 0x00. 2015-02-18 16:51:12 +09:00
mannewalis 21dbc29ad1 adding CC_DEPRECATE(version) macro 2015-02-17 13:01:53 -08:00
minggo 1b482b2c3f Merge pull request #10516 from MSOpenTech/wp8-v3 
Added missing Particle3D files and tests to WP8 and Universal App projects
 2015-02-17 21:47:20 +08:00
minggo 6433c0feca Merge pull request #10512 from super626/particle_merge 
load all materials for linux
 2015-02-17 21:46:24 +08:00
Dale Stammen 0801160a37 added precompiled Particle3D shaders 2015-02-16 11:28:24 -08:00
Dale Stammen 76233d4c6e added missing Particle3D files and tests 2015-02-16 10:41:03 -08:00
Dale Stammen 795f65c85f added missing Particle3D files and tests 2015-02-16 10:01:09 -08:00
yangxiao a50efe998f fix compile 2015-02-16 11:57:07 +08:00
yangxiao bdd7da89a1 add header 2015-02-16 11:26:06 +08:00
yangxiao 6c73e22a32 variable name error 2015-02-16 11:18:54 +08:00
yangxiao 180cee96d8 Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 2015-02-16 10:04:53 +08:00
yangxiao 5c8fbcedab load all materials linux routine 2015-02-16 10:03:58 +08:00
minggo 16ac6c2709 Merge pull request #10510 from CocosRobot/update_cocosfiles_1424001603 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-02-15 20:02:24 +08:00
CocosRobot 83fed82923 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-15 12:00:05 +00:00
minggo 15c256c0c4 Merge pull request #10509 from CocosRobot/update_lua_bindings_1424001103 
[AUTO]: updating luabinding automatically
 2015-02-15 19:56:34 +08:00
CocosRobot 6a91450f7c [AUTO]: updating luabinding automatically 2015-02-15 11:53:55 +00:00