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

8444 Commits

Author SHA1 Message Date
tangziwen 176532eef4 update Terrain Lua binding 2015-04-09 10:01:40 +08:00
tangziwen 4ca6b559e6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 2015-04-09 09:40:22 +08:00
minggo 1177310550 Merge pull request #11334 from andyque/fix-windows-universal 
update freetype2 and chipmunk on wp8 and wp8.1
 2015-04-08 21:28:15 +08:00
tangziwen 2be309d841 add reload method in case of GL context Lost. 2015-04-08 19:11:46 +08:00
minggo 8a1aa78f7d Merge pull request #11336 from xiaofeng11/v3 
Update reader
 2015-04-08 18:40:32 +08:00
minggo 3ce6602f3a Merge pull request #11335 from super626/v3 
Modify changelog and add getAABBRecursively
 2015-04-08 18:03:48 +08:00
andyque 24c0c8d811 fix wp8 compile issue 2015-04-08 18:01:56 +08:00
pipu ca74486f60 Update CSParseBinary_generated 2015-04-08 16:54:58 +08:00
yangxiao a7a39d71f5 modify getAABBRecursively 2015-04-08 16:40:04 +08:00
yangxiao 0d0bad186f resolve conflict 2015-04-08 16:23:35 +08:00
minggo 263506fb74 Merge pull request #11282 from hawkwood/patch-8 
Fix iOS 5.1.1 crash caused by interruptionHandler
 2015-04-08 16:23:12 +08:00
andyque f52899c257 update freetype2 and chipmunk on wp8 and wp8.1 2015-04-08 16:21:19 +08:00
tangziwen dc7cd520b2 update terrain 2015-04-08 15:17:05 +08:00
minggo 00c0e4c432 Merge pull request #10909 from babcca/webview_ios_load_data_fix 
Webview ios load data fix
 2015-04-08 14:34:42 +08:00
minggo e4099acdc8 Merge pull request #11328 from CocosRobot/update_lua_bindings_1428464979 
[AUTO]: updating luabinding automatically
 2015-04-08 13:54:22 +08:00
CocosRobot 58ca1b7911 [AUTO]: updating luabinding automatically 2015-04-08 03:52:03 +00:00
minggo e9cdf333f9 Merge pull request #11246 from xiaofeng11/v3 
V3 reader fix
 2015-04-08 11:46:40 +08:00
minggo 4bcfcb1d09 Merge pull request #11320 from samuele3hu/v3_terrain 
#issue 10819:Add lua bindings for Terrain and two test cases about it.
 2015-04-08 11:45:46 +08:00
minggo 21c5bc96e5 Merge pull request #11319 from CocosRobot/update_lua_bindings_1428458531 
[AUTO]: updating luabinding automatically
 2015-04-08 10:53:07 +08:00
minggo 4d9e376a18 Merge pull request #11284 from perminovVS/v3-dev-image-format-detect-log 
Log message can't detect image format
 2015-04-08 10:52:56 +08:00
minggo dff62e329e Merge pull request #11313 from stari4ek/v3-FileUtils-constness 
FileUtils: replace const_cast with mutable in path getters
 2015-04-08 10:50:43 +08:00
tangziwen 3ab4e75a71 update 2015-04-08 10:10:05 +08:00
CocosRobot 4bcf6b7b67 [AUTO]: updating luabinding automatically 2015-04-08 02:04:07 +00:00
samuele3hu 3a2601a1f8 Add lua bindings for Terrain and two test cases about it. 2015-04-08 10:03:50 +08:00
andyque 8a4a7344b0 fix freetype include 2015-04-08 09:24:34 +08:00
andyque e4cf3885a5 use prebuilt zlib for android and mac 2015-04-07 23:20:02 +08:00
Michael Sotnikov f962e14b43 replace const_cast with mutable in path getters; 
more getters (is*/get*) became const;
 2015-04-07 17:15:15 +03:00
tangziwen a220a8f669 fix wrong attribute location bind, fix memory leak, enable back-face culling 2015-04-07 18:47:19 +08:00
minggo ca090281a4 Merge pull request #11307 from WenhaiLin/v3-label-effect 
Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label.
 2015-04-07 18:22:35 +08:00
minggo 50fa15c0cd Merge pull request #11301 from samuele3hu/v3_lua_jit 
Add luajit support for iOS 64bit devices and related test cases
 2015-04-07 18:17:09 +08:00
lvlong c9014e12b4 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
Conflicts:
	CHANGELOG
 2015-04-07 16:40:57 +08:00
lvlong 99ef79f940 modify INT_NEAR 2015-04-07 16:37:51 +08:00
WenhaiLin 927cda3f0d Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label. 2015-04-07 15:51:57 +08:00
minggo eb928432ce Merge pull request #11302 from WenhaiLin/v3-label-shadowcolor 
Label: Fixed shadow color is incorrect.
 2015-04-07 15:27:19 +08:00
minggo 353c2b0d75 Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3 
Optimize Vec3
 2015-04-07 14:04:57 +08:00
WenhaiLin c5c5d3e39d Label: Fixed shadow color is incorrect. 2015-04-07 11:17:01 +08:00
minggo 1646278be2 [ci skip] update version 2015-04-07 10:36:38 +08:00
minggo 295b6d7044 [ci skip] update version 2015-04-07 10:35:49 +08:00
minggo deaa6a19f0 Merge pull request #11257 from super626/terrain 
Terrain
 2015-04-07 09:32:35 +08:00
XiaoFeng 16aa704ffd Merge branch 'v3' of github.com:xiaofeng11/cocos2d-x into v3 2015-04-07 09:11:14 +08:00
XiaoFeng 4929d8102a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-04-07 09:06:06 +08:00
Ricardo Quesada a782eb022d fixes warnings on Xcode 6.3 
instead of using `abs()` it uses `std::abs()`
 2015-04-06 12:08:30 -07:00
samuele3hu a64e90d469 Update the related project setting for Luajit and related test cases 2015-04-06 22:41:34 +08:00
Vladimir Perminov 105bac2d55 Optimize Vec3 
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();

Change all code:
_vec3 = Vec3(x, y, z);   ->   _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z);   ->  Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z);   ->   _vec3.add(x, y, z);
_vec3 = Vec3::ZERO;   ->   _vec3.setZero();
 2015-04-05 13:09:50 +03:00
Vladimir Perminov 3931273a58 Log message can't detect image format 
Wrong log message DDS and KTX check image format(other format no log
message).
isS3TC and isATITC protected, no use dev code.

Log message if format unknown
 2015-04-04 13:19:47 +03:00
minggo 0f09fd8956 Merge pull request #11278 from CocosRobot/update_lua_bindings_1428047459 
[AUTO]: updating luabinding automatically
 2015-04-04 07:18:39 +08:00
Justin Hawkwood 84fd73630a Fix iOS 5.1.1 crash caused by interruptionHandler 
checks OS version and sets handling based on what is available.
 2015-04-03 15:57:47 -07:00
lvlong 4c6eec9ec1 add getAABBRecursively 2015-04-03 18:04:33 +08:00
zhukaixy 6eb86f736c add for wp8 support --ziwen.tang 2015-04-03 17:12:44 +08:00
tangziwen 72f5121959 Merge branch 'terrain' of https://github.com/super626/cocos2d-x into terrain 2015-04-03 16:58:27 +08:00