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

362 Commits

Author SHA1 Message Date
Éloi Rivard 6354b7e9c3 Fixed linux compilation bug in eclipse 2013-07-05 10:28:06 +02:00
Ricardo Quesada b846a3060e cocos2d-x in Mac: 
Works as expected. All the projects defines CC_KEYBOARD_SUPPORT.
Either all of them should define them, or none, otherwise the vtable
will be broken
 2013-06-28 19:02:10 -07:00
James Chen ad7d606b48 Merge pull request #2703 from sergey-shambir/linux_qmake 
close #2332: [Linux] Adding project part for QtCreator.
 2013-06-25 21:57:20 -07:00
Ricardo Quesada ef6f67902f Adds mac workspace 
for the moment it includes TestCpp.
But Chipmunk, Box2d, cocos2dx, extensions and CocosDenshion are libraries
Like in the iOS project
 2013-06-24 18:04:05 -07:00
James Chen 8dc8fec180 issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
James Chen 7da2018128 issue #2325: Adding armv7s architecture. 2013-06-24 17:06:25 +08:00
James Chen b870488aad issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port. 2013-06-24 15:31:18 +08:00
James Chen 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
James Chen 195605c85d issue #2322: Macro CC_DLL take no effect now since we are using static library. 2013-06-23 17:21:13 +08:00
Lee, Jae-Hong 2f8b24d05c Fix compile error. 2013-06-20 19:20:27 +09:00
James Chen 0a0bada9c2 issue #2129: Removing CC prefix for CocosDenshion module. 2013-06-20 14:12:43 +08:00
minggo e89652e280 Merge pull request #2902 from waiter/master 
update "fix a bug that SimpleAudioEngine may cause crash on i9100"
 2013-06-17 03:27:20 -07:00
waiter 3921512739 update "fix a bug that SimpleAudioEngine may cause crash on i9100" 2013-06-17 09:50:39 +08:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
Lee, Jae-Hong 1bd3f10601 Support Tizen device. 2013-06-12 10:20:18 +09:00
James Chen 3cfa1a9873 [Android] Don't use c++11 feature in OpenSLEngine.cpp. 2013-06-09 15:33:31 +08:00
Lee, Jae-Hong b9f5691706 [Tizen] Add libwebsockets.h, .a and support C++11 2013-06-07 20:14:43 +09:00
Sergey Shambir 984ed75b9a Linux: added project part for QtCreator. 
Allows easily setup cocos2d on Linux in QtCreator IDE.
 2013-06-02 10:15:14 +04:00
James Chen c1d85aaab2 Merge pull request #2611 from pyrasis/tizen_2.1 
Update projects to Tizen 2.1 SDK.
 2013-05-22 02:07:06 -07:00
Lee, Jae-Hong 220ac4982a Update projects to Tizen 2.1 SDK. 2013-05-22 16:55:18 +09:00
minggo d1a8f54113 Merge pull request #2609 from j4m3z0r/emscriptenate 
Add Audio Support for Emscripten
 2013-05-21 18:32:12 -07:00
James Gregory 05ca831e0d Add audio cleanup methods for Emscripten. 2013-05-21 16:37:24 -07:00
James Gregory da7113a04f Implement audio for Emscripten using SDL. Still needs methods to release samples when we're done with them. 2013-05-20 20:09:56 -07:00
Lee, Jae-Hong fd74718b64 Implementing CocosDenshion for Tizen. 2013-05-16 20:25:24 +09:00
Lee, Jae-Hong ab8c0becbf Update CocosDenshion project. 2013-05-16 20:23:50 +09:00
Lee, Jae-Hong 67c898d308 Set output filename. 2013-05-16 20:12:53 +09:00
Lee, Jae-Hong 9bbfdf2adb Adding placeholder.txt files. 2013-05-16 20:12:31 +09:00
Lee, Jae-Hong 1169e5cc8e Adding CocosDenshion project for tizen. 2013-05-16 20:03:49 +09:00
Darragh Coy 7b67794826 Fix a potential crash SimpleAudioEngineOpenSL::playEffect 
Fix a crash in SimpleAudioEngineOpenSL::playEffect which would occur when OpenSLEngine::preloadEffect returned FILE_NOT_FOUND. In the case where the sound fails to preload, we should not attempt to call OpenSLEngine::setEffectLooping on that sound.
 2013-05-14 17:48:50 +01:00
minggo 98e3e8b37e Merge pull request #2434 from ggggamer/master 
memory leak when preloadEffect
 2013-05-07 22:49:55 -07:00
James Gregory 041fdac48a Add missing file from CocosDenshion. 2013-05-06 21:00:39 -07:00
James Gregory d529287cfa Remove LOG prefixes from emscripten makefiles 2013-05-06 21:00:38 -07:00
James Gregory c45e5797cf Add Makefiles for Emscripten + Emscripten external 2013-05-06 20:58:02 -07:00
James Chen edc8444ca4 Updating blackberry project configurations. 2013-04-27 14:07:54 +08:00
GGGGamer a858613de1 memory leak when preloadEffect 2013-04-24 12:10:18 +08:00
Éloi Rivard b9ec3ead65 * Fixed CocosDenshionTestBug 2013-03-29 09:32:50 +01:00
É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