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

202 Commits

Author SHA1 Message Date
Ricardo Quesada 94ea94a113 global Z order uses floats 2014-01-21 16:36:19 -08:00
Ricardo Quesada b51b04f315 ActionsProgress test include fixes 2014-01-21 16:28:52 -08:00
Ricardo Quesada 06be466f29 Removed unused code and files. 
Making the mac platform easier to mantain
 2014-01-21 16:25:29 -08:00
Ricardo Quesada 98d23d30a6 First step in simplifying the mac platform 2014-01-21 15:44:01 -08:00
minggo 3e5fbb2422 issue #3713: remove Object::_autoReleaseCount 2014-01-20 17:08:22 +08:00
Ricardo Quesada cfbceb0e22 Fixes compilation issues on Linux 2014-01-16 21:49:14 -08:00
minggo 91b89fc647 Merge pull request #5083 from natural-law/android_bugs 
Solve some bugs on android
 2014-01-15 22:04:54 -08:00
zhangbin 3c816c3c85 closed #3723, Make sure the init method of Cocos2dxHelper only invoked once. 2014-01-16 11:26:23 +08:00
hbb 5ef9eef0ae use data.isNull() instead of !data.getBytes() 2014-01-16 10:09:04 +08:00
hbb 8fac676a82 add check data valid in getStringFromFile 
so far no check would be crashed when getData faild.
maybe return an empty string is better.
 2014-01-15 12:39:56 +08:00
Ricardo Quesada c267c479db Performance Test fixes 
* SpritePerfTest: 3 new tests added
* SpritePerfTest: random() always use the same seed
* SpritePerfTest: Fixed tests 8 and 9 on retina display machines
* Console: Added 3 new commands: 'config', 'fileutils dump', 'textures'
 2014-01-14 17:22:45 -08:00
James Chen cd1c408e6b Merge pull request #5054 from dumganhar/iss3698-retina-mac 
closed #3698: Wrong display when dragging window through retina and non-retina screen.
 2014-01-13 23:02:49 -08:00
James Chen 7e1fd18f76 FLT_MIN —> FTL_EPSILON. 2014-01-14 14:38:34 +08:00
Dhilan007 92d345156b un-define clash with the existing macro definition in platform/win32/CCStdC.h 2014-01-14 14:20:22 +08:00
James Chen 83a42dc760 closed #3698: Wrong display when dragging window through retina and non-retina screen. 2014-01-14 13:59:00 +08:00
Ricardo Quesada 9386866d56 cocos2d::log() moved to CCConsole 
Unified console code since it is 90% similar to all platforms
 2014-01-10 19:04:07 -08:00
Ricardo Quesada c68ad76bfe don't send "unknown command". 
... if the command is an empty command
 2014-01-10 18:11:35 -08:00
Ricardo Quesada 2316e4d55f Debug messages are forward to the console 2014-01-10 17:58:54 -08:00
James Chen 0088399d94 Merge pull request #5016 from akof1314/develop 
Support MinGW with CMake for TestCpp
 2014-01-09 23:13:19 -08:00
WuHuan 16367b7594 solve conflicted with math.h isnan 2014-01-10 14:20:00 +08:00
WuHuan 2f4b094598 Merge pull request #4 from cocos2d/develop 
update
 2014-01-09 02:56:21 -08:00
James Chen 2e4c76a5d7 closed #3644: Keyboard pressed events are being repeatedly fired before keyboard is released. 2014-01-09 18:34:35 +08:00
boyu0 e34ef0d38f change initialization _data from 0 to nullptr. 2014-01-09 16:33:31 +08:00
boyu0 e063755596 fix Image crashes in mac when load tag file 2014-01-09 15:26:05 +08:00
WuHuan 1cd68accc1 Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop 2014-01-08 17:03:44 +08:00
WuHuan 954ee61022 testcpp mingw 2014-01-08 16:58:36 +08:00
WuHuan 668c4b83ef Merge pull request #3 from cocos2d/develop 
update
 2014-01-08 00:44:40 -08:00
Daniel T. Borelli 1d435a3e8e const correctness: use cbegin/cend, const std::string 2014-01-07 18:02:31 -03:00
walzer 64af0de648 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
Dhilan007 5b317196c8 fix TextInput not show IME on android. 2014-01-06 11:45:18 +08:00
WuHuan e972c97dcf support mingw 2014-01-04 14:40:22 +08:00
James Chen 973adc6b2f Updates nativeactivity.cpp. 2013-12-31 10:55:59 +08:00
James Chen cf006df9ff closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
minggo 3760cddf49 Merge pull request #4705 from Dhilan007/failed_dispatch_receive 
fix failed to receive dispatch signal on some android device
 2013-12-27 04:33:30 -08:00
Dhilan007 b319cb58ac fix failed to receive dispatch signal on some android device,such as [HTC EVO 3D X515m]. 2013-12-27 18:05:48 +08:00
minggo ec3b3ea012 Merge pull request #4696 from dumganhar/warning-fix 
Some warning fixes on linux.
 2013-12-27 01:56:47 -08:00
