boyu0
|
49cb2ce9d5
|
closed #2920: fix compile error after merge.
|
2014-02-19 14:12:57 +08:00 |
boyu0
|
0b07d376f6
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
|
2014-02-19 13:42:02 +08:00 |
James Chen
|
905443d17c
|
new[] free mismatching after PR #5326.
|
2014-02-18 10:11:04 +08:00 |
James Chen
|
1693ea0ef6
|
Typo fix in CCDevice.mm.
|
2014-02-14 09:41:06 +08:00 |
Dhilan007
|
0d5c702708
|
move labelttf's platform-dependent code from CCImage to CCDevice
|
2014-02-13 21:08:43 +08:00 |
boyu0
|
20ee1d2666
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
|
2014-02-07 11:37:01 +08:00 |
Ricardo Quesada
|
7da8c84a75
|
Renames EGLView -> GLView
|
2014-01-30 16:51:43 -08:00 |
Ricardo Quesada
|
862500f99a
|
Renames EGLView -> GLView
|
2014-01-30 15:40:56 -08:00 |
Ricardo Quesada
|
d19a1012a4
|
Adds the possibility to create EAGLView with an EAGLView
|
2014-01-30 15:11:37 -08:00 |
Ricardo Quesada
|
4ed2e0d9d2
|
Merge branch 'develop' into glview_improvements
Conflicts:
CHANGELOG
cocos/2d/platform/linux/CCApplication.cpp
samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp
samples/Cpp/HelloCpp/Classes/AppDelegate.cpp
samples/Cpp/HelloCpp/Classes/AppMacros.h
samples/Cpp/HelloCpp/proj.ios/AppController.mm
samples/Cpp/HelloCpp/proj.mac/main.cpp
samples/Cpp/SimpleGame/Classes/AppDelegate.cpp
samples/Cpp/SimpleGame/proj.ios/AppController.mm
samples/Cpp/SimpleGame/proj.mac/main.cpp
samples/Cpp/TestCpp/Classes/AppDelegate.h
samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
samples/Javascript/CocosDragonJS/proj.ios/AppController.mm
samples/Javascript/CocosDragonJS/proj.mac/main.cpp
samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
samples/Javascript/CrystalCraze/proj.ios/AppController.mm
samples/Javascript/CrystalCraze/proj.mac/main.cpp
samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp
samples/Javascript/MoonWarriors/proj.ios/AppController.mm
samples/Javascript/MoonWarriors/proj.mac/main.cpp
samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp
samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm
samples/Javascript/WatermelonWithMe/proj.mac/main.cpp
samples/Lua/HelloLua/Classes/AppDelegate.cpp
samples/Lua/HelloLua/proj.ios/AppController.mm
samples/Lua/HelloLua/proj.mac/main.cpp
|
2014-01-28 11:32:25 -08:00 |
Ricardo Quesada
|
20346499ab
|
Continue with the refactoring
|
2014-01-27 19:16:09 -08:00 |
Ricardo Quesada
|
b96c4f1ad0
|
Only compile iOS files on iOS
|
2014-01-27 16:44:10 -08:00 |
boyu0
|
23d2d586ed
|
closed #2920: fix bug voice recognition input crash on ios7
|
2014-01-27 18:08:34 +08:00 |
martell
|
609ee3db2b
|
Added Dutch for 3.x branch
|
2014-01-25 20:38:15 +00:00 |
Ricardo Quesada
|
8ecaf49f93
|
GLView improvements
it is not longer a singleton
it is possible to specify the size
|
2014-01-23 15:36:55 -08:00 |
Ricardo Quesada
|
9386866d56
|
cocos2d::log() moved to CCConsole
Unified console code since it is 90% similar to all platforms
|
2014-01-10 19:04:07 -08:00 |
Ricardo Quesada
|
c68ad76bfe
|
don't send "unknown command".
... if the command is an empty command
|
2014-01-10 18:11:35 -08:00 |
walzer
|
64af0de648
|
update copyrights for 2014, in cocos/2d/ folder
|
2014-01-07 11:25:07 +08:00 |
boyu0
|
6e6ccbd5f9
|
change some const char* to const std::string&
|
2013-12-24 15:49:58 +08:00 |
boyu0
|
71be55a9aa
|
revert AccelerometerSimulation.m
|
2013-12-18 19:02:49 +08:00 |
boyu0
|
e07c4ffec1
|
Change NULL to nullptr, edit hungarian notation.
|
2013-12-18 17:47:20 +08:00 |
minggo
|
b67d567a79
|
replace long with int or ssize_t
|
2013-12-05 17:22:22 +08:00 |
Ricardo Quesada
|
90f51e0dab
|
Merge branch 'develop' into constructors_are_protected
|
2013-11-20 11:26:55 -08:00 |
Ricardo Quesada
|
6a8c4784a4
|
Adds some #pragma mark love
|
2013-11-20 11:26:33 -08:00 |
Ricardo Quesada
|
208d25bdff
|
ControlSwitch compies
Uses procted constructor
|
2013-11-15 12:04:47 -08:00 |
Ricardo Quesada
|
a583ad461f
|
CCControlButton has protected constructor
|
2013-11-14 17:19:16 -08:00 |
bmanGH
|
683ce1692d
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into feature/configuration_VAO_runtime
Conflicts:
cocos2dx/CCConfiguration.cpp
cocos2dx/draw_nodes/CCDrawNode.cpp
cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
cocos2dx/platform/android/CCEGLView.cpp
cocos2dx/platform/ios/EAGLView.mm
cocos2dx/textures/CCTextureAtlas.cpp
cocos2dx/textures/CCTextureAtlas.h
|
2013-11-12 20:18:04 +08:00 |
Ricardo Quesada
|
d6446e9b14
|
calls `delete[]` instead of `delete`
calls `delete[]` instead of `delete`
|
2013-11-11 16:07:46 -08:00 |
minggo
|
cd22f5543b
|
Merge pull request #3997 from ondesly/screen_size_change
[ci skip]android & ios screen size change support
|
2013-11-10 23:10:13 -08:00 |
Ricardo Quesada
|
5faae4a51e
|
removes exe bit from text files
|
2013-11-08 11:30:50 -08:00 |
Ricardo Quesada
|
ba7ed6e578
|
Fixes some compiler warnings
The warnings are related to:
* 64-to-32-bit conversion
* shadow variables
|
2013-11-04 16:31:36 -08:00 |
Ricardo Quesada
|
0350ac7021
|
arm64 support
|
2013-11-04 11:53:40 -08:00 |
James Chen
|
5c8424423e
|
issue #3069: Update ios/CCDevice.mm.
|
2013-10-29 16:29:29 +08:00 |
James Chen
|
e2ce714463
|
issue #3069: Update device.mm for iOS.
|
2013-10-29 16:20:42 +08:00 |
James Chen
|
48ce5e39fe
|
EventDispatcher is managed by Director now, like Scheduler and ActionManager.
|
2013-10-26 15:04:01 +08:00 |
ondesly
|
969b464b9b
|
android & ios screen size change support
|
2013-10-23 12:29:59 +04:00 |
XiaoLongHan
|
a2de02cc19
|
Change the class name of textfield to compare, so that you can touch anywhere outside of the virtual keyboard.
|
2013-10-17 14:21:55 +08:00 |
James Chen
|
438fe70287
|
issue #2905: [iOS, Mac] HelloCpp works now.
|
2013-10-14 15:53:14 +08:00 |
minggo
|
95acb1b9e3
|
issue #2905: helloworld build ok on android
|
2013-10-14 14:01:00 +08:00 |
minggo
|
4313c46e93
|
issue #2905:adjust folder structure
|
2013-10-12 11:22:05 +08:00 |