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

12335 Commits

Author SHA1 Message Date
James Chen 19515438f3 Merge pull request #3716 from dumganhar/event-dispatcher-crash-fix 
issue #2087: Fixing potential crash reported by Sam Gross. Thanks @Sam.
 2013-09-19 23:19:16 -07:00
James Chen 3d41b7e33c Adding EventDispatcher Test of removing all touch listeners. 2013-09-20 14:14:03 +08:00
James Chen db2706553e Fixing dangerous pointer when removing event listener. 2013-09-20 14:13:20 +08:00
James Chen 213be32932 issue #2087: Fixing potential crash reported by Sam Gross. Thanks @Sam. 2013-09-20 10:23:58 +08:00
Ricardo Quesada f4df2b5aa0 Improved changelog 2013-09-19 19:15:49 -07:00
Ricardo Quesada 3696703db4 forces 64-bit arch 2013-09-19 18:46:07 -07:00
Ricardo Quesada 4f07dbaece Restores .py file to its original layout 2013-09-19 18:32:47 -07:00
Ricardo Quesada 51834e5291 Xcode template projects fixes 
Updats the xcode project with recommended fixes from Xcode 5.0
 2013-09-19 18:27:11 -07:00
Ricardo Quesada 7ecb9778a3 Product Name is the project name 2013-09-19 18:12:02 -07:00
Ricardo Quesada 2ab1b2ff04 Lua template: ios and mac projects in one Xcode file 
Merged iOS and Mac projects into one single Xcode.proj file
 2013-09-19 17:05:00 -07:00
Ricardo Quesada d3827e9933 Template: Adds JS template for Mac 
Mac and iOS templates share the same Xcode project
 2013-09-19 16:02:20 -07:00
Ricardo Quesada c9a1cd49fe unifies ios and mac templates into one. 
iOS and Mac templates unified into one Xcode project.

It is much easier to mantian an to develop games by having everything in one Xcode project
 2013-09-19 14:59:44 -07:00
Ricardo Quesada 3427ed71c4 Adds iOS7 icons to ios template 2013-09-19 11:51:33 -07:00
Ricardo Quesada d6675df75b Adds iOS7 icons in SimpleGame and HelloCpp 2013-09-19 11:44:20 -07:00
Ricardo Quesada a3a0c2001a Icon is prerenderer 2013-09-19 11:21:05 -07:00
James Chen 4ba6924110 Merge pull request #3712 from dumganhar/register-touch 
Making cc.registerTargetDelegate and cc.registerStandardDelegate compatible with Cocos2d-html5.
 2013-09-19 08:42:16 -07:00
James Chen a460f44a1a Making cc.registerTargetDelegate and cc.registerStandardDelegate compatible with Cocos2d-html5. 2013-09-19 23:43:41 +08:00
James Chen dadf6b3d0b Merge pull request #3710 from Dhilan007/develop 
restore AccelerometerTest
 2013-09-19 07:20:23 -07:00
James Chen 2ebdb440bf Merge pull request #3706 from ricardoquesada/cpp_best_practices 
Small fixes to comply with C++ best practices
 2013-09-19 07:15:32 -07:00
Dhilan007 2504b8e029 restore AccelerometerTest 2013-09-19 19:05:52 +08:00
James Chen 07f5ad445c Merge pull request #3709 from dumganhar/iss2087-new-event-dispatcher 
Fixing SchedulerTest crash. We need to invoke parent's onExit in subclass::onExit.
 2013-09-19 03:54:44 -07:00
James Chen 153794ba6c Updating MutiTouchTest.cpp. Adding title. Removing unused codes. 2013-09-19 18:54:26 +08:00
James Chen d32fb93e07 Fixing SchedulerTest crash. We need to invoke parent's onExit in subclass::onExit. 2013-09-19 18:53:45 +08:00
James Chen b05796e1a5 issue #2087: Fixing NewEventDispatcherTest --> SpriteAccelerationEventTest crash. 2013-09-19 13:55:49 +08:00
James Chen 302bdbbe8f Merge pull request #3708 from dumganhar/iss2087-new-event-dispatcher 
issue #2087: Fixing NewEventDispatcherTest --> SpriteAccelerationEventTest crash.
 2013-09-18 22:55:41 -07:00
