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

426 Commits

Author SHA1 Message Date
Éloi Rivard 8c013fe619 * Basic Linux OpenAL support. 2013-03-28 12:07:09 +01:00
minggo ee256e0e0d Merge pull request #2091 from jsambuo/linux-audio-twice-fix 
fix for SimpleAudioEngine::playEffect() and playBackgroundMusic() playing twice on linux
 2013-03-07 20:50:26 -08:00
Sam Clegg 7ad171d8ee Use same top level Makefile for nacl and linux builds. 
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.

Fix remaining warnings in NaCl builds.
 2013-03-06 13:02:55 -08:00
Sam Clegg 8677dad3c6 Improved build system from linux. 
This change makes several fundamental improvements to the linux
build system:

- Remove duplication: a lot of the common make logic is now in
  a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk

- Quiet by default: unless you specify V=1 on the commandline
  the output is now very clean and quiet.

- Dependencies: gcc's automatic dependancy generation is now
  used (-MMD).  This means that if you change a header file
  then all the object that depend on it now get rebuilt.

- Don't store objects in the source tree: previously object
  files were stored alongside the sources, which meant that
  debug and release object clobbered each other which leads
  to confusion and lots of unnecessary rebuilding.Q

- Library dependencies: each binary now depends on the libraries
  it links aginst.  This means that if the cocos2dx library
  changes then all examples will get re-linked.

- Top level Makefile: there is now a top level Makefile that
  can be shared/used by any platform the uses make as the
  build system (for example NaCl).  Everything can be built
  by simply running 'make' at the top level. e.g:

    make DEBUG=1
    make DEBUG=1 clean
 2013-03-06 13:02:55 -08:00
minggo 3ce5a99c8d Merge pull request #2092 from sbc100/fix_all_warnings 
Fix all compiler warnings produced by gcc.
 2013-03-05 17:59:35 -08:00
Sam Clegg 4d0aa01c4b Fix all gcc warnings in NaCl build. 2013-03-05 17:01:40 -08:00
Sam Clegg 38878b084b Fix all compiler warnings produced by gcc. 
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
 2013-03-05 17:01:00 -08:00
waiter 814feca53b fix OpenSLEngine can't load resources from SD card 2013-03-04 14:54:43 +08:00
minggo 96c5be91e3 Merge pull request #2076 from sbc100/cocos_nacl 
Native Client port
 2013-03-03 18:24:04 -08:00
jsambuo 2487528a72 fixing bug where SimpleAudioEngine::playEffect() and SimpleAudioEngine::playBackgroundMusic() on linux plays twice 2013-03-03 11:57:01 -05:00
jsambuo 54a582b3da fixing issue with SimpleAudioEngine::getEffectsVolume() for linux 
SimpleAudioEngine::getEffectsVolume() was returning the background music volume when run on linux.
 2013-03-03 11:55:51 -05:00
Sam Clegg 33c422d1d5 Add new port: Native Client 2013-03-02 12:15:24 -08:00
jiang xiaohua efc5a4bf2f del include path 2013-02-28 10:35:56 +08:00
jiang xiaohua 3d451400db delete search path 2013-02-25 10:30:34 +08:00
jiang xiaohua 5a5e25a1fa delete searpath 2013-02-25 10:28:37 +08:00
jiang xiaohua 323453d31b add the CocosDenshion project 2013-02-21 14:04:30 +08:00
James Chen 2626005d20 issue #1712: Updating project setting for blackberry. 2013-02-17 16:26:08 +08:00
moadib b5fd738ec5 s_backgroundMusics map value should be released when stopBackground called with bReleaseData=true 2013-02-13 11:38:50 +04:00
moadib f7996aa691 Added support for multiple background music sources to CocosDenshion for Blackberry 2013-02-12 19:06:26 +04:00
James Chen 1e5431bcc5 issue #1770: Adding webp support for blackberry and marmalade. 2013-02-06 10:52:13 +08:00
James Chen e18c6a73c2 Updating CocosDenshion eclipse project for linux. 2013-01-29 12:07:05 +08:00
James Chen 75d926f810 issue #1683: Fixing complication errors for blackberry. 2013-01-28 21:16:01 +08:00
James Chen fa7175f6f7 issue #1683: Using full path in CocosDenshion API. 2013-01-27 21:10:53 +08:00
James Chen 7c27cbfd22 Updating Makefile of CocosDenshion for linux port. 2013-01-27 19:57:54 +08:00
James Chen eec0ba3c19 Getting full path in before playing sound. 2013-01-27 19:20:49 +08:00
James Chen 2235f745d3 issue #1683: Fixed compilation error for Win32. 2013-01-25 22:30:16 +08:00
James Chen 6f3b22031f Using new API of getting full path for file name. 2013-01-25 20:51:52 +08:00
James Chen 4d900c2d15 Removing `assets/` in the full path since it isn't needed for the API of playing sound. 2013-01-25 20:51:00 +08:00
James Chen bc76cf09c4 Added filename lookup support for win32. 2013-01-18 21:54:48 +08:00
James Chen 0a42829428 issue #1667: Adding file name lookup support for iOS and Android, TBD: Other platform supports. 2013-01-18 18:05:32 +08:00
johnangel 0d476604e0 Detect VS2012 Update 1 2013-01-08 10:58:38 +01:00
johnangel 674bb8e728 Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010. 2013-01-07 11:51:05 +01:00
James Chen 9bd302e35b fixed #1627: VS version check in project file. 2012-12-29 13:54:46 +08:00
James Chen f2f3aa55bf Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012 
Conflicts:
	samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
	samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
	samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
	samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
	samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
	samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
	samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
	scripting/javascript/bindings/generated
	scripting/lua/proj.win32/liblua.vcxproj
 2012-12-29 09:48:22 +08:00
