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

81 Commits

Author SHA1 Message Date
minggo ecb915fabf fix warnings 2014-07-11 17:39:56 +08:00
minggo f205c0b704 Merge pull request #7392 from xhcnb/fix_CC_ENABLE_SCRIPT_BINDING_build 
Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed
 2014-07-11 13:41:33 +08:00
minggo 6c37541657 Merge pull request #7363 from Dhilan007/v3-event-clear 
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
 2014-07-11 13:36:52 +08:00
Jason Xu d94941243a Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed 2014-07-11 10:27:00 +08:00
Dhilan007 dfbeb0fb63 Update Nibiru SDK and remove prompt box of install driver . 2014-07-10 22:33:58 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
Dhilan007 dbcb20b886 Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8. 
Make clear EVENT_COME_TO_FOREGROUND event.
 2014-07-09 23:03:04 +08:00
minggo eba1735d04 Merge pull request #7347 from Dhilan007/v3-memory-leak 
fixed memory leak cause by singleton.
 2014-07-08 21:13:56 +08:00
minggo c2474ea7c0 Merge pull request #7262 from pandamicro/origin_v3 
Indicate correct button and cursor position infomation in mouse move event
 2014-07-08 21:07:09 +08:00
Dhilan007 10defddc2e fixed memory leak cause by singleton. 2014-07-08 18:22:48 +08:00
minggo b0d260d293 Merge pull request #7027 from zhouxiaoxiaoxujian/improvement/COC-9 
Fix UITextField IME can't auto detach
 2014-07-08 10:56:16 +08:00
Dhilan007 6e2caf1c78 fixed can's set color for LabelTTF correctly on IOS. 2014-07-08 10:31:14 +08:00
Dhilan007 d1034fdaae 1.fixed lose disconnected event. 
2.fixed incorrect device name and device id;
 2014-07-07 17:47:07 +08:00
Dhilan007 68bd717ea7 issue #4689: support external key. 2014-07-07 12:06:24 +08:00
LinWenhai 992245e744 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc-refactor 2014-07-04 15:29:40 +08:00
Dhilan007 552a9251c4 issue #4689: Refactor controller API. 2014-07-04 15:22:53 +08:00
minggo 1a089f4a18 Merge pull request #7286 from Dhilan007/v3-gc0702 
fixed can't get valid value from trigger button.
 2014-07-02 16:24:24 +08:00
Dhilan007 097f782c38 remove ControllerAutoAdapter project. 2014-07-02 15:17:29 +08:00
Dhilan007 adfc010555 fixed can't get valid value from trigger button[Moga] 2014-07-02 15:09:24 +08:00
Dhilan007 c5dc7b9cd0 fixed can't get valid value from trigger button. 2014-07-02 14:19:10 +08:00
Dhilan007 0fbcbec9de Add missing file for game controller support. 
Fix using incorrect library project.
 2014-07-01 16:44:10 +08:00
minggo 6654bf1129 Merge pull request #7265 from visiblelight/beta_test 
Fix the crash when capturing screen on WP8
 2014-07-01 16:19:45 +08:00
pandamicro 81df54b82e Fixed #5635: Correction of mouse event's cursor position 2014-07-01 15:14:41 +08:00
Dhilan007 66673d88fa split controller adapter[android] 2014-07-01 15:08:51 +08:00
Dhilan007 abeeb9a0c7 fixing incorrect optimization 2014-07-01 14:57:10 +08:00
Dhilan007 584e90c097 Rotate the frame buffer for WP8 during the snapshot 2014-07-01 14:48:43 +08:00
pandamicro abfbc4bffb Fixed #5632: Indicate the correct button in mouse move event 2014-07-01 13:01:04 +08:00
Dhilan007 afac6b86ff move controller support to 'libcontrollerdeleate' project. 2014-06-30 18:41:47 +08:00
Dhilan007 74579f19f5 issue #4895:Get events from controller to engine[android] 2014-06-30 03:23:51 +08:00
Dhilan007 5ed581758e issue #4895:Get events from controller to engine[android] 2014-06-30 03:20:22 +08:00
Dale Stammen 33e39b5786 added source files for component to be consistent with other platforms templates 2014-06-25 09:51:32 -07:00
minggo 8db7caff2a Merge pull request #7050 from gin0606/videoPlayerIssue 
Fix crash when try to remove videoView(STATE_PLAYBACK_COMPLETED) in android
 2014-06-25 17:56:03 +08:00
Dale Stammen 83c5b7bdb0 updated wp8 precompiled shaders 2014-06-20 09:07:29 -07:00
Mazyad Alabduljaleel 433dc140cd CCLOGINFO compilation fix 2014-06-19 20:59:08 +04:00
minggo e374bd67c7 Merge pull request #6946 from hanjukim/skip-utf8-bom 
Skip UTF8 BOM if it exists and bug fix for unterminated string
 2014-06-19 22:02:38 +08:00
gin0606 79f82b00bc Add new line at the end of a file to *.mm 2014-06-19 20:48:50 +09:00
gin0606 3ae8e29ce5 Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
gin0606 bf4f30d14b Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
Dale Stammen 753167b5f2 updated xaml resources 2014-06-16 09:25:35 -07:00
Dale Stammen b66269d85d Merge branch 'v3' into wp8-v3-template 2014-06-16 09:11:27 -07:00
vision 0b8e6a6a83 The filename should be converted to lower case before comparing. 2014-06-13 15:32:49 +08:00
Dale Stammen 2d913470a0 updated fast resume code for app 2014-06-12 16:36:53 -07:00
Dale Stammen 29b9da34ea updated to latest version of Angle to fix memory leak when switching apps 2014-06-12 16:35:24 -07:00
Dale Stammen b0bc971523 fixed reloading of cocos2d-x after app switch 2014-06-12 16:34:21 -07:00
Dale Stammen 2c5b449c9c updated app name to App 2014-06-12 16:27:09 -07:00
gin0606 80c5349d75 Fix crash when videoView to remove in android 2014-06-12 16:47:08 +09:00
LinWenhai b268536385 fixed typo. 2014-06-12 09:46:18 +08:00
Dhilan007 63a68632a5 fixed calculating height of multi-line string was incorrect on IOS. 2014-06-11 21:49:08 +08:00
Frank.Xu 11919413c8 Fix UITextField IME can't auto detach 2014-06-10 14:53:27 +08:00
minggo 66c7b85134 fix issue on Xcode 6 2014-06-09 17:06:40 +08:00