James Chen febc19ea8d Some warning fixes on linux. 2013-12-26 23:06:16 -08:00
Dhilan007 861925e752 fix compiling error in vs project on win7. 2013-12-27 14:38:22 +08:00
boyu0 f2e18f32a9 fix android compile error 2013-12-25 13:57:17 +08:00
boyu0 62fc889a54 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string 
Conflicts:
	cocos/2d/platform/CCFileUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCImageCommon_cpp.h
	cocos/2d/platform/CCSAXParser.cpp
	cocos/2d/platform/CCSAXParser.h
 2013-12-25 10:41:37 +08:00
James Chen 81d073aff0 Reverts FileUtil::getFileData to virtual function. 2013-12-24 16:29:55 +08:00
boyu0 6e6ccbd5f9 change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
boyu0 3344c5243c change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
James Chen 9e05f300f3 [Data Refactor] compilation error fix. 2013-12-20 21:16:46 +08:00
James Chen 21a9f05110 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor 
Conflicts:
	cocos/2d/CCUserDefault.cpp
	cocos/2d/CCUserDefault.mm
	cocos/2d/CCUserDefaultAndroid.cpp
	cocos/2d/ZipUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCSAXParser.cpp
 2013-12-20 21:12:11 +08:00
James Chen e54c993918 Merge pull request #4564 from dmurtagh/UserDefault_GetDouble_Fix_For_Android 
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
 2013-12-20 00:13:05 -08:00
James Chen 58772d7dec const love in CCFileUtils.cpp. 2013-12-20 10:11:41 +08:00
James Chen 34382b4a8a More std::for_each —> for(const auto& …) 2013-12-20 09:54:50 +08:00
Ricardo Quesada 59fee6b8d2 replaces std::for_each with for() 
replaces `std::for_each` with C++11 `for( : )`
 2013-12-19 13:34:41 -08:00