Ricardo Quesada 0674948325 Small fixes to comply with C++ best practices 
Small fixes to comply with C++ best practices
 2013-09-18 19:38:21 -07:00
James Chen 4b3b69bb6b Merge pull request #3705 from dumganhar/iss2087-new-event-dispatcher 
issue #2087: [EventDispatcher] Fixing crash on Win32.
 2013-09-18 19:17:51 -07:00
James Chen 7797fad5a5 issue #2087: [EventDispatcher] Fixing crash on Win32. 2013-09-19 10:19:02 +08:00
James Chen e201cff032 Merge pull request #3704 from dumganhar/iss2087-new-event-dispatcher 
issue #2087: Adding CustomEvent and CustomEventListener and bug fix for CCInputDelegate in Extension.[ci skip]
 2013-09-18 18:49:31 -07:00
James Chen f78634617c Merge branch 'iss2087-new-event-dispatcher' of z:/Project/cocos2d-x into iss2087-new-event-dispatcher 2013-09-19 09:26:11 +08:00
James Chen ebedd7b59e issue #2087: Adding customevent and CustomEventListener to VS project. 2013-09-19 09:25:43 +08:00
James Chen c38dfb6a17 issue #2087: Setting default touch priority to -1 for CCInputDelegate 2013-09-19 09:24:11 +08:00
James Chen e051903b38 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2087-new-event-dispatcher 2013-09-19 09:22:31 +08:00
James Chen d7274b9475 issue #2087: Should not use fixed priority with 0 value, it's for scene graph based priority. 2013-09-19 09:19:03 +08:00
James Chen db98d662af issue #2087: Fixing crash of ComponentTest. 2013-09-19 09:15:56 +08:00
James Chen 3fbf61ad52 issue #2087: Adding CustomEvent and CustomEventListener classes. Make Event and EventListener as abstract classes. 2013-09-19 09:14:51 +08:00
James Chen 5570b6089a Merge pull request #3703 from dumganhar/iss2087-new-event-dispatcher 
Fixing crash of ACC-Test.[ci skip]
 2013-09-18 17:21:48 -07:00
James Chen a842b6de2f Merge pull request #3699 from Dhilan007/develop 
Unify Accelerometer coordinate on IOS and Android.[ci skip]
 2013-09-18 17:20:38 -07:00
James Chen 0d17ef1e95 Merge pull request #3701 from ricardoquesada/xcode_template_fixes 
Small fixes for Xcode templates[ci skip]
 2013-09-18 17:14:36 -07:00
James Chen 10683a3910 Merge pull request #3702 from ricardoquesada/update_cocos2d_version 
version is v3.0-alpha0[ci skip]
 2013-09-18 17:13:29 -07:00
James Chen 40258ede68 Fixing crash of ACC-Test. 2013-09-19 08:12:54 +08:00
Ricardo Quesada e9237e1aad version is v3.0-alpha0 2013-09-18 16:56:25 -07:00
Ricardo Quesada 24df87265e Small fixes for Xcode templates 
Also, uses `auto` in the template code to be more c++11 friendly
 2013-09-18 16:50:26 -07:00
Dhilan007 479355ee32 Unify Accelerometer coordinate on IOS and Android. 2013-09-19 00:04:50 +08:00
minggo fa71f8f479 Merge pull request #3698 from minggo/develop 
make Director::end() reantrant
 2013-09-18 08:58:44 -07:00
minggo a901efb603 make Director::end() reantrant 2013-09-18 23:52:09 +08:00
James Chen ec7cfae4e8 Merge pull request #3697 from dumganhar/iss2087-new-event-dispatcher 
Fixing MenuTest crash.
 2013-09-18 08:42:09 -07:00
James Chen c7612fee15 Fixing MenuTest crash. 2013-09-18 23:43:04 +08:00
Dhilan007 ba47e666c1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-09-18 23:03:23 +08:00
James Chen 339b4fa749 Merge pull request #3696 from dumganhar/iss2087-new-event-dispatcher 
issue #2087: Adding  new event dispatcher test and bug fixes.
 2013-09-18 07:51:12 -07:00