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

32339 Commits

Author SHA1 Message Date
子龙山人 db182b2e50 Merge pull request #13532 from CocosRobot/update_cocosfiles_1440396456 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-08-24 15:27:08 +08:00
子龙山人 5f56d1f696 Merge pull request #13533 from CocosRobot/update_lua_bindings_1440396546 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-24 15:18:31 +08:00
CocosRobot 31a09c9f23 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-24 06:13:37 +00:00
CocosRobot 64b9c2b51f [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-24 06:07:38 +00:00
pandamicro 0c5b377f00 Merge pull request #13531 from pandamicro/texturecube 
Move CCTextureCube From 3d to renderer to solve compilation issue
 2015-08-24 14:06:08 +08:00
yangxiao 7dcc3dd982 Move CCTextureCube From 3d to renderer to solve compilation issue 2015-08-24 14:01:50 +08:00
pandamicro 24282e6e55 Merge pull request #13397 from perminovVS/v3-dev-winrt-correct-unicode 
Correct use and convert unicode from utf8. WinRT
 2015-08-24 11:36:30 +08:00
pandamicro 585990071d Merge pull request #13528 from songchengjiang/v3.8 
fix crash of CameraBackgroundColorBrush
 2015-08-24 11:08:01 +08:00
子龙山人 3ca13a755a Merge pull request #13529 from zilongshanren/fixJenkinsCompile 
[ci skip]fix Jenkins template compile
 2015-08-24 10:28:13 +08:00
andyque c2fae3987b fix Jenkins template compile 2015-08-24 10:26:12 +08:00
songchengjiang be24586f4b fix crash of CameraBackgroundColorBrush 2015-08-24 10:23:59 +08:00
pandamicro 50c8855399 Merge pull request #13527 from pandamicro/reader 
Fix skybox parser crash with inexistent files
 2015-08-24 10:16:28 +08:00
pandamicro 11113c85da Improved logic of skybox reader fix 2015-08-24 10:02:38 +08:00
Liam 110de9ee3e fix skybox crash with error data 2015-08-24 10:02:37 +08:00
pandamicro ca57416bb9 Merge pull request #13520 from pandamicro/v3.8 
Fix AssetsManager crash by protecting Downloader with shared_ptr
 2015-08-23 18:51:57 +08:00
pandamicro 055ef23931 Fix AssetsManager crash by protecting Downloader with shared_ptr 2015-08-22 22:13:53 +08:00
pandamicro 5c4b67d04e Merge pull request #13518 from MSOpenTech/v3.8-win10 
V3.8: Win10 UWP add missing CCCameraBackgroundBrush files
 2015-08-22 12:01:28 +08:00
pandamicro ca6dec6154 Merge pull request #13519 from pandamicro/changelog 
Update changelog and versions for v3.8 rc0
 2015-08-22 12:00:10 +08:00
pandamicro 6ee33499b4 Update changelog and versions for v3.8 rc0 2015-08-22 11:56:25 +08:00
Dale Stammen cfd2f08d82 added running tests section for Windows 10 UWP apps 2015-08-21 13:14:01 -07:00
Dale Stammen fc1a2b2f99 fixed for winrt audio issue 13254 2015-08-21 09:59:46 -07:00
Dale Stammen b4f2fb0928 added missing CCCameraBackgroundBrush files 2015-08-21 09:23:01 -07:00
pandamicro 486af79a47 Merge pull request #13511 from fusijie/fix_13509 
fixed renderTexture crash bug.
 2015-08-21 18:24:27 +08:00
fusijie cbd7eed9c4 fixed renderTexture crash bug. 2015-08-21 17:38:56 +08:00
pandamicro 28cd8c4204 Merge pull request #13508 from pandamicro/v3.8 
[ci skip] Update web engine
 2015-08-21 15:51:13 +08:00
pandamicro aab9e92394 Update web engine 2015-08-21 15:50:09 +08:00
pandamicro ee3b71103b Merge pull request #13505 from CocosRobot/update_lua_bindings_1440139108 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-21 14:53:38 +08:00
CocosRobot 6b6c6b242c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-21 06:44:25 +00:00
pandamicro 66fbc33ccb Merge pull request #13501 from pandamicro/camera 
Add JS and Lua bindings for CCCameraBackgroundBrush
 2015-08-21 14:35:15 +08:00
子龙山人 369d7474b8 Merge pull request #13499 from zilongshanren/fix-scrollview-initil-posotion 
fix scrollview innerContainer initial position.
 2015-08-21 13:51:04 +08:00
pandamicro 350adbac98 Merge pull request #13502 from CocosRobot/update_cocosfiles_1440131073 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-08-21 12:43:12 +08:00
pandamicro 006f300ac9 Add JS and Lua bindings for CCCameraBackgroundBrush 2015-08-21 12:42:36 +08:00
CocosRobot 7bb25d8c66 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-21 04:24:34 +00:00
pandamicro 306a0e4df7 Merge pull request #13471 from super626/v3.8 
skybox should not be transparent
 2015-08-21 12:22:48 +08:00
pandamicro 4dfab60463 Merge pull request #13498 from CocosRobot/update_cocosfiles_1440129194 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-08-21 12:19:01 +08:00
pandamicro 84a411e034 Merge pull request #13500 from CocosRobot/update_lua_bindings_1440129276 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-21 12:18:47 +08:00
CocosRobot 9a6c779580 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-21 03:59:12 +00:00
andyque 29f97d63ed fix scrollview innerContainer initial position. 2015-08-21 11:56:19 +08:00
CocosRobot 7839a23c62 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-21 03:53:16 +00:00
pandamicro f3b7e027d6 Merge pull request #13497 from pandamicro/camera 
Add CCCameraBackgroundBrush
 2015-08-21 11:51:34 +08:00
pandamicro 350182c1aa Refactor BackGround to Background 2015-08-21 10:43:59 +08:00
yangxiao 3e2001bdb1 Add CCCameraBackgroundBrush 
including Color, Depth, SkyBox brushes

Squashed from https://github.com/cocos2d/cocos2d-x/pull/13490
 2015-08-21 10:43:59 +08:00
ZhangMenghe 1bcc2dec37 Notification effect enhancement 2015-08-21 10:20:59 +08:00
pandamicro f377a9bff1 Merge pull request #13491 from zilongshanren/v3.8 
add RadioButton and RadioButtonGroup event type
 2015-08-21 09:17:46 +08:00
pandamicro 58178ea0c2 Merge pull request #13495 from MSOpenTech/v3.8-winrt-fix 
V3.8: winrt project file fixes
 2015-08-21 09:16:55 +08:00
pandamicro eb1ab63611 Merge pull request #13493 from MSOpenTech/v3.8-win10-readme 
V3.8: updated Win10 UWP requirements in ReadMe [ci skip]
 2015-08-21 09:15:49 +08:00
Dale Stammen c47de9d04f make new render surface current after device lost 2015-08-20 13:26:03 -07:00
Dale Stammen d55bc653e0 update c++ debug info settings 2015-08-20 13:25:17 -07:00
Dale Stammen f49e6fda85 updated Win10 UWP requirements 2015-08-20 11:13:17 -07:00
andyque 15156a015a add RadioButton and RadioButtonGroup event type 2015-08-20 22:49:42 +08:00