johnangel 08cd9e37fc Setting PlatformToolSet to v110_xp for Visual Studio 2012 only. 2012-12-24 10:27:56 +01:00
James Chen f323b77548 Merge branch 'lnximprove' of https://github.com/ivzave/cocos2d-x into linux 2012-12-24 09:52:55 +08:00
Denis Mingulov 6d895e634c Compilation fix for Android clang 3.1 2012-12-22 07:58:30 +02:00
ivzave fcce930188 repair linux eclipse build & add 64-bit project configurations 2012-12-22 07:14:59 +04:00
unknown adb68ddbb6 Enable Windows XP support in Visual Studio 2012 Update 1. 
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
 2012-12-19 19:28:25 +01:00
dualface 98ea80329e fix android compile warning 2012-12-14 18:01:54 +08:00
Mat Hopwood cd219162e0 CocosDenshion fix 2012-12-04 11:03:34 +08:00
James Chen f2e0df4de3 issue #1565: Removed VS2008 support. 2012-11-19 14:42:27 +08:00
Mat Hopwood 988835560d Marmalade Support 
Full Marmalade support added for Cocos2d-x
 2012-10-19 16:26:34 +01:00
wenbin1989 5cfff102ad fix bug in android CocosDenshion 
the method called by JNI is moved from Cocos2dxActivity.java to
Cocos2dxHelper.java.
 2012-10-16 16:20:41 +08:00
wenbin1989 bb6a2c58de fix getDeviceModel bug in android CocosDenshion 
deviceModel must be used before release, otherwise it will cause
garbled character when getDeviceModel sometimes.
 2012-10-16 16:10:14 +08:00
James Chen 0dfa1b566b Fixed compilation errors of blackberry platform. 2012-09-26 11:16:44 +08:00
walzer 06f639edab update copyright to 2012, update cocos2d version to 2.0.3 
1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
 2012-09-24 21:22:20 +08:00
minggo dca626eab0 Merge pull request #1357 from ByungChoi/linux_makefile 
Linux makefile
 2012-09-21 02:12:45 -07:00
minggo 0a1f0369e6 fixed #1481: merge Nicolas's pull request and do some bug fixes 2012-09-21 17:01:19 +08:00
Byung Choi ad5836a3ca debug & release makefiles for cocos2dx, box2d, chipmunk, cocosdenshion 2012-09-19 04:42:57 +09:00
James Chen 9ba5a1bfef issue #1454: Removed COCOS2D_JAVASCRIPT macro. 2012-08-31 21:23:23 +08:00
James Chen a2b5916301 Using 'getHashCodeByString(typeid(*native_obj).name())' instead of 'reinterpret_cast<long>(typeid(*native_obj).name());'. 
Since on win32 platform, 'reinterpret_cast<long>(typeid(*native_obj).name());' invoking in cocos2d.dll and outside cocos2d.dll(in TestJavascript.exe) will return different address.
But the return string from typeid(*native_obj).name() is the same string, so we must convert the string to hash id to make sure we can get unique id.
 2012-08-29 14:49:03 -07:00
