Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,262 Commits 2 Branches 33 Tags 1.2 GiB
Commit Graph

3262 Commits

Author SHA1 Message Date
minggo ee08c4629e Merge pull request #714 from minggo/ndk_module 
fixed #970: use modules in the android ndk build
 2012-02-07 19:16:01 -08:00
minggo 52de292e20 fixed #970: use modules in the android ndk build 2012-02-08 11:14:47 +08:00
dumganhar 437f27ff47 Merge pull request #713 from dumganhar/iss951_rm_NSMutableSet 
fixed #951: removed definition of NSMutableSet.
 2012-02-06 23:37:29 -08:00
dumganhar ca94a11190 fixed #951: removed definition of NSMutableSet. 2012-02-07 15:35:10 +08:00
minggo 29c18c67ca Merge pull request #712 from minggo/ndk_module 
Use modules in the Android NDK build
 2012-02-06 22:36:45 -08:00
minggo 9249328afb fixed #970: use modules in the Android NDK build 2012-02-07 14:34:30 +08:00
dumganhar d83e18b7ba Merge pull request #711 from dumganhar/iss967_pvr_tex_reload 
fixed #967: PVR Textures cannot be reloaded after GL context lost on android.
 2012-02-06 22:22:07 -08:00
dumganhar 1e807d00c3 fixed #967: fixed PVR Textures can not be reloaded after GL context lost on android. 2012-02-07 11:18:39 +08:00
dumganhar ee2139023a Merge pull request #708 from Wartortle/master 
fixed #969: Addition of Accelerometer Simulation for Win32.
 2012-02-06 18:57:41 -08:00
minggo 8770976884 Merge branch 'android_ndk_modules' of https://github.com/folecr/cocos2d-x into ndk_module 2012-02-07 10:48:07 +08:00
minggo 3874450200 Merge pull request #710 from minggo/iss954_accerometer 
correct accelerometer data when set orientation to portrait in tablet
 2012-02-06 18:23:15 -08:00
minggo a7c96b5371 fixed #954: correct accelerometer data when set orientation to portrait in tablet 2012-02-07 10:19:40 +08:00
Wartortle aa06de2fb3 Second half of commit for adding Accelerometer simulation to Win32. 2012-02-06 11:38:53 +00:00
Wartortle ffc4457991 On Win32 platform, there's now support for simulating the Accelerometer 
using the up/down/left/right/comma/period keys.
 2012-02-06 11:29:28 +00:00
minggo babbd64f0d Merge pull request #691 from winbinar/master 
fixed #626: Fix bug #626
 2012-02-05 23:00:31 -08:00
dumganhar b32b4eebd6 Merge pull request #707 from moadib/qnx_fileutils 
fixed #968: Fixed a bug about "Out of bound" in CCFileUtils::getWriteablePath() for BlackBerry
 2012-02-05 06:13:42 -08:00
moadib f5b8aa79c5 Fixed "out of bound" error in CCFileUtils::getWriteablePath() for BlackBerry 2012-02-05 16:49:47 +04:00
folecr 3eeb0c8687 fix library name - the makefiles expect the full name of the library including the lib prefix 2012-02-02 23:01:50 -08:00
folecr cab83bb4a6 Fix header file location to match convention in include directives in the cocos source 2012-02-02 20:07:37 -08:00
folecr 516c56a793 Add EXPORT_C_INCLUDES and correct the paths to third party modules 2012-02-02 20:04:29 -08:00
dumganhar 7a5734977c Merge pull request #704 from dumganhar/iss965_remove_some_dynamic 
fixed #965: Remove some dynamic_cast callings since selector_protocol.h was removed
 2012-02-02 01:53:05 -08:00
dumganhar f6d6d0dd49 fixed #965: Remove some dynamic_cast callings since selector_protocol.h was removed 2012-02-02 17:46:45 +08:00
minggo cf2807b870 Merge pull request #703 from minggo/iss933_userdefault 
refactor userdefault
 2012-02-01 22:35:23 -08:00
