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

16879 Commits

Author SHA1 Message Date
heliclei 6848e6dde0 use atof instead of stof to fix compile error on android 2014-02-25 16:31:21 +08:00
boyu0 338aa73840 issue #4118: change PhysicsBody::updateDamping() to protected. 2014-02-25 16:08:16 +08:00
heliclei 7f3aab2bfd fix touchEnd lambda 2014-02-25 15:59:43 +08:00
boyu0 55c679a893 issue #4118: rename set/getElasticity to set/getRestitution 2014-02-25 15:58:19 +08:00
heliclei f1376e7caf fix help typo 2014-02-25 15:55:01 +08:00
heliclei a7d636f7bf support touch swipe directive 2014-02-25 15:52:37 +08:00
boyu0 c727512023 reset project.pbxproj 2014-02-25 15:45:01 +08:00
Wilhansen Li a1b7beb400 Fix spine::Skeleton not updating on re-entry. 
Could be done in a tighter manner by scheduling updates in
spine::SkeletonAnimation instead and listening for animation events.
However, this may need a more robust interface on scheduleUpdate and
unscheduleUpdate to work correctly.
 2014-02-25 15:36:57 +08:00
James Chen a6b89f1fcc Merge pull request #5459 from dumganhar/develop 
More const reference loves in EventDispatcher.
 2014-02-25 15:30:22 +08:00
boyu0 2397aaf24d issue #4118: add physics contact test. 2014-02-25 15:28:13 +08:00
boyu0 d139c752fb issue #4118: add _isDamping to PhysicsBody and fix bugs 2014-02-25 15:27:25 +08:00
bmanGH dbd76fb401 Merge remote-tracking branch 'upstream/develop' into develop 
* upstream/develop: (46 commits)
  Update CHANGELOG [ci skip]
  remove unused declare
  Update CHANGELOG [ci skip]
  [AUTO] : updating submodule reference to latest autogenerated bindings
  rollback gui  filename change
  fix lua bindings error
  fix jsb munaul bindings error
  change script bindings code
  fixed #3829. change namespace gui to ui
  fixed #3801. uncomment pasue&resume logic when applicationDidBecomeActive and applicationWillResignActive
  uncomment the pause() and resume() method call in test-js
  compilation error fix for win32.
  little fixes for sprite
  Update CHANGELOG [ci skip]
  Update CHANGELOG [ci skip]
  closed issue#4123:fixed thread deadlock if new functions are added in callback.
  Update CHANGELOG [ci skip]
  issue #4039: delete name "converted_x", "converted_y", "converted_width", "converted_height".
  closed #3818: fix CC_SPRITE_DEBUG_DRAW feature
  replace write() with send()
  ...
 2014-02-25 14:51:47 +08:00
James Chen 51808b59e9 More const reference love in EventDispatcher. 2014-02-25 14:31:24 +08:00
heliclei 08fa208cae Merge remote-tracking branch 'upstream/develop' into console-simulate-touch 2014-02-25 14:04:23 +08:00
James Chen 304ccb73f1 Update CHANGELOG [ci skip] 2014-02-25 12:59:30 +08:00
James Chen 93aa506e33 Merge pull request #5435 from heliclei/fix-console-windows-crash 
closed #4098: Fix console crash on windows.
 2014-02-25 12:56:11 +08:00
heliclei 63344a8560 remove unused declare 2014-02-25 11:58:45 +08:00
heliclei e09a72f26d add touch swipe 2014-02-25 11:47:53 +08:00
James Chen 1823e890ac Update CHANGELOG [ci skip] 2014-02-25 11:18:02 +08:00
James Chen b327e510a8 Merge pull request #5457 from CocosRobot/updategeneratedsubmodule_1393298076 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-25 11:16:05 +08:00
CocosRobot ef18a6edd1 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-25 03:14:40 +00:00
heliclei 514cd031b3 Merge remote-tracking branch 'upstream/develop' into fix-console-windows-crash 2014-02-25 11:09:58 +08:00
heliclei 786aae2199 add touch move support 2014-02-25 11:04:59 +08:00
James Chen 2beacc21c9 Merge pull request #5456 from andyque/fixbug3801 
closed #3801: State is changed to RESUME when game comes back to foreground if pause button was clicked in Interval Test
 2014-02-25 10:57:23 +08:00
James Chen 1753a90c68 Merge pull request #5449 from andyque/fixbug3829 
closed #3829: change namespace gui to ui
 2014-02-25 10:56:37 +08:00
boyu0 7a28f93fbf issue #4118: fix bit mask bug 2014-02-25 10:24:20 +08:00
andyque f88e4be4ce rollback gui filename change 2014-02-25 10:18:45 +08:00
andyque 8359ddd4d4 fix lua bindings error 2014-02-25 10:18:45 +08:00
andyque f92301a872 fix jsb munaul bindings error 2014-02-25 10:18:45 +08:00
andyque 6b6f71b043 change script bindings code 2014-02-25 10:18:45 +08:00
andyque bf81591b48 fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
andyque f5b0b77423 fixed #3801. uncomment pasue&resume logic when applicationDidBecomeActive and applicationWillResignActive 2014-02-25 10:16:17 +08:00
andyque 8f8b990c85 uncomment the pause() and resume() method call in test-js 2014-02-25 10:16:17 +08:00
James Chen a049ca5a1e Merge pull request #5455 from dumganhar/vs-fix 
compilation error fix for win32.
 2014-02-25 09:58:33 +08:00
James Chen 64ec1611a5 compilation error fix for win32. 2014-02-25 09:45:10 +08:00
Ricardo Quesada 007a1d25b4 Merge pull request #5454 from ricardoquesada/sprite_fixes 
little fixes for sprite
 2014-02-24 15:19:04 -08:00
Ricardo Quesada 18c3a8dd02 little fixes for sprite 2014-02-24 15:18:07 -08:00
James Chen 3a652fcaf5 Update CHANGELOG [ci skip] 2014-02-24 22:25:55 +08:00
James Chen 21fe4f234b Merge pull request #5382 from boyu0/iss4039_tilemap_objectgroup_fix 
closed #4039: fix bug: tilemap <object> x, y, width and height value parse incorrect.
 2014-02-24 22:23:05 +08:00
James Chen dfde6938d2 Merge pull request #5452 from dabingnn/develop_CC_SPRITE_DEBUG_DRAW 
closed #3818: fix CC_SPRITE_DEBUG_DRAW feature
 2014-02-24 21:51:24 +08:00
James Chen e310734af1 Update CHANGELOG [ci skip] 2014-02-24 21:50:17 +08:00
James Chen b5b9c7f938 Merge pull request #5451 from Dhilan007/develop_movePDC 
closed #4123:fixed thread deadlock if new functions are added in callback.
 2014-02-24 21:43:37 +08:00
Dhilan007 387bd544bf closed issue#4123:fixed thread deadlock if new functions are added in callback. 2014-02-24 21:08:05 +08:00
James Chen 618104d056 Update CHANGELOG [ci skip] 2014-02-24 20:14:55 +08:00
boyu0 d15009c510 issue #4039: delete name "converted_x", "converted_y", "converted_width", "converted_height". 2014-02-24 20:14:46 +08:00
James Chen 81e7cec98f Merge pull request #5385 from boyu0/refactor_tilemap_xml_format_index 
refactor tilemap xml format index count.
 2014-02-24 20:09:11 +08:00
Huabing.Xu f20d487ade closed #3818: fix CC_SPRITE_DEBUG_DRAW feature 2014-02-24 20:02:48 +08:00
heliclei 82935b3309 replace write() with send() 2014-02-24 18:02:13 +08:00
heliclei 2f4e96527b remove unused declare 2014-02-24 17:50:40 +08:00
heliclei 115d3e4a3b Merge remote-tracking branch 'upstream/develop' into fix-console-windows-crash 2014-02-24 17:03:28 +08:00