Damien 52c66a678c Fixed non-functioning default value for CCUserDefault::getDoubleForKey() 
- defaultValue was not being passed into the JNI CallStaticDoubleMethod
method previously.
-  CCUserDefault::getDoubleForKey() would return undefined garbage when
the key doesn’t exist.
Test Case:
Call the following from anywhere in your code (in release
configuration). X will be garbage.
Call the following from your code:
double x =
CCUserDefault::sharedUserDefault()->getDoubleForKey("Some-Non-existant-k
ey-1234", 0);
CCLOG("x = %4.2f", x);

Fix Tested on Android. Affects Android only.
 2013-12-19 12:32:51 -08:00
boyu0 d0b039ceda fix compile errors. 2013-12-18 22:44:03 +08:00
boyu0 71be55a9aa revert AccelerometerSimulation.m 2013-12-18 19:02:49 +08:00
boyu0 e07c4ffec1 Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
James Chen 2892e8be3f Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData. 2013-12-18 14:58:17 +08:00
Lee, Jae-Hong 2807e785c0 fix CCImage bug on android platform. 
- android.graphics.Bitmap bytes are aleady RGBA
- delete swapAlphaChannel and swapAlpha
 2013-12-15 21:07:55 +09:00
Dhilan007 abef5b59fa fix compile error for vs project 2013-12-10 21:20:52 +08:00
boyu0 083a0eea2a Remove all std::move in function returns. 2013-12-10 16:06:05 +08:00
minggo 368647c166 Merge pull request #4444 from minggo/fix-warning 
fix some warnings
 2013-12-06 01:07:03 -08:00
minggo fa7c97171b fix some warnings 2013-12-06 16:32:06 +08:00
minggo 0126aaa205 Merge pull request #4442 from minggo/use-schedule 
use Schedule::performFunctionInCocosThread
 2013-12-05 22:30:54 -08:00
minggo 19c86c0e4f Merge pull request #4434 from martell/msys2 
Msys2 and Mingw added fixed x64 cocos/audio on Windows for MSVC and MinGW
 2013-12-05 22:23:45 -08:00
minggo 1502fef7e4 use Schedule::performFunctionInCocosThread 2013-12-06 14:15:01 +08:00
minggo b67d567a79 replace long with int or ssize_t 2013-12-05 17:22:22 +08:00
martell e0523c73f5 fixed CCImage for MSVC someone added std:tolower which broke it 2013-12-05 03:53:25 +00:00
James 373c3b01bf issue #2790: Fixing compilation errors on linux. 2013-12-05 11:44:37 +08:00
martell e5ada6f377 added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors 2013-12-05 03:37:27 +00:00
James Chen c9767b8ea0 issue #2790: fileToValueDict —> getValueMapFromFile, fileToValueArray —> getValueVectorFromFile. 2013-12-04 17:50:57 +08:00
James Chen 54289276de issue #2790: ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap. 2013-12-04 17:46:57 +08:00
James Chen ceaa1f26bb issue #2790: Windows run ok with ValueDict for FileUtils. 2013-12-04 16:02:54 +08:00
James Chen 76896d70d0 issue #2790: Android build was ok, fixes some warnings. 2013-12-04 16:02:54 +08:00
James Chen 4ec6e50cc4 issue #2790: Pure base data from Dictionary* to ValueDict, Array* to ValueArray. 2013-12-04 16:02:52 +08:00
James Chen cb215bc931 issue #2790: Vector<T> replaces Array* finished. 2013-12-04 16:01:55 +08:00
James Chen 9618eb00be Merge pull request #4411 from martell/cmake 
closed #3328: cmake support for windows
 2013-12-02 01:22:57 -08:00
minggo d2f235f8b8 Merge pull request #4408 from boyu0/iss2345_add_tga_support_to_CCImage 
[ci skip]issue #2345: add tga support to Image
 2013-12-01 18:18:42 -08:00
minggo 24f7819e99 Merge pull request #4362 from xhcnb/hotfix_android_setAccelerometerInterval 
[ci skip]Fix: on android, Device::setAccelerometerInterval will causes dead loop
 2013-12-01 18:08:58 -08:00
martell f369606d77 fix cocos2d-x for vs2013 2013-11-30 08:05:39 +00:00
Jason Xu 266e4e1654 rename to with Jni suffex 2013-11-29 19:34:36 +08:00
Jason Xu 27c3a459ed rename android native function names. 2013-11-29 17:17:15 +08:00
boyu0 83f855e2ec issue #2345: delete unnecessary include 2013-11-29 15:31:58 +08:00
boyu0 dffc12e648 issue #2345: new/delete -> malloc/free 2013-11-29 15:13:16 +08:00
boyu0 86074c23d8 issue #2345: class Image add tga image format support. 2013-11-29 14:31:42 +08:00
minggo bcb131262c add helper funcion to invoke a function in gl thread 2013-11-27 16:49:07 +08:00
James Chen 63702188be issue #3258: Compilation error fix for linux port. 2013-11-26 15:56:43 +08:00
Ricardo Quesada 9b52af010d Macro CC_DISABLE_COPY is renamed to CC_DISALLOW_COPY_AND_ASSIGN 
and the old CC_DISALLOW_COPY_AND_ASSIGN is removed
 2013-11-22 16:09:05 -08:00
Jason Xu 7c5784005c Fix: on android, Device::setAccelerometerInterval will causes dead loop 2013-11-23 00:07:15 +08:00
Ricardo Quesada b6ddc6d048 Uses std::unordered_map<> instead of std::map<> 
and more fixes.
 2013-11-21 13:43:59 -08:00
Ricardo Quesada 90f51e0dab Merge branch 'develop' into constructors_are_protected 2013-11-20 11:26:55 -08:00
Ricardo Quesada 6a8c4784a4 Adds some #pragma mark love 2013-11-20 11:26:33 -08:00
Ricardo Quesada 9a51d6c0ba Merge branch 'develop' into constructors_are_protected 2013-11-19 17:59:43 -08:00
Ricardo Quesada 0d750cdbaf Adds virtual destructors on Interfaces 
Classes with at least one virtual function needs a virtual destructor.
This patch adds virtual destructors to  Interface classes

And also enables  'warn on  missing virtual destructors'
 2013-11-19 16:57:23 -08:00
Ricardo Quesada c943702bc8 Merge branch 'develop' into constructors_are_protected 
Conflicts:
	cocos/editor-support/cocostudio/CCActionObject.cpp
	samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h
 2013-11-18 11:07:15 -08:00
minggo c7971bcaad Merge pull request #4300 from minggo/textinput-crash 
[ci skip]fix crash of textinput test case
 2013-11-18 00:23:51 -08:00
minggo 30b7ac8dd1 fix crash of textinput test case 2013-11-18 15:14:48 +08:00
Huabing.Xu 09f27f1d16 HotFix: remove Mac platform Image::saveToFile assert 2013-11-18 10:14:57 +08:00
Ricardo Quesada 208d25bdff ControlSwitch compies 
Uses procted constructor
 2013-11-15 12:04:47 -08:00
Ricardo Quesada 417657b5a9 Merge branch 'develop' into constructors_are_protected 2013-11-15 10:11:49 -08:00
Huabing.Xu 022b5c7b9a Merge branch 'develop' into free_instead_of_delete 
# By CaiWenzhi (4) and others
# Via minggo (7) and others
* develop:
  fix asynchronize loading bug
  [AUTO] : updating submodule reference to latest autogenerated bindings
  fixed #3185 support for html5.
  fixed bug of widget
  fixed bugs of widget
  fixed #3185  ComponentTest and SceneTest NULL to nullptr.
  Add deprecated functions of class TextureCache
  fix warning
  set z order after reorder
  fixed #3185 replace NULL to nullptr.
  add "override"
  fixed #3185
  Modify code criterion

Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSSceneReader.cpp
 2013-11-15 09:44:29 +08:00
Ricardo Quesada a583ad461f CCControlButton has protected constructor 2013-11-14 17:19:16 -08:00
minggo 2f7f05d1d7 fix asynchronize loading bug 2013-11-14 18:39:23 +08:00
Huabing.Xu 4894632467 Fix bug: add android, fix android can not compile 2013-11-14 17:14:35 +08:00