minggo
|
e90e975e3d
|
Merge pull request #3911 from minggo/iss2905-adjust_folder
[ci skip]SimpleAudioEngine -> audio
|
2013-10-10 18:27:25 -07:00 |
James Chen
|
0ad7a9fd4b
|
issue #2823: minor fix and logs.
|
2013-10-10 16:18:10 +08:00 |
James Chen
|
b5d02d8cca
|
issue #2823: firefox debugger step ok.
|
2013-10-10 16:18:09 +08:00 |
minggo
|
866906fd58
|
issue #2905:modify project settings to include correct audio path
|
2013-10-10 15:40:06 +08:00 |
Dhilan007
|
a8f0c99abf
|
Fix miss project configuration for CoreMotion.
|
2013-10-10 11:12:33 +08:00 |
Dhilan007
|
5acac436f9
|
issues #2677:Use CoreMotion's API to replace UIAccelerometer.
|
2013-10-08 10:11:52 +08:00 |
Ricardo Quesada
|
cd557a11bf
|
Adds missing icons to templates and samples
|
2013-09-20 14:06:44 -07:00 |
Ricardo Quesada
|
2ab1b2ff04
|
Lua template: ios and mac projects in one Xcode file
Merged iOS and Mac projects into one single Xcode.proj file
|
2013-09-19 17:05:00 -07:00 |
Ricardo Quesada
|
d6675df75b
|
Adds iOS7 icons in SimpleGame and HelloCpp
|
2013-09-19 11:44:20 -07:00 |
minggo
|
40d91f0afa
|
disable compressing png when deploying for iOS device
|
2013-09-18 11:16:28 +08:00 |
James Chen
|
f403f7d683
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test
Conflicts:
samples/samples.xcodeproj/project.pbxproj
|
2013-09-17 23:24:14 +08:00 |
James Chen
|
e563c27994
|
Keypad event fix for js and lua bindings.
|
2013-09-17 23:21:45 +08:00 |
minggo
|
d488796896
|
Merge branch 'iss2771_physical' of https://github.com/boyu0/cocos2d-x into merge-physics
|
2013-09-17 18:14:12 +08:00 |
James Chen
|
43e98be8b7
|
Adding resources of CocoStudio GUI Test.
|
2013-09-17 17:46:40 +08:00 |
boyu0
|
acbb50b543
|
issue #2771: edit Xcode project setting.
|
2013-09-17 16:28:32 +08:00 |
boyu0
|
9f7bf4349c
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-09-17 11:19:47 +08:00 |
boyu0
|
a48fee881d
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-09-16 22:16:50 +08:00 |
CaiWenzhi
|
ca599b4852
|
Merge guy to 3.0 branch
|
2013-09-16 20:54:13 +08:00 |
James Chen
|
51548b9542
|
Adding NewEventDispatcher Test.
|
2013-09-13 16:38:21 +08:00 |
boyu0
|
d161c6a576
|
issue #2771: Add PhysicsTest to TestCpp. Add initTest to TestScene, move Scene::init() from constructor to TestScene::initTest()
|
2013-09-10 17:41:06 +08:00 |
chengstory
|
bdfde89ef8
|
Merge branch '#develop' into #4551
Conflicts:
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
|
2013-09-10 16:25:31 +08:00 |
chengstory
|
669de88e73
|
1. remove any unused functions.
|
2013-09-10 11:02:50 +08:00 |
Huabing.Xu
|
8a86a883d0
|
issue #2782: update mac version, update test case title
|
2013-09-09 21:33:01 +08:00 |
Huabing.Xu
|
d7d914feb1
|
Merge branch 'develop' into new_shader_test
|
2013-09-09 18:18:31 +08:00 |
Huabing.Xu
|
d763de3d3c
|
new shader test code
|
2013-09-09 17:49:13 +08:00 |
minggo
|
76a1b36191
|
Merge pull request #3546 from minggo/alloc_perf_test
Alloc perf test
|
2013-09-05 23:30:15 -07:00 |
Ricardo Quesada
|
02500372ed
|
Adds new perf test: alloc / dealloc
|
2013-09-05 20:02:04 -07:00 |
minggo
|
249b4d79a3
|
Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor
Iss2460 glfw refractor
|
2013-09-05 18:28:31 -07:00 |
Huabing.Xu
|
bc5ae78423
|
issue #2460: change other sample projects to glfw version
|
2013-09-02 11:46:23 +08:00 |
samuele3hu
|
8f338cc209
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator-new
Conflicts:
tools/tolua/cocos2dx.ini
|
2013-08-30 15:21:59 +08:00 |
Ricardo Quesada
|
eff8f4307f
|
Project is Xcode 5 friendly
Adds defaults for provisioning profile. Needed for iOS on Xcode 5
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
|
2013-08-28 12:43:50 -07:00 |
samuele3hu
|
1dabab2ca5
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
Conflicts:
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.hpp
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js
|
2013-08-28 15:35:33 +08:00 |
samuele3hu
|
9e071afe09
|
issue #2433:Add more deprecated function and modify some test
|
2013-08-28 15:11:19 +08:00 |
Huabing.Xu
|
e935481361
|
Merge branch 'develop' into Iss2460-glfw-refractor
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/platform/mac/CCEGLView.mm
samples/Cpp/TestCpp/proj.linux/main.cpp
samples/Cpp/TestCpp/proj.win32/main.cpp
|
2013-08-28 13:42:22 +08:00 |
James Chen
|
7552a72577
|
issue #2732: [iOS] Updating the reference of auto-generated binding glue codes.
|
2013-08-27 16:05:48 +08:00 |
Huabing.Xu
|
b2e167c6ea
|
issue #2460: glfw mac version
|
2013-08-21 12:01:56 +08:00 |
samuele3hu
|
c8b75a1080
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
|
2013-08-16 10:13:38 +08:00 |
samuele3hu
|
13fd369beb
|
issue #2433:Modify lua binding generator template and releated action test
|
2013-08-14 21:35:55 +08:00 |
carlo morgantini
|
097a5c488a
|
New Label tests plus bug fixing
|
2013-08-12 13:29:54 -07:00 |
carlo morgantini
|
b2579987e5
|
Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/include/ccTypes.h
samples/samples.xcodeproj/project.pbxproj
|
2013-07-31 13:58:25 -07:00 |
minggo
|
0530109a9f
|
Merge pull request #3178 from boyu0/2345
Refactor CCImage and CCTexture2D
|
2013-07-31 01:21:18 -07:00 |
minggo
|
1d2b1c79c2
|
closed #2438:remove mac 32-bit support
|
2013-07-30 18:02:35 +08:00 |
boyu0
|
304d636deb
|
Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
|
2013-07-29 11:40:18 +08:00 |
minggo
|
bc4845b856
|
fixed a link error of HelloLua Mac 32 bit
|
2013-07-29 09:30:42 +08:00 |
boyu0
|
cecfc13bc4
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
|
2013-07-27 22:06:30 +08:00 |
James Chen
|
ea9988fde6
|
[Mac] Adding resources for SimpleGame.
|
2013-07-27 10:28:40 +08:00 |
Ricardo Quesada
|
e0523b3438
|
Merge branch 'developNewLabelForRiq' into label_merge
Conflicts:
cocos2dx/textures/CCTexture2D.h
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
scripting/javascript/bindings/generated
tools/bindings-generator
|
2013-07-24 15:15:08 -07:00 |
samuele3hu
|
e9df175e9a
|
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
|
2013-07-24 10:15:16 +08:00 |
Ricardo Quesada
|
88928fff99
|
Merge branch 'developNewLabelMerge' into merge_new_label
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/textures/CCTexture2D.h
samples/Javascript/Shared
|
2013-07-19 16:04:23 -07:00 |
boyu0
|
948acd6e29
|
Refactor CCTexture2D and CCImage
|
2013-07-19 15:37:54 +08:00 |