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

12251 Commits

Author SHA1 Message Date
minggo f895183fbc add renamed files into vs.proj 2013-09-21 15:01:42 +08:00
minggo 261f0e4f05 rename some files 2013-09-21 14:40:54 +08:00
minggo cfefe032e5 Merge pull request #3725 from minggo/line_end 
fix line end in windows
 2013-09-20 07:55:27 -07:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
minggo 348386990b Merge pull request #3724 from samuele3hu/developTest 
[ci skip]Modify Accelerometer Test sample because of  the modification of nativeactivity.cpp
 2013-09-20 07:12:15 -07:00
samuele3hu a6d498e068 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-20 22:06:28 +08:00
samuele3hu 54e0fd9a63 Modify Accelerometer Test sample 2013-09-20 22:05:37 +08:00
minggo 480164abfc Merge pull request #3723 from minggo/develop 
[ci skip]fix typo error
 2013-09-20 06:30:55 -07:00
minggo be7d59b132 fix typo error 2013-09-20 21:29:12 +08:00
minggo cba54f4901 Merge pull request #3721 from CocosRobot/updategeneratedsubmodule_1379680870 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-09-20 06:08:38 -07:00
CocosRobot 1d005642ff [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-20 12:41:13 +00:00
minggo 919d88db4a Merge pull request #3720 from minggo/rename-class-name 
rename some class names to obey cocos2d-x coding style
 2013-09-20 05:33:58 -07:00
minggo 2549804dec fix compiling errors 2013-09-20 20:09:39 +08:00
minggo 4c9771ba3c rename some class names to obey cocos2d-x coding style 2013-09-20 19:19:31 +08:00
minggo 7471a1224c Merge pull request #3715 from ricardoquesada/improved_changelog 
Improved changelog
 2013-09-20 01:26:06 -07:00
minggo c84a1a157b Merge pull request #3714 from ricardoquesada/icon_xcode_improvements 
Icon xcode improvements
 2013-09-20 01:24:15 -07:00
James Chen 1bbc68a5e7 Merge pull request #3717 from dumganhar/event-dispatcher-crash-fix 
Don't set listener type to "" when dissociateEventListener.
 2013-09-19 23:38:00 -07:00
James Chen c22315a19c Don't set listener type to "" when dissociateEventListener. 2013-09-20 14:36:15 +08:00
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