4421b6bf7a
remove unused libs
2012-12-29 23:53:39 +01:00
d2ad820a48
fixed #1627 : Adding view name for sample applications.
2012-12-29 14:50:00 +08:00
f2f3aa55bf
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012
...
Conflicts:
samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
scripting/javascript/bindings/generated
scripting/lua/proj.win32/liblua.vcxproj
2012-12-29 09:48:22 +08:00
3550550568
marmalade acceleromater improvement
2012-12-24 17:24:10 +01:00
df73cd12a6
fixed #1623:use file descriptor instead of file path to create media player
2012-12-24 17:20:44 +08:00
ca00d50259
CocosDenshion Android - missing sound effects with some conditions
...
Android SoundPool.load returns 0 if sound might not be loaded - for
example, it does not exist. Previously - 0 has been ignored and
incorrectly written to HashMap, so it was not possible to
understand on the application side that something goes wrong
(and use some additional workaround).
Use case:
1) On the game loading - preload all possible sound effects
(to speed up their playing later, when it will be needed)
2) Game APK does not have any sound file, they are downloaded
later in a separate thread.
3) Application tries to play sound effects as usual, when needed.
So due to this bug - as there was no any sound file exist
during the game loading - internal HashMap contains incorrect
0 as id for every effect, and there is no any sound effect during
the first application start.
2012-12-21 23:15:29 +02:00
b8eaf00359
ESC button on Windows behaves like Back button
2012-12-19 21:11:26 +01:00
f409aba724
Setting Windows app title
2012-12-19 20:43:09 +01:00
e15c0a33ae
fixed #1610:skip only white character
2012-12-10 17:18:20 +08:00
0f58987ad1
Merge pull request #1740 from rtissera/gles20
...
[android] Cocos2dxHelper/CCFileUtils JNI fixes and improvements
2012-12-10 00:33:11 -08:00
71f61596e9
fixed #1580:request focus after keyboard closed
2012-12-10 14:08:01 +08:00
f75f6c2b64
Mac OS Marmalade fixes
...
Fixed compile issues on Mac OS
2012-12-10 09:54:34 +08:00
bc0309f1a3
[android] Removed hardcoded /data/data path in CCFileUtils, make use of Context.getCacheDir() through JNI callback instead. Needed in order to get CCUserDefault working fine on Nexus 10 (Androi 4.2 multi-user environment)
2012-12-09 19:40:41 +01:00
4cb7506932
Added proper JNIEXPORT / JNICALL modifiers to Cocos2dxHelper JNI functions called from Java side
2012-12-09 13:44:41 +01:00
e488361e3b
cosmetics: fix formating
2012-12-05 11:43:04 +01:00
320d532e15
add Hungarian language support
2012-12-05 11:31:05 +01:00
a256d35a5b
fix some confilcs
2012-12-05 14:01:05 +08:00
8a8038b342
Enable stencil buffer for linux.
2012-12-04 16:48:23 +08:00
3b2eea2541
JPEG and File fixes
...
* Fixes to JPEG loader
* Fixes to image loader to load tiff and unknown formats properly
2012-12-04 11:03:34 +08:00
54309c56b2
change accelerometer accurate to SENSOR_DELAY_GAME
2012-11-30 14:07:01 +08:00
75fb997513
Merge pull request #1670 from rohankuruvilla/gles20
...
Fixing Accelerometer crash on Android
2012-11-29 22:01:16 -08:00
61b2e2b880
comment codes for FPS controlling
2012-11-30 13:55:25 +08:00
a4b55b5217
Fixing Accelerometer crash on Android
2012-11-28 15:56:57 -08:00
3a814de07e
implemented CCApplication::getCurrentLanguage() for linux platform
2012-11-28 19:41:50 +09:00
a37e034e61
added support for Japanese language
2012-11-28 17:53:10 +09:00
bd025c94c3
use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok
2012-11-26 15:08:40 +08:00
e259467873
update marmalade languages
2012-11-25 12:13:30 +01:00
a423317abc
issue #1564:make iOS test work ok
2012-11-23 16:30:09 +08:00
96ecb05ca9
issue #1564 : make tests run on mac osx
2012-11-23 14:22:50 +08:00
226b10a9e2
modify lua project setting
2012-11-23 10:41:41 +08:00
73b409f116
issue #1564 : Enable point size by default on windows. This can fix point size is always equal to 1 pixel in DrawPrimitivesTest.
2012-11-22 10:04:35 +08:00
6c81e21935
issue #1564 : Set depth buffer to 24bit, stencil buffer to 8bit.
2012-11-22 09:55:44 +08:00
ebd522e3fa
issue #1564 : Return a new object instead of 'const reference' for some get methods.
2012-11-20 16:34:55 +08:00
b892993a83
Merge pull request #1587 from mrmop/gles20
...
fixed #1559 : If file in resource directory doesn't exist, it will not search the root directory.
2012-11-16 04:56:59 -08:00
fcb265088d
Rssource path root change
...
fullPathFromRelativePath will now search root if file is not found in
path
2012-11-16 10:56:11 +00:00
df6a50a23a
issue #1555 : Fixed some compilation error for marmalade and blackberry ports.
2012-11-16 18:13:55 +08:00
7601cc7e27
Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update
...
Conflicts:
cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
2012-11-16 16:21:16 +08:00
7557a78e05
issue #1530 : Defined a macro 'snprintf' since it's named '_snprintf' on win32.
2012-11-16 15:58:19 +08:00
da7f3f2969
issue #1530 : Added empty implementation of 'CCAccelerometer::setAccelerometerInterval' for win32,blackberry,linux,mac and marmalade ports.
2012-11-16 15:56:51 +08:00
a4a53df159
issue #1555:build ok on android
2012-11-16 14:23:14 +08:00
a3437d09df
issue #1557 : Fixed particle crash.We should check the file format by the file header when the format isn't defined.
2012-11-15 10:43:29 +08:00
c79cac3af6
Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade
2012-11-15 10:10:53 +08:00
148a558405
Tiff support and resource location
...
* Tiff support added to CCImage
* CCFileUtils updated to support resource folders
* Examples updated to support multiple resolution assets
2012-11-14 17:46:09 +00:00
a701eaecce
issue #1555:update to v2.1 beta3
2012-11-14 18:05:15 +08:00
5fd56370d8
issue #1555:fix a bug about CCGLProgram
2012-11-13 11:06:32 +08:00
d4aeb8076c
Merge pull request #1562 from mingulov/apk
...
Android: Access to files from APK is boosted
2012-11-11 18:55:03 -08:00
833b5b1be8
Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade
...
Conflicts:
cocos2dx/base_nodes/CCNode.cpp
cocos2dx/sprite_nodes/CCSprite.cpp
samples/TestCpp/Classes/TouchesTest/Ball.cpp
samples/TestCpp/Classes/VisibleRect.cpp
samples/TestCpp/Classes/VisibleRect.h
2012-11-12 10:20:04 +08:00
83cf8aaf29
Android: Access to files from APK is boosted - 1st review update
2012-11-09 09:53:40 +02:00
071d264cc5
Android: Access to files from APK is boosted
...
Open APK file just once and cache a file list information (name and
position inside archive). Also a general ZipFile helper class is
created to read multiple files from Zip archives - might be used
for another platforms if needed.
Previously it was so for each separate file access operation:
- Open zip archive, initially parse its structure (unzOpen)
- Locate the particular file there by a linear search through
full archive (unzLocateFile).
So if file does not exist - still an archive has to be handled
fully, even slower than a file exists.
- Read file.
- Close zip archive
After this commit:
- Once - open zip/apk file and collect file list information
(average consumed time - the same like a search for 2 different
files by unzLocateFile)
- When needed - directly retrieve file position inside the archive,
setting it up to the zip reader and reading file
ZipFile class is located in support/zip_support/ZipUtils.h and .cpp
to prevent creation of a new files and adding them to multiple
project files.
2012-11-08 13:46:53 +02:00
3f3d09fabb
Merge pull request #1532 from wenbin1989/gles20
...
Add error handler when read image data using libjpeg.
2012-11-06 20:10:21 -08:00
fape