minggo
7969224bf3
Merge pull request #2106 from waiter/master
...
Update unload effect function (android normal)
2013-03-05 22:45:10 -08:00
minggo
21722da7c4
Update AUTHORS
2013-03-06 14:43:46 +08:00
minggo
43dff78f4b
Merge pull request #2102 from DarraghCoy/ios_custom_font_loading_fix
...
Fix for loading custom fonts on iOS when referenced from a CCB file
2013-03-05 22:42:13 -08:00
waiter
e2119e1323
Merge pull request #1 from cocos2d/master
...
update cocos2d/cocos2d-x
2013-03-05 18:43:21 -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
waiter
7699c83bd8
update Cocos2dxSound.java for unload effect
...
when unload effect, sounID maybe null so the app will creash because of NPE.
2013-03-06 09:21:49 +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
csy1988525
68c2219d33
Update CCControlButton.cpp
...
fixed a bug that users can't set a button highlighted in the upper logic. also modify some coding format.
2013-03-05 16:26:37 +08:00
minggo
a9fa61af34
issue #1529:CCUserDefault -> user_default
2013-03-05 14:55:26 +08:00
minggo
f37b1525b4
issue #1529:use NSUserDefault to implement CCUserDefault on iOS
2013-03-05 14:53:37 +08:00
wangshuai
bdbdbc27f5
issue #1425:exist lua test case is ok!
...
1.add some lua test case
2.add ccset.pkg
3.fixed ParticleSystem error in lua test case
2013-03-05 14:46:18 +08:00
Darragh Coy
f84a4e2e08
Code review changes for pull request #2102
...
We should only load the 'MarkerFelt-Wide' fallback font in 'CCImage.mm, _initWithString()' if the user is attempting to load a custom font, not when the user is attempting to load a system font. If the user is trying to load a system font then give back the default system font instead.
2013-03-04 22:24:28 -08:00
minggo
2e17e8c98b
Update AUTHORS
2013-03-05 14:08:23 +08:00
minggo
fad9c8ddf7
Merge pull request #2099 from waiter/master
...
fix OpenSLEngine can't load resources from SD card
2013-03-04 22:06:24 -08:00
minggo
e10123af19
Merge pull request #2103 from minggo/iss1686-synchronize
...
Fix some errors in TestCpp
2013-03-04 18:52:24 -08:00
minggo
ae3c104fba
issue #1686:disable depth test by default
2013-03-05 10:36:32 +08:00
Darragh Coy
df3c449b4f
Fix for loading custom fonts on iOS when referenced from a CocosBuilder CCB file
...
Fix up how fonts are loaded in Cocos2dx for iOS to work transparently with custom font filenames/paths such as 'MyCustomFont.ttf' or 'fonts/MyCustomFont.ttf'. Referring to fonts by these paths would be OK on Android but can't be used on iOS since fonts must be referred to by family name on iOS; we must use 'MyCustomFont' when referring to that particular font in both examples on iOS. Hence add the code to strip out the folder path and extension on iOS so that the font path 'MyCustomFont.ttf' and 'fonts/MyCustomFont.ttf' can be used transparently across all platforms. This is required especially in the case where we have custom fonts being referenced from CCB files, since CCB files store the font names with the .ttf extension included.
2013-03-04 15:32:24 -08:00
Rohan Kuruvilla
297f46c69e
Adding README files to project creation template
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
7d90fc2254
Adding README files to each sample project
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
bb31ea232b
Updating project files for Javascript based sample projects
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
4d14afa686
Modifying C++ project files to remove dependency on scripting
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
4eed15c977
Adding eclipse project files for Javascript projects
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
4e7c0a8213
Adding updated .project file in templates
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
1ba2b5d169
Adding eclipse project files for TestCpp and HelloCpp
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
8035562dfa
Adding Eclipse Project files in template directory for new Javascript projects
2013-03-04 11:50:38 -08:00
Rohan Kuruvilla
53be6102f4
Adding Eclipse Project files for C++ projects
2013-03-04 11:50:38 -08:00
James Chen
da0aadefe4
Merge pull request #2086 from lgb/master
...
Updating build-win32.bat, go back to root foler after executing this script.
2013-03-04 05:54:55 -08:00
fins
e8e229cc93
add getStartLocation() and getStartLocationInView() to CCTouch to access the start point of a touch
2013-03-04 13:08:19 +01:00
waiter
814feca53b
fix OpenSLEngine can't load resources from SD card
2013-03-04 14:54:43 +08:00
minggo
a330309628
issue #1686:add background color layer in CCTexture2DTest
2013-03-04 11:53:06 +08:00
James Chen
288f8ced59
Update AUTHORS
2013-03-04 11:16:11 +08:00
James Chen
52feaad12f
Merge pull request #2084 from young40/master
...
fixed #1761 : Implementing setVisible() for CCEditBox.
2013-03-03 19:10:20 -08:00
minggo
96c5be91e3
Merge pull request #2076 from sbc100/cocos_nacl
...
Native Client port
2013-03-03 18:24:04 -08:00
James Chen
f8f64e9987
Merge pull request #2095 from dumganhar/master
...
fixed #1760 : Redefinition of cpufeatures module.
2013-03-03 18:08:50 -08:00
James Chen
71589e68ee
fixed #1760 : Redefinition of cpufeatures module.
2013-03-04 10:08:02 +08:00
minggo
160536d4f2
Merge pull request #2090 from jsambuo/linux-audio-getEffectsVolume-fix
...
SimpleAudioEngine::getEffectsVolume() returns bgm volume on linux
2013-03-03 17:34:13 -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
Oleg Baluk
e09775ae91
return to current directory after run
2013-03-03 16:38:25 +04:00
Oleg Baluk
b8c97b7637
echo messages
2013-03-03 16:36:45 +04:00
Oleg Baluk
1eaad1417f
trim
2013-03-03 16:34:55 +04:00
young40
43e7917463
add setVisible() to CCEditBox [Win32]
2013-03-03 20:13:22 +08:00
young40
882a6761b6
add setVisible() to CCEditBox [Android]
2013-03-03 20:08:50 +08:00
young40
933d316dc4
add setVisible() to CCEditBox [ios & mac]
2013-03-03 18:58:51 +08:00
Sam Clegg
33c422d1d5
Add new port: Native Client
2013-03-02 12:15:24 -08:00
Sam Clegg
dcb591eadb
Add missing ccGLServerState to CCNode.pkg.
...
Without this missing enum the resuling cpp file would generate
an unused function warning.
Also, remove the duplication between build_macosx.xml and build.xml.
They only differed in single property. Instead use build.sh, which
should work on all UNIXs, no just maxosx.
2013-03-02 11:28:04 -08:00
Zhe Wang
7469fcf033
Fix typo in AUTHORS
...
Jianfeng Zhou (NetGragon) -> Jianfeng Zou (NetDragon)
2013-03-02 22:14:09 +08:00
minggo
867077205d
Merge pull request #2080 from biteforest/master
...
fix compile error with xcode on case-sensitive file system.
2013-03-02 05:00:42 -08:00
Bite
85fd30aacf
fix compile error when run xcode on case-sensive file system.
2013-03-02 18:15:05 +08:00