folecr d4948939b6 Remove spidermonkey bindings from the CocosDenshion and cocos2dx module makefiles 
* ... they should only be included by cocos+JavaScript applications
 2012-08-28 17:43:57 -07:00
Rohan Kuruvilla 8d7516a0ef Test project for cocos2d-x js. 2012-08-27 10:07:31 -07:00
Rolando Abarca a33947711f updates CocosDenshion 2012-08-27 08:43:39 -07:00
Rolando Abarca 033ae81871 adds COCOS2D_JAVASCRIPT for some specifics parts 2012-08-27 08:43:39 -07:00
folecr a033959b81 Dynamic typing for cocosdenshion's JS bindings 2012-08-27 08:43:39 -07:00
Rolando Abarca ea6ae3903c minor changes to cocosdenshion 2012-08-27 08:43:38 -07:00
folecr a8a656de44 cleanup header 2012-08-27 08:43:38 -07:00
Rolando Abarca 2ea8350518 adds OBJECT_TYPE info to CocosDenshion 2012-08-27 08:43:37 -07:00
James Chen 7eb5d85298 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_bb 2012-08-20 15:49:24 +08:00
minggo c8808b5be2 Merge pull request #1197 from mustime/bug1284 
issue #1284: fix a compile error for missing android.so
 2012-08-19 21:53:32 -07:00
mustime cd6241655b issue #1284: fix a compile error for missing android.so 2012-08-20 12:49:59 +08:00
Dale Ducharme 4004a8ac61 Cocos2dx for gles2. 2012-08-17 17:45:21 -04:00
minggo d6d6332048 Merge pull request #1189 from mustime/bug1284 
Bug1284
 2012-08-16 19:10:32 -07:00
mustime 6f615ce085 issue #1284: add auto-detection of I9100 model for OpenSLES 2012-08-17 09:58:04 +08:00
mustime 4eee341407 issue #1284: add auto-detection of I9100 model for OpenSLES 2012-08-17 09:51:49 +08:00
minggo 316c484936 Merge pull request #1173 from mustime/bug1284 
issue #1284: add detection for I9100 model
 2012-08-16 18:39:28 -07:00
James Chen 48fa8a4e88 fixed #1419: Update eclipse project configurations for linux port. 2012-08-16 18:09:01 +08:00
mustime 81f9e68351 issue #1284: using dlopen instead of specifing android-9 platform 2012-08-15 15:57:23 +08:00
mustime dd2e8988da issue #1284: fix the error when comparing two string 2012-08-14 10:47:20 +08:00
mustime 0933a032e9 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1284 2012-08-14 09:41:18 +08:00
mustime 89f0508043 issue #1284: add detection for I9100 model 2012-08-13 17:14:33 +08:00
James Chen 9c26e38563 Merge branch 'gles20' of https://github.com/tongpengfei/cocos2d-x into linux_gles20 2012-08-03 10:10:33 +08:00
minggo 9ea793d0e2 Merge pull request #1151 from mustime/bug1284 
issue #1284: fixed the problem that if the same effect is played for two times, it will stop and restart
 2012-08-02 02:07:55 -07:00
pengfei tong a37fd743e0 [FIX] testjs 2012-08-02 16:23:31 +08:00
mustime 6beae122da issue #1284: fixed the problem that if the same effect is played for two 
times, it will stop and restart
 2012-08-02 14:28:40 +08:00
pengfei tong b93d0b5ebf [LOG] add linux port 2012-08-02 13:02:59 +08:00
minggo 7bfc88c568 Merge pull request #1130 from mustime/bug1284 
issue #1284: using OpenSL for playing effects on I9100
 2012-07-26 20:31:51 -07:00
mustime b4e7e1152f issue #1284: fix the problem that effect still plays after stop->resume 2012-07-27 10:36:05 +08:00
mustime 491c05b25c issue #1284: unify the static variables' name to s_pXX 2012-07-26 16:45:21 +08:00
mustime 2e335f6dee issue #1284: changed some names to make the code more readable 2012-07-26 16:22:23 +08:00
mustime bfc53e3453 issue #1284: using OpenSL for playing effects on I9100 2012-07-26 15:30:09 +08:00
James Chen 9a6729551c Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399 2012-07-23 11:59:47 +08:00
James Chen 2ab5e4ab9c issue #1399: Added vs2010 support. 2012-07-23 11:57:34 +08:00
James Chen 7f6ffef8cf issue #1399: Set the flag 'LinkIncremental' value to false. 2012-07-23 11:47:27 +08:00
minggo ac70f8def5 Merge branch 'gles20-adjust-structure' into merge 2012-07-23 11:36:46 +08:00
James Chen baaf9dc930 issue #1399: Renamed 'cocosDeshion' to 'CocosDeshion'. 2012-07-23 10:56:45 +08:00
Nat Weiss d4b6d1262b Adding Mac support! 2012-07-20 21:23:40 -07:00
James Chen 77f1fba566 issue #1399: Adjust folder structure, made it built successfully on win32. 2012-07-20 14:05:52 +08:00
Nat Weiss ee12785c6a Fixes Win32 error "The application failed to initalize properly 0xc000000d" 2012-07-08 23:54:29 -07:00
minggo 16310cb544 fixed #1364:add paused state 2012-06-26 11:02:19 +08:00
minggo 5cc1f7d230 fixed #1338:stop animation when entering background and start animation when comming to foreground 2012-06-21 11:42:49 +08:00
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
minggo af9ada06af fixed #iss1299_simpleaudioengine: can not reusme effect that not in paused state 2012-06-14 15:20:17 +08:00
minggo 77f51b5c48 issue #1310:synchronize CocosDenshion 2012-06-11 15:01:23 +08:00
James Chen ebcc78497f fixed #1282: Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error. 2012-06-01 13:44:28 +08:00
James Chen 19c96632b5 fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces. 2012-05-29 16:21:23 +08:00
James Chen 82439733c5 fixed #1204: Made CCEGLView::Create(on win32) as a private function. Updated ExtensionsTest. 
And updated the format of source files(changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces).
 2012-05-03 10:12:00 +08:00
minggo 7e882ae89e Merge pull request #879 from minggo/iss1201_android_build 
simplify writing of Android.mk
 2012-05-02 03:19:36 -07:00
James Chen 61f33a87af fixed #1206: Removed some unused files, first release will only support ios, win32 and android. 2012-05-02 14:50:47 +08:00
minggo c048fe77c6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1201_android_build 2012-05-02 14:41:49 +08:00
minggo f37d3dd5d3 issue #1201: simplify writing of Android.mk 2012-05-02 12:00:39 +08:00
Walzer 2addd06f21 fixed #1203, remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone. 2012-05-02 10:39:17 +08:00
James Chen 230b8a386b issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
 2012-04-19 14:35:52 +08:00
James Chen 32b53623c7 Removed some unused folders regard to WOPHONE. 2012-04-19 10:52:53 +08:00
James Chen 7d7baf81a2 refactor updated... 2012-04-18 18:43:45 +08:00
minggo bfa8b65cc5 fixed #1028: correct directory name 2012-03-08 10:09:17 +08:00
James Chen fa72c65737 fixed #1008: Missing "return" in SimpleAudioEngine::getEffectsVolume() method on android platform. 2012-03-04 11:25:01 +08:00
James Chen e1413dff5e update linux project configure 2012-02-15 15:57:09 +08:00
James Chen a2a5af3348 update bada and qnx project settings 2012-02-15 13:52:41 +08:00
James Chen 2ef7b5d413 refactor folders for qnx 2012-02-15 11:26:28 +08:00
James Chen d0266f0064 refactor folder 2012-02-15 10:45:14 +08:00
James Chen 4fb9282569 move library to platform folders 2012-02-15 10:35:19 +08:00
James Chen 3422696145 1.modify some project setting for bada 
2.rename some files
 2012-02-14 22:35:51 +08:00
minggo 9249328afb fixed #970: use modules in the Android NDK build 2012-02-07 14:34:30 +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 ef753afb6b modify eclipse project setting for linux port 2012-01-12 19:15:23 +08:00
dumganhar 4848dc9c46 fix a bug in SimpleAudioEngine.cpp on bada platform 
use float value to change volume
 2012-01-11 17:24:46 +08:00
dumganhar 92ea6596a3 use ceil function to set effect volume 2011-12-31 18:08:41 +08:00
dumganhar 82c978c34e setEffectVolume, apply for all effect instance. 2011-12-31 17:53:01 +08:00
dumganhar 4010733c20 fixed #927: To use 'std::map::find' instead of 'std::map::[]', because '[]' will create a new element with default value. 2011-12-31 17:44:45 +08:00
dumganhar d6c18ab71c fixed #927: unloadEffect called after stopEffect will cause crash 2011-12-29 14:54:18 +08:00
minggo edbbe25a98 issue #888: remove the setting for android building 2011-12-23 10:40:02 +08:00
minggo 3a3dcf736b fixed 924: make cocosdenshion thread safe for preloading 2011-12-22 15:06:00 +08:00
dumganhar a8d5b6544a Merge pull request #629 from gzito/master 
Optimized ttf to bitmap, cached last loaded ttf & fixed ttf alpha. Other minor fixes. Added authors info.
 2011-12-19 18:46:07 -08:00
gzito e3c5d6886e Added authors info 2011-12-19 22:57:04 +01:00
minggo a08ae8ef12 Merge pull request #627 from minggo/iss884_cocosdenshion 
fixed #884: make classOfCocos2dxActivity as a global reference
 2011-12-19 00:06:08 -08:00
minggo 0f5dd0dbb1 fixed #884: make classOfCocos2dxActivity as a global reference 2011-12-19 15:00:51 +08:00
dumganhar af221f8710 fixed #918: modify filter of airplay to marmalade. 2011-12-16 11:08:37 +08:00
Didiet Noor 7f7ef29b21 Fixes on QNX project accidentally including marmalade 2011-12-14 16:50:26 +08:00
Didiet Noor 426bfdbdca Removing static Resource Path on CocosDenshion for qnx 2011-12-14 16:23:18 +08:00
dumganhar 4b9cbb85ff #issue 908: Merge marmalade to latest cocos2d-x source 
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade

Conflicts:
	cocos2dx/platform/CCFileUtils.cpp
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/support/zip_support/ioapi.cpp
 2011-12-12 17:46:21 +08:00
dumganhar baf3755142 remove some '__QNX__' macros 2011-12-12 16:14:12 +08:00
dumganhar dea2713f51 fixed #907: add blackberry port 
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into blackberry

Conflicts:
	cocos2dx/platform/CCSAXParser.h
 2011-12-12 11:49:49 +08:00
minggo 8c5c3300aa Merge pull request #612 from dumganhar/issue904 
Issue904
 2011-12-11 19:33:07 -08:00
gzito cc2ad0c514 Added marmalade support, removed airplay 2011-12-11 10:24:38 +01:00
gzito 47e108a8c5 Added marmalade support, removed airplay 2011-12-11 10:19:41 +01:00
styck bcf63d0e96 Merged from gitbub.gom/gzito, marmalade support, remove airplay 2011-12-10 20:59:48 -08:00
dumganhar 1c9ecabd89 modify all projects config 2011-12-09 17:03:11 +08:00
dumganhar 5dea9b8205 fix a crash bug in SimpleAudioEngine.cpp 
update helloworld and tests main.cpp and AppDelegate.cpp files
 2011-12-09 15:54:35 +08:00
Giovanni Zito f1ab4893f6 Fixed isBackgroundMusicPlaying so that returns a bool value 2011-12-09 08:01:42 +01:00
dumganhar b398d75e21 modify tests 'Res' link to 'Resource', remove the coupling between CocosDenshion and Cocos2dx 2011-12-09 10:32:00 +08:00
Giovanni Zito 269efd0b74 Added support to play more than one sound fx at once 2011-12-08 19:26:44 +01:00
Giovanni Zito 0c1b058629 Changed symbols from "airplay" to "marmalade", added files and folders for marmalade 2011-12-08 12:16:32 +01:00
dumganhar b11bcacea8 modify Device-Debug project setting, finished running on device! 2011-12-08 18:22:06 +08:00
Giovanni Zito 1eb8ba656e Added marmalade folder 2011-12-08 11:15:20 +01:00
dumganhar fa07d16f73 switch to WVGA 2011-12-08 11:07:17 +08:00
dumganhar de7754697f fixed #904: use relative path for bada 2.0 projects 2011-12-07 18:26:38 +08:00
styck 96d400d918 Replace expat with libxml2, added libxml2 libraries and header files. Library built from: https://github.com/marmalade/marmalade-libxml2 
Refactored Accelerometer to match other platforms

Updated SimpleAudioEngine.cpp with new functions.  (NOT tested).

Updated app.icf for latest Marmalade

Update deprecated function calls.

Removed CCSAXParser_aiplay.cpp - not used, uses default in platform.
 2011-12-06 18:32:36 -08:00