minggo 2b91b1c7cf fixed #933: free doc 2012-02-02 14:24:51 +08:00
minggo 591b7d0619 fixed #933: profile CCUserDefault 2012-02-02 14:18:13 +08:00
minggo 1ae8f001b8 Merge pull request #702 from minggo/iss947_closed_loop 
fixed #947: fixed a closed loop
 2012-02-01 02:22:02 -08:00
minggo 5e39489c71 fixed #947: fixed a closed loop 2012-02-01 18:18:31 +08:00
minggo 56677be235 Merge pull request #701 from minggo/iss964_label 
fixed #964: compute correct height of a charactor
 2012-02-01 02:05:50 -08:00
minggo 7b67c04f2f fixed #964: compute correct height of a charactor 2012-02-01 18:04:12 +08:00
dumganhar 5c65af137b Merge pull request #695 from GermanMtz/master 
fixed #963: Member variable added to keep the current window active status
 2012-01-31 23:09:54 -08:00
martinezgerman c78bf39601 Member variable added to keep the current window active status 2012-01-31 22:55:44 -08:00
martinezgerman acdd00f03b Functionality to detect when the application goes to the background and return from it, notifying only ones per time to the application 2012-01-31 21:38:44 -08:00
martinezgerman e8f9c5f675 merging the original update 2012-01-31 20:06:39 -08:00
dumganhar 64c892de79 Merge pull request #697 from dducharme/dalebranch 
fixed #962: Updating the following:
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
 2012-01-31 18:44:09 -08:00
minggo c1a53e2ed7 Merge pull request #696 from nkostelnik/master 
fixed #961: Fixed mad behaviour in second stage of CCEaseBackInOut
 2012-01-31 02:17:57 -08:00
Nicholas Kostelnik edaf2cf269 fixed issue with CCEaseBackInOut being erratic on the second stage of the transititon 2012-01-31 09:57:58 +00:00
martinezgerman 38cd599bdc Functionality to detect when the application goes to the background and return from it 2012-01-31 00:25:09 -08:00
minggo a02e3b8c60 Merge pull request #694 from minggo/iss959_touch_id 
fixed #959: make touch id correct on android
 2012-01-30 22:57:04 -08:00
minggo a2efab73a0 fixed #959: make touch id correct on android 2012-01-31 14:49:02 +08:00
Dale Ducharme 32e4cc1af2 Updating the following: 
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
 2012-01-30 20:27:58 -05:00
dumganhar 2b76c2e2fe Merge pull request #692 from dumganhar/moveSel2CCObject 
fixed #958: move the implement of SelectorProtocol to CCObject
 2012-01-30 02:30:01 -08:00
dumganhar a909be3264 remove selector_protocol.h for vs2010 project 2012-01-30 18:27:03 +08:00
dumganhar 3865da92e2 Merge branch 'iss958_merge' of https://github.com/minggo/cocos2d-x into moveSel2CCObject 2012-01-30 18:20:58 +08:00
minggo 6c2277757a fixed #958: delete SelectorProtocol and implement it in CCObject 2012-01-30 17:47:47 +08:00
dumganhar c6ec949950 remove some functions in CCObject 2012-01-30 16:07:01 +08:00
dumganhar 6eb65442d4 remove some logs 2012-01-30 15:46:56 +08:00
dumganhar f44b38eaf8 fixed #958: move the implement of SelectorProtocol to CCObject 2012-01-30 15:31:59 +08:00
minggo 126558aa1d Merge pull request #690 from gzito/master 
Some minor fixes for Marmalade port
 2012-01-29 21:35:57 -08:00
winbinar 231446a8a5 Update cocos2dx/textures/CCTextureCache.cpp 2012-01-30 07:10:49 +02:00
winbinar 910ded54c5 Update cocos2dx/textures/CCTextureCache.cpp 2012-01-30 07:10:19 +02:00