SunLightJuly
|
1062dec335
|
modified project files and make files
|
2014-10-08 18:44:58 +08:00 |
SunLightJuly
|
763b54e5cb
|
added LuaStack::loadChunksFromZIP()
|
2014-10-08 17:30:14 +08:00 |
minggo
|
640ad4a422
|
[ci skip] Update CHANGELOG
|
2014-10-08 13:50:22 +08:00 |
minggo
|
8aa03e107f
|
Merge pull request #8209 from boyu0/fix_physics_crash
fix bug: physics crashes when remove/add children too quick.
|
2014-10-08 13:48:03 +08:00 |
minggo
|
de352dcbec
|
Merge pull request #8570 from CocosRobot/update_cocosfiles_1412732478
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-08 11:37:12 +08:00 |
CocosRobot
|
75f21f9c10
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-08 01:41:20 +00:00 |
minggo
|
3873bbc5f7
|
Merge pull request #8060 from giuslape/v3
Update Reference plugin-x
|
2014-10-08 09:39:45 +08:00 |
minggo
|
d1a0934e61
|
Merge pull request #8564 from CocosRobot/update_cocosfiles_1412601098
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-06 21:26:46 +08:00 |
CocosRobot
|
d090576b94
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-06 13:11:39 +00:00 |
minggo
|
81a1de7ab4
|
Merge pull request #7876 from martell/cmakewin
CMake support for Windows, Mac, Linux, and initial support for IOS and Android
|
2014-10-06 21:09:16 +08:00 |
Ricardo Quesada
|
222bff3228
|
Merge pull request #8558 from ricardoquesada/more_samples_using_node_lambda
more samples using node::schedule(labmda)
|
2014-10-03 17:12:30 -07:00 |
Ricardo Quesada
|
84da993677
|
more samples using node::schedule(labmda)
|
2014-10-03 17:11:39 -07:00 |
martell
|
65795ea022
|
IOS: Added initial cmake toolchain
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-04 00:55:04 +01:00 |
martell
|
9c61477739
|
linux: fixed include dirs
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:43 +01:00 |
martell
|
8a4b8afc6c
|
Android: added support for building libcocos2d
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:35 +01:00 |
martell
|
d420ae39e2
|
Added CC_STATIC support for 3d, all these commits will be squashed and renamed, structured and signed at the end
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:27 +01:00 |
martell
|
1a7ecbe427
|
Finalise Mac Support for cmake
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:19 +01:00 |
martell
|
c3172bef50
|
Finalise Windows cmake support for mingw-w64
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:09 +01:00 |
martell
|
ecd8a02ee6
|
Fixed up some more cmake errors
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:01 +01:00 |
martell
|
30240a8a37
|
Multi platform cmake support
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:21:45 +01:00 |
martell
|
f258a81263
|
Enable Static and Shared support in CMakeLists
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:21:37 +01:00 |
martell
|
510b8d525b
|
added flags for shared windows build
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:21:29 +01:00 |
martell
|
b911c240c9
|
added support for static and shared builds with extensions
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:21:19 +01:00 |
martell
|
fe32bcb952
|
added support for static and shared builds with audio and studio
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:20:52 +01:00 |
martell
|
c7f3594a1b
|
added support for static and shared builds with ui
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:20:38 +01:00 |
martell
|
d9228d31c0
|
added support for static and shared builds on windows
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:20:18 +01:00 |
martell
|
028d15921e
|
fix warning because of extra comma's
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:19:57 +01:00 |
martell
|
1ef0f41e0e
|
Changed WIN32 to _WIN32 to support gnu c++11
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:17:55 +01:00 |
Ricardo Quesada
|
3731343260
|
Merge pull request #8556 from ricardoquesada/more_node_scheduler_fixes
scheduler and macro fixes
|
2014-10-03 09:40:30 -07:00 |
Ricardo Quesada
|
342d934a0e
|
scheduler and macro fixes
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)
Updates all smaples
|
2014-10-03 09:38:36 -07:00 |
Ricardo Quesada
|
b58c0497ab
|
Merge pull request #8551 from ricardoquesada/adds_lambda_support_in_node
Adds lambda support in node
|
2014-10-02 21:26:59 -07:00 |
Ricardo Quesada
|
42ace3e59c
|
Adds lambda support in node
It is now possible to schedule lambda functions in Node::schedule()
No need to subclass
|
2014-10-02 21:25:55 -07:00 |
Ricardo Quesada
|
0c2fcaa0ca
|
Merge pull request #8549 from ricardoquesada/win32_fixes
works on win32
|
2014-10-02 17:16:19 -07:00 |
Ricardo Quesada
|
cc3df75d1f
|
works on win32
std::iterators weren't used correctly
|
2014-10-02 15:46:47 -07:00 |
Ricardo Quesada
|
1db29f07bd
|
Merge pull request #8547 from ricardoquesada/windows_phone8_project_fixes
Compiles on Windows Phone 8
|
2014-10-01 19:11:00 -07:00 |
Ricardo Quesada
|
12e9d18ab7
|
Compiles on Windows Phone 8
|
2014-10-01 19:08:34 -07:00 |
minggo
|
bb6ba600a3
|
Merge pull request #8219 from cocoscodeide/v3
runtime template support Xcode6
|
2014-09-30 17:10:51 +08:00 |
minggo
|
44aba5b2af
|
Merge pull request #8185 from newnon/v3_Scale9Sprite_improvements
Scale9Sprite improvements
|
2014-09-30 17:09:02 +08:00 |
honghui
|
62e06d25ed
|
runtime template support Xcode6
|
2014-09-30 17:08:14 +08:00 |
honghui
|
7dbac13993
|
runtime template support Xcode6
|
2014-09-30 15:49:58 +08:00 |
minggo
|
d423e8f800
|
[ci skip] Update CHANGELOG
|
2014-09-30 15:21:54 +08:00 |
minggo
|
2ecfcee2a6
|
Merge pull request #8216 from Dhilan007/v3-audio-fix
fix audio issues(log output:Too Many Objects) after play audio many times on Android
|
2014-09-30 15:19:46 +08:00 |
minggo
|
da01d67bc6
|
Merge pull request #8217 from CocosRobot/update_cocosfiles_1412061015
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-30 15:14:47 +08:00 |
minggo
|
769fd26196
|
Merge pull request #8218 from CocosRobot/update_lua_bindings_1412061095
[AUTO]: updating luabinding automatically
|
2014-09-30 15:14:08 +08:00 |
CocosRobot
|
a96a2a992d
|
[AUTO]: updating luabinding automatically
|
2014-09-30 07:13:25 +00:00 |
minggo
|
f9005868d4
|
[ci skip] Update CHANGELOG
|
2014-09-30 15:11:51 +08:00 |
CocosRobot
|
181ef40285
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-30 07:10:16 +00:00 |
minggo
|
d1a0adf1a9
|
Merge pull request #8200 from Dhilan007/v3-audio-win32
New Audio Engine[Win32]
|
2014-09-30 15:09:00 +08:00 |
Dhilan007
|
ed9c8b2693
|
fix audio issues(log output:Too Many Objects) after play audio many times.
|
2014-09-30 15:00:52 +08:00 |
Sergey Perepelitsa
|
d9204b009e
|
scale9Sprite without scale9enabled scale fix
scale9Sprite crop > border tile bug fix
|
2014-09-30 10:59:20 +04:00 |