James Chen
6733f786a5
fixed #1649 : Reverted some invokings of function that returns const reference.
2013-01-14 16:06:18 +08:00
James Chen
22ebf3a5e5
Merge remote-tracking branch 'cocos2d-x/gles20' into iss1649-return-const
2013-01-14 15:52:42 +08:00
James Chen
6565fa92cc
fixed #1649 : Changed return type to const reference for member variable access.
2013-01-14 15:51:53 +08:00
minggo
c08c982f89
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1468-ccpoint
2013-01-14 15:07:21 +08:00
minggo
984b304ec5
issue #1468:change CCPoint CCSize CCRect from class to struct
2013-01-14 14:45:16 +08:00
James Chen
0fd16e7b31
Merge pull request #1827 from folecr/assert_fix
...
fixed #1654 : Assert fix for android.
2013-01-13 22:15:11 -08:00
johnangel
a1155f52e6
Merge remote branch 'upstream/gles20' into gles20
2013-01-11 21:48:47 +01:00
folecr
58874dc7a5
CCAssert uses CC_ASSERT directly
...
* ... after call to cc_assert_script_compatible()
* CCAssert will now report the correct line number
2013-01-10 12:26:12 -08:00
johnangel
16269d952d
Detect VS2012 Update 1
2013-01-10 11:55:30 +01:00
James Chen
9f322d9646
fix a typo.
2013-01-10 15:58:52 +08:00
folecr
e3cf517f32
Assert implementation for Android
...
* __android_log_assert is not stable
* Uses __android_log_print instead
2013-01-09 18:51:49 -08:00
folecr
c0ecad31fe
Consistent use of CCAssert
...
* Remove @
* Use CCAssert instead of CC_ASSERT (number of parameters differ between the two)
2013-01-08 14:11:34 -08:00
johnangel
e32a193561
Setting Windows app title for non-Debug mode, also.
2013-01-07 12:17:50 +01:00
johnangel
674bb8e728
Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010.
2013-01-07 11:51:05 +01:00
James Chen
b662d5c569
fixed #1620 : Added license. Removed LocalStorage.h from cocos-ext.h.
2013-01-07 18:06:53 +08:00
James Chen
3fa771f0c4
fixed #1620 : Using sqlite3 to implement sys.LocalStorage for iOS and android.
2013-01-07 17:22:06 +08:00
James Chen
266e6e8acc
fixed #1641 : The coins in Watermelon Me fail to animate in cocos2d-x JS binding.
2013-01-05 18:54:08 +08:00
James Chen
9ef74bef80
fixed #1636 : Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more.
...
Added platform macro for CCEditBoxImpl* files.
2013-01-05 11:10:24 +08:00
minggo
539bb56256
Merge pull request #1799 from tks2shimizu/gles20
...
Added CCFloat, CCDouble and CCBool
2013-01-03 19:32:35 -08:00
James Chen
f95d1677df
Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into iss-blackberry
2013-01-04 09:52:01 +08:00
James Chen
b50bf716a2
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2013-01-03 19:58:10 +08:00
James Chen
760a8c1d39
fix a compilation error for android.
2013-01-03 19:56:34 +08:00
Dale Ducharme
611db78b39
Removing grskia dependancy and adding in freetype support to the builds.
2013-01-02 18:53:31 -05:00
fape
29a2f273b1
reorganize third party libs
2012-12-29 23:56:14 +01:00
fape
4421b6bf7a
remove unused libs
2012-12-29 23:53:39 +01:00
James Chen
d2ad820a48
fixed #1627 : Adding view name for sample applications.
2012-12-29 14:50:00 +08:00
James Chen
9bd302e35b
fixed #1627 : VS version check in project file.
2012-12-29 13:54:46 +08:00
James Chen
b120874a87
fix compilation errors.
2012-12-29 11:23:31 +08:00
Tomoaki Shimizu
1293c8a6c2
added licence
2012-12-29 11:32:27 +09:00
James Chen
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
Tomoaki Shimizu
b4edd167af
The variable name was changed.The check of pRet was added.
2012-12-28 12:24:28 +09:00
Tomoaki Shimizu
87146d82e1
Added CCFloat, CCDouble and CCBool
2012-12-27 23:15:13 +09:00
James Chen
f159df2e13
Compilation warning fix for CCAssert macro.
2012-12-27 16:48:02 +08:00
minggo
4cdc984b0e
Merge pull request #1797 from dumganhar/gles20
...
fixed #1597 : TestCpp crashes when running ActionEaseTest after running ParticlesTest.
2012-12-27 00:10:53 -08:00
James Chen
b62d254f63
fixed #1597 : Added return pointer check.
2012-12-27 16:07:48 +08:00
James Chen
ac7755e68b
fixed #1597 : TestCpp crashes when running ActionEaseTest after running ParticlesTest
2012-12-27 15:42:55 +08:00
minggo
0adc6abe30
Merge pull request #1776 from dualface/make_ccassert_compatible_lua
...
[luabinding] make CCAssert compatible Lua
2012-12-26 23:28:32 -08:00
James Chen
f07987418c
Merge pull request #1794 from dumganhar/sync
...
fixed #1625 : Added stackable action support. Exchanged the order of parameter for 3d actions.
2012-12-26 20:50:32 -08:00
James Chen
7d9f06b48c
fixed #1625 : Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests.
2012-12-27 10:55:25 +08:00
James Chen
bb486af6a7
Added stackable action support. Exchanged the order of action.
2012-12-26 18:59:31 +08:00
dualface
09b1d9f520
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into make_ccassert_compatible_lua
2012-12-26 18:37:51 +08:00
dualface
57bccc7e4a
remove CC_LUA_ENGINE_ENABLED macro
2012-12-26 18:33:55 +08:00
fape
3550550568
marmalade acceleromater improvement
2012-12-24 17:24:10 +01:00
johnangel
08cd9e37fc
Setting PlatformToolSet to v110_xp for Visual Studio 2012 only.
2012-12-24 10:27:56 +01:00
minggo
df73cd12a6
fixed #1623:use file descriptor instead of file path to create media player
2012-12-24 17:20:44 +08:00
minggo
0f669114fc
Merge pull request #1775 from mingulov/music
...
CocosDenshion Android - missing sound effects with some conditions
2012-12-23 22:45:47 -08:00
ivzave
fcce930188
repair linux eclipse build & add 64-bit project configurations
2012-12-22 07:14:59 +04:00
dualface
cc69e39c8a
[luabinding] make CCAssert compatible Lua
2012-12-22 10:13:37 +08:00
Denis Mingulov
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
James Chen
d94a0cf4c7
issue #1603 : fixed a warning in unzip.cpp.
2012-12-20 18:39:29 +08:00
James Chen
9a0a5e6b31
issue #1603 : fixed some warnings.
2012-12-20 17:18:49 +08:00
johnangel
b8eaf00359
ESC button on Windows behaves like Back button
2012-12-19 21:11:26 +01:00
johnangel
f409aba724
Setting Windows app title
2012-12-19 20:43:09 +01:00
unknown
adb68ddbb6
Enable Windows XP support in Visual Studio 2012 Update 1.
...
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
2012-12-19 19:28:25 +01:00
minggo
e9c7db5a36
Merge pull request #1761 from dualface/fix_ccnode_scheduleupdate_lua
...
[lua] remove current schedule before register new script schedule
2012-12-16 17:26:59 -08:00
dualface
c3f900d36c
[lua] remove current schedule before register new script schedule
2012-12-14 18:06:21 +08:00
dualface
98ea80329e
fix android compile warning
2012-12-14 18:01:54 +08:00
dualface
d6a84e0d16
fix compile error for ios/mac c++11
2012-12-10 18:10:41 +08:00
minggo
e15c0a33ae
fixed #1610:skip only white character
2012-12-10 17:18:20 +08:00
James Chen
15251626b0
Merge pull request #1748 from guanqun/fix-doxygen
...
fix the doxygen output of CCAtlasNode
2012-12-10 01:01:21 -08:00
James Chen
0adc070146
Merge pull request #1749 from guanqun/fix-reorder
...
fix the reorder warning of class CCCallFunc
2012-12-10 00:59:00 -08:00
James Chen
6cca9b6548
Merge pull request #1750 from dumganhar/iss1608-lua-scheduleUpdateWithPriority
...
fixed #1608 : Adding CCNode::scheduleUpdateWithPriorityLua() for LuaBinding.
2012-12-10 00:54:16 -08:00
James Chen
fcead8ba34
Merge branch 'lua_add_CCNode_scheduleUpdateScriptHandlerWithPriority' of https://github.com/dualface/cocos2d-x into lua-schedule-improvement
2012-12-10 16:36:46 +08:00
minggo
0f58987ad1
Merge pull request #1740 from rtissera/gles20
...
[android] Cocos2dxHelper/CCFileUtils JNI fixes and improvements
2012-12-10 00:33:11 -08:00
dualface
f08b9c4573
performance fix
2012-12-10 16:31:57 +08:00
dualface
268aa45d2c
rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua()
...
remove unused functions
2012-12-10 16:09:23 +08:00
Lu Guanqun
b2c13cba9d
fix the reorder warning of class CCCallFunc
...
../actions/CCActionInstant.h: In constructor 'cocos2d::CCCallFunc::CCCallFunc()':
../actions/CCActionInstant.h:240:25: warning: 'cocos2d::CCCallFunc::<anonymous union>::m_pCallFunc' will be initialized after [-Wreorder]
../actions/CCActionInstant.h:236:6: warning: 'int cocos2d::CCCallFunc::m_nScriptHandler' [-Wreorder]
../actions/CCActionInstant.h:188:5: warning: when initialized here [-Wreorder]
2012-12-10 16:07:19 +08:00
Lu Guanqun
497ae7c33f
fix the reorder warning of class CCCallFunc
...
../actions/CCActionInstant.h: In constructor 'cocos2d::CCCallFunc::CCCallFunc()':
../actions/CCActionInstant.h:240:25: warning: 'cocos2d::CCCallFunc::<anonymous union>::m_pCallFunc' will be initialized after [-Wreorder]
../actions/CCActionInstant.h:236:6: warning: 'int cocos2d::CCCallFunc::m_nScriptHandler' [-Wreorder]
../actions/CCActionInstant.h:188:5: warning: when initialized here [-Wreorder]
2012-12-10 16:05:17 +08:00
Lu Guanqun
64772d09b0
fix the doxygen output of CCAtlasNode
2012-12-10 15:31:26 +08:00
James Chen
fc16cd8d01
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-12-10 14:21:18 +08:00
James Chen
839288671e
fixed #1606 : Override update function for ExtraAction.
2012-12-10 14:11:42 +08:00
minggo
71f61596e9
fixed #1580:request focus after keyboard closed
2012-12-10 14:08:01 +08:00
dualface
d854f68c63
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
2012-12-10 13:51:37 +08:00
dualface
c8753f72ef
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
2012-12-10 13:48:27 +08:00
James Chen
f8c96483a0
fixed #1606 : Return CCSequence pointer for CCSequence::create.
2012-12-10 12:02:24 +08:00
James Chen
73dd652604
fixed #1605 : Crash occurs when adding just one action to CCSequence.
2012-12-10 11:10:11 +08:00
James Chen
062179c497
fixed #1604 : The enum values in ccPVR3TexturePixelFormat are truncated to 32bit
2012-12-10 10:22:06 +08:00
Mat Hopwood
f75f6c2b64
Mac OS Marmalade fixes
...
Fixed compile issues on Mac OS
2012-12-10 09:54:34 +08:00
Romain TISSERAND
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
Romain TISSERAND
4cb7506932
Added proper JNIEXPORT / JNICALL modifiers to Cocos2dxHelper JNI functions called from Java side
2012-12-09 13:44:41 +01:00
James Chen
0d90fea7b3
Merge branch 'myFeature' of https://github.com/tks2shimizu/cocos2d-x into iss1602-rand-ccdictionary
...
Conflicts:
cocos2dx/cocoa/CCDictionary.cpp
cocos2dx/cocoa/CCDictionary.h
2012-12-07 10:40:32 +08:00
Tomoaki Shimizu
e680e5f0f2
Add randomObject to CCDictionary
...
Although CCArray has randomObject(), CCDictionary does not have it.
So CCDictionary should have randomObject().
2012-12-06 23:56:49 +09:00
minggo
a75f8b7e7a
fixed #1593:remove all deprecated methods expect CCBAnimationManager
2012-12-06 18:51:33 +08:00
minggo
cfd6e6c82a
Merge pull request #1726 from fape/hungarian_language_support
...
Add Hungarian language support
2012-12-05 17:39:46 -08:00
fape
e488361e3b
cosmetics: fix formating
2012-12-05 11:43:04 +01:00
fape
320d532e15
add Hungarian language support
2012-12-05 11:31:05 +01:00
minggo
d858ce2fe2
some android devices can not compile this frag
2012-12-05 17:15:47 +08:00
minggo
99781368c4
Merge pull request #1677 from chenium/gles20
...
Fix for CCRenderTexture on Android sleep/resume
2012-12-04 22:40:00 -08:00
minggo
c3a5e870af
Merge pull request #1725 from minggo/merge_jp_support
...
Merge jp support
2012-12-04 22:11:42 -08:00
minggo
a256d35a5b
fix some confilcs
2012-12-05 14:01:05 +08:00
minggo
75d7df5bcf
Merge pull request #1684 from lvklabs/gles20-for-pull
...
Added removeAllObjects() to CCSet
2012-12-04 20:05:56 -08:00
minggo
cb2427e780
do some modification
2012-12-04 17:25:40 +08:00
James Chen
3e88f8d2e4
fix compilation errors in eclipse project for linux.
2012-12-04 16:48:23 +08:00
James Chen
8a8038b342
Enable stencil buffer for linux.
2012-12-04 16:48:23 +08:00
James Chen
6aa15e0636
Added -DCOCOS2D_DEBUG=1 for linux if building in debug mode.
2012-12-04 16:48:23 +08:00
James Chen
cedd58bb77
#extension GL_OES_standard_derivatives : enable only valid in GL_ES, this fixes crashes on some Linux machines.
2012-12-04 16:47:57 +08:00
James Chen
ed86e2967f
Merge pull request #1706 from dumganhar/iss1590-jpeg-fix-mm
...
fixed #1590 : JPEG and File fixes and CocosDenshion fix for marmalade.
2012-12-03 19:10:14 -08:00
Mat Hopwood
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
minggo
bbcbfa71ef
Merge pull request #1704 from minggo/cclayer_script_support
...
Cclayer script support
2012-12-03 18:55:11 -08:00
James Chen
609fce7e2f
fix MenuTest crash after the commit(SHA-1:98045f667f80f78fec8452103a114b573f3a3204).
2012-12-04 10:36:13 +08:00