minggo
76410f4b5b
Merge pull request #1248 from mustime/testlua
...
Testlua
2012-08-27 23:18:22 -07:00
mustime
60a64d0eca
issue #1425 : remove the scheduleScriptHandler interface from CCNode
2012-08-28 12:49:43 +08:00
YuLei
02e77faf51
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 12:22:57 +08:00
YuLei
2c518e43b2
[Lua] fix CCLayer:registerScriptTouchHandler()
...
[Lua] make CCNotificationCenter script support
2012-08-28 12:08:15 +08:00
Rohan Kuruvilla
8d7516a0ef
Test project for cocos2d-x js.
2012-08-27 10:07:31 -07:00
folecr
9e226faa6c
Use #ifdef COCOS2D_JAVASCRIPT for JS specific code
2012-08-27 08:43:40 -07:00
Rolando Abarca
b7a7eec7b8
typo
2012-08-27 08:43:40 -07:00
Rolando Abarca
188cb8052d
fixes CCLabelBMFont create
...
also, a small bug in CCMenuItemToggle
2012-08-27 08:43:39 -07:00
Rolando Abarca
f210b666ee
removes a few warnings
2012-08-27 08:43:39 -07:00
folecr
876f7857e1
Fix CCMenuItemToggle::create()
2012-08-27 08:43:39 -07:00
Rolando Abarca
bee9099102
updates CCMenuItem and CCAnimation
2012-08-27 08:43:39 -07:00
Rolando Abarca
033ae81871
adds COCOS2D_JAVASCRIPT for some specifics parts
2012-08-27 08:43:39 -07:00
folecr
cd87364277
Includes for typeinfo and spidermonkey_specifics.h
2012-08-27 08:43:39 -07:00
Rolando Abarca
5f4bafda08
fixes CCMenuItemToggle::create()
...
Works with no arguments (items). You can add items later
2012-08-27 08:43:39 -07:00
Rolando Abarca
ce40351855
updates CCScheduler to work with the JS Bindings
2012-08-27 08:43:39 -07:00
Rolando Abarca
a97d0f5a95
fixes default values for functions
2012-08-27 08:43:39 -07:00
Rolando Abarca
4ce9cc9810
adds typeinfo and fixes overloaded funcs
2012-08-27 08:43:38 -07:00
Rolando Abarca
2598fc97d1
adds TypeInfo to some classes
2012-08-27 08:43:38 -07:00
Rolando Abarca
c6db10772c
fixes default arguments for the generator
2012-08-27 08:43:38 -07:00
rohankuruvilla
77f723789b
Adding support for cc.CallFunc.
2012-08-27 08:43:38 -07:00
folecr
0c9b7718a0
Cocos2D-X depends on spidermonkey scripting core now.
...
* Define COCOS2D_JAVASCRIPT
* Include the scripting core library
2012-08-27 08:43:38 -07:00
Rohan Kuruvilla
0cf880d620
Fixing touch handling to remove the need to registerTouchHandler
2012-08-27 08:43:38 -07:00
Rohan Kuruvilla
c47d9d4e7c
Adding Touch callbacks and capability to pass this around
2012-08-27 08:43:38 -07:00
Rolando Abarca
a114502929
removes OBJECT_TYPE thing
2012-08-27 08:43:38 -07:00
Rolando Abarca
42ce395f05
uses proxy instead of Get/SetPrivate
2012-08-27 08:43:38 -07:00
Rohan Kuruvilla
0e9ba1173a
Callbacks
2012-08-27 08:43:37 -07:00
Rolando Abarca
4e640ecb35
uses new ADD_OBJECT_TYPE macro
2012-08-27 08:43:37 -07:00
Rolando Abarca
701f5e9dfc
roots & unroots jsobject
2012-08-27 08:43:37 -07:00
Rolando Abarca
9d11298d8e
adds empty create for CCMenuItem
2012-08-27 08:43:37 -07:00
Rolando Abarca
a6a8103d2b
adds object type info to CCDirector
2012-08-27 08:43:37 -07:00
folecr
487b252a82
Remove macros
2012-08-27 08:43:34 -07:00
Rolando Abarca
e757d55a29
updates cocos2d-x API to support getObjectType()
2012-08-27 05:45:11 -07:00
minggo
d1f92b8da4
Merge pull request #1239 from mustime/testlua
...
Testlua
2012-08-27 02:45:29 -07:00
James Chen
ef906cd2ba
Merge pull request #1247 from dumganhar/gles20
...
Updated Makefiles for linux port.
2012-08-27 01:45:26 -07:00
James Chen
dd26a2fcd8
Updated Makefiles for linux port.
2012-08-27 16:43:02 +08:00
minggo
0e81fd0568
fixed #1442 : use CREATE_FUNC instead of SCENE_CREATE_FUNC and NODE_CREATE_FUNC
2012-08-27 16:11:07 +08:00
James Chen
28150573c6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-08-27 13:48:55 +08:00
James Chen
7ccb720104
Resource file searching implementation for blackberry.
...
Updated the package names of blackberry samples.
2012-08-27 13:48:17 +08:00
mustime
be116f5352
issue #1425 : update TestLua project
2012-08-27 11:43:47 +08:00
minggo
c7d365ca1c
Merge pull request #1231 from donaldalanmorrison/gles20
...
Gles20
2012-08-26 20:17:40 -07:00
James Chen
3d0b5bf455
fixed some warnings in java codes for android port.
2012-08-27 10:21:43 +08:00
YuLei
a38b8d4a00
[Lua] CCNode:onEnter() and CCNode:onExit() pass {name = "enter"/"exit"} to Lua function
...
[Lua] fix CCMenuItem:registerScriptTapHandler() and CCMenuItem:unregisterScriptTapHandler()
[Lua] update luabinding
2012-08-25 17:08:33 +08:00
YuLei
8b54355aa1
[Lua] update luabinding
...
[Lua] add LuaValue, LuaDict, LuaArray
2012-08-25 15:05:59 +08:00
Donald Alan Morrison
5075a83271
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/kazmath/src/ray2.c
2012-08-25 00:00:27 -07:00
Donald Alan Morrison
857608495c
Plugged CoreFoundation memory leaks identified by Static Analyzer.
2012-08-24 23:34:20 -07:00
Donald Alan Morrison
9f1899978e
Fixed potential memory leak identified by Static Analyzer.
2012-08-24 21:39:41 -07:00
James Chen
6c4bdc238f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-08-24 18:02:34 +08:00
James Chen
2eeca6f000
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-08-24 18:02:00 +08:00
James Chen
369eb3daa3
[WIN32] Enabled retina. Updated the implementation of fullPathFromRelativePath.
2012-08-24 18:01:16 +08:00
minggo
cb93713433
Merge pull request #1234 from minggo/gles20
...
use absolute path in CCFileUtils
2012-08-24 02:58:33 -07:00
minggo
bcd691ad9f
use absolute path in CCFileUtils
2012-08-24 17:55:29 +08:00
minggo
cf1d61f3de
Merge pull request #1232 from minggo/gles20
...
fix compiling error of linux
2012-08-24 01:09:37 -07:00
mingo
ba4d75a60e
issue #1445 : fix compiling error of linux
2012-08-24 15:53:26 +08:00
James Chen
e011be88d8
fixed a bug in CCFileUtils.cpp of blackberry port.
2012-08-24 14:35:51 +08:00
James Chen
5e5b71a396
fixed a bug in CCEGLView.cpp.
2012-08-24 14:35:24 +08:00
Donald Alan Morrison
3ee17b1a23
Merge with c9674e85e8
. The diff revealed
...
there was no actual conflict, so only a dot was added to the comment so
git would accept the commit (otherwise "nothing to commit"); and thus the
history is preserved.
2012-08-23 22:32:33 -07:00
Donald Alan Morrison
82bb62f8e3
MSVC++2010 doesn't accept C99-style named-initialization like clang.
2012-08-23 20:58:25 -07:00
minggo
f8df93c59c
Merge pull request #1228 from mustime/testlua
...
Testlua
2012-08-23 19:15:50 -07:00
minggo
fa0dbb7c65
Merge pull request #1226 from Squallium/gles20
...
Wrong access to CCApplication::sharedApplication() pointer
2012-08-23 19:11:07 -07:00
mustime
c9674e85e8
fixed a compile error on WIN32
2012-08-24 10:10:14 +08:00
mustime
f67b513d08
issue #1425 : add android proj on TestLua
2012-08-24 10:07:15 +08:00
James Chen
998cb276ba
Merge pull request #1224 from dumganhar/android_editbox
...
issue #1429 : CCEditBox for android port
2012-08-23 18:53:24 -07:00
minggo
56ce6869d6
Merge pull request #1227 from donaldalanmorrison/gles20
...
Gles20
2012-08-23 18:32:39 -07:00
Squallium
bd09615a26
Wrong access to CCApplication::sharedApplication() pointer
2012-08-23 22:53:16 +02:00
Donald Alan Morrison
e3094d80d0
Silenced LLVM SA Warning/Error regarding static singleton pattern. Added dealloc method.
2012-08-23 13:41:54 -07:00
James Chen
ee3e68014b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox
2012-08-24 00:16:11 +08:00
James Chen
1685e5c497
issue #1429 : Used java code to implement keyboard layout.
2012-08-24 00:15:15 +08:00
James Chen
7f2c9f6fb4
issue #1429 : Removed some used codes.
2012-08-23 23:09:12 +08:00
minggo
83606d7691
Merge pull request #1212 from mustime/testlua
...
Testlua
2012-08-23 03:08:25 -07:00
minggo
37cb691600
fix some bugs while testing
2012-08-23 18:01:28 +08:00
mustime
b815504d69
issue #1425 : change the design of CCCallFunc::create(int nHandler)
2012-08-23 16:27:22 +08:00
James Chen
06038163ca
iss1429: Finished using Dialog to implement CCEditBox for android port.
...
Next step:
Using Java codes to implement Cocos2dxEditBox. Don't use style.xml, color.xml and keyboard.xml.
2012-08-23 15:34:57 +08:00
minggo
23bd0268cf
Merge pull request #1217 from zeaster/gles20
...
fixed #1298 : double firing CCCallFunc action in CCSequence
2012-08-23 00:34:06 -07:00
minggo
0c5cec0056
fixed #1441:fix a logical error in CCFileUtils::fullPathFromRelativePath()
2012-08-23 14:26:39 +08:00
minggo
d83cdbda09
fixed #1441 : put hd and ipad resources into separate directory
2012-08-23 14:20:32 +08:00
James Chen
a437099779
issue #1429 : Use activity to implement CCEditBox for android. Next step: use dialog to implement CCEditBox.
2012-08-23 09:42:28 +08:00
yichao.zhang
988a8d8a60
fixed #1298 : do not update last action when it is done in IntervalAction
2012-08-22 19:48:32 +08:00
minggo
99b81e3e38
Merge pull request #1216 from minggo/iss1439_synchronize
...
fixed #1439:synchronize to cocos2d-iphone v2.0.0
2012-08-22 00:52:54 -07:00
minggo
3b442dfc0f
fixed #1439:synchronize to cocos2d-iphone v2.0.0
2012-08-22 15:51:25 +08:00
minggo
3b1bfa5852
Merge pull request #1215 from minggo/iss1440_ccsprite_displayFrame
...
fixed #1440:convert offert point to pixel
2012-08-21 23:30:37 -07:00
minggo
2a9d29ba21
fixed #1440:convert offert point to pixel
2012-08-22 14:29:23 +08:00
mustime
1ffdbc1639
issue #1425 : add standard comment on CCCallFunc::create(int nHandler) and
...
CCCallFuncN::create(int nHandler)
2012-08-22 14:21:48 +08:00
James Chen
bcbd161398
issue #1429 : First commit CCEditBox for android port.
2012-08-22 09:47:04 +08:00
mustime
d01842a37b
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2012-08-22 09:39:21 +08:00
mustime
57659d1584
issue #1425 : modifing pkg files for Lua
2012-08-21 18:42:35 +08:00
minggo
ce274cfb4f
Merge pull request #1209 from minggo/iss1437_return_pointer
...
make CCEGLView::sharedOpenGLView() and CCApplication::sharedApplication() return pointer
2012-08-21 02:47:47 -07:00
James Chen
4c2702fcef
issue #1437 : fixed some compile errors for blackberry port.
2012-08-21 17:42:56 +08:00
James Chen
fac3e9c8de
issue #1437 : fixed some compile errors.
2012-08-21 17:25:03 +08:00
minggo
e939285c93
change version
2012-08-21 17:03:01 +08:00
minggo
07ddd43695
issue #1437:make CCApplication::sharedApplication() return pointer
2012-08-21 15:28:43 +08:00
minggo
cfdc50fb60
issue #1437:make CCEGLView::sharedOpenGLView() return pointer
2012-08-21 14:58:31 +08:00
minggo
19f4356c0b
Merge pull request #1207 from aninggo/patch-2
...
Update cocos2dx/include/ccConfig.h
2012-08-20 20:08:52 -07:00
ningxu
5baa19992d
Update cocos2dx/include/ccConfig.h
2012-08-21 10:56:12 +08:00
Donald Alan Morrison
81d8dd0eb2
Silenced a false-positive warning from the LLVM Static Analyzer with initialization.
...
The warning is caused because the code has a series of if statements not chained with else clauses -- code that works as-is, but scares the SA. Probably not worth the effort to refactor...the optimizing compiler probably removes a temporary variable.
2012-08-20 18:30:12 -07:00
Donald Alan Morrison
7d66f62881
Removed a Static Analyzer Warning about immutable NSNotification object ownership by changing a property from assign to copy.
2012-08-20 18:09:51 -07:00
Donald Alan Morrison
61a5b2a742
Plugged a memory leak identified by LLVM Static Analyzer.
2012-08-20 16:48:07 -07:00
Donald Alan Morrison
c482a246be
Plugged potential memory leak found by LLVM Static Analyzer.
2012-08-20 16:40:26 -07:00
Donald Alan Morrison
abe45e53b5
Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.)
2012-08-20 16:16:00 -07:00
Donald Alan Morrison
d6ec91807c
For Release Builds:
...
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "NS_BLOCK_ASSERTIONS=1",
+ "NDEBUG=1",
+ );
For All Builds:
+ WARNING_CFLAGS = "-fdiagnostics-show-option";
2012-08-20 16:11:11 -07:00
Donald Alan Morrison
75ae8d2201
Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.)
2012-08-20 14:54:12 -07:00
Donald Alan Morrison
c75f73aa41
Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.)
2012-08-20 14:33:34 -07:00
Donald Alan Morrison
70f383ec2f
Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.)
2012-08-20 14:30:37 -07:00
Donald Alan Morrison
4f80c54884
Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.)
2012-08-20 14:26:35 -07:00
Donald Alan Morrison
9a8d1ca8b8
Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.)
2012-08-20 14:18:12 -07:00
Donald Alan Morrison
cbeb2bb1b9
Silenced warning of function override by category implementation, by surrounding with a clang pragma.
2012-08-20 14:08:49 -07:00
Donald Alan Morrison
e6e0684ecb
Added explicit cast to silence warning of implicit cast.
2012-08-20 14:01:48 -07:00
ningxu
84a946f676
Update cocos2dx/platform/mac/CCGL.h
...
add VAO support
2012-08-20 23:07:43 +08:00
James Chen
fd1343b951
Updated win32 template and fix a bug in win32/CCEGLView.cpp.
2012-08-20 17:08:29 +08:00
James Chen
0861877594
kCCResolutionXXX -> kResolutionXXX and estimate whether touch point is contained in GL viewport rectangle.
2012-08-20 16:32:22 +08:00
James Chen
7eb5d85298
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_bb
2012-08-20 15:49:24 +08:00
James Chen
6c9b4d3357
fixed #1420 : Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs.
2012-08-20 15:49:02 +08:00
minggo
738f150ecd
fixed #1377:reset texture parameter of CCTMXLayer after coming to foreground on android
2012-08-20 14:06:29 +08:00
James Chen
b63d4d7702
Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into dale_bb
2012-08-20 11:40:23 +08:00
James Chen
63888a7eb5
issue #1432 : MutiTouchTest crashes on IOS if putting more than 5 fingers on the screen.
2012-08-20 10:38:21 +08:00
Dale Ducharme
4004a8ac61
Cocos2dx for gles2.
2012-08-17 17:45:21 -04:00
James Chen
f7fd4fc2bf
issue #1429 : Fixed a bug in EAGLView.mm.
2012-08-17 15:24:33 +08:00
James Chen
d3338a70e5
issue #1429 : Updated EditBoxTest and fix a bug about callback function.
2012-08-17 14:29:07 +08:00
minggo
316c484936
Merge pull request #1173 from mustime/bug1284
...
issue #1284 : add detection for I9100 model
2012-08-16 18:39:28 -07:00
James Chen
797c15b9a2
Merge pull request #1188 from dumganhar/gles20
...
fixed #1419 : Updated eclipse project configurations for linux port.
2012-08-16 03:22:40 -07:00
James Chen
48fa8a4e88
fixed #1419 : Update eclipse project configurations for linux port.
2012-08-16 18:09:01 +08:00
minggo
756a7e3b0c
Merge pull request #1186 from minggo/gles20
...
remove some unneeded codes
2012-08-15 23:53:22 -07:00
minggo
714b9ef838
remove some unneeded codes
2012-08-16 14:51:58 +08:00
James Chen
3c33c43fd4
fixed a bug in CCActionInterval.cpp.
...
CCSequence::create(pAction2, CCDelayTime::create(d1 - d2)); ~> CCSequence::createWithTwoActions(pAction2, CCDelayTime::create(d1 - d2));
2012-08-16 14:29:27 +08:00
James Chen
605f63f2b7
Merge branch 'gles20' into minggo_iss1405
2012-08-16 12:04:44 +08:00
minggo
416ce6b91d
fixed #1430 : add some comment
2012-08-16 11:45:52 +08:00
minggo
6a9da80292
fixed #1430 : compute correct label's width or height when its value is 0
2012-08-16 11:43:44 +08:00
James Chen
de2c00b7ae
issue #1405 : fixed some compile error on win32 and linux.
2012-08-16 11:30:25 +08:00
minggo
bcf61cdf26
issue #1405:use enum to distinguish target
2012-08-16 10:21:15 +08:00
minggo
4a97f52cd4
issue 1405:implement CCFileUtils::getResourceDirectory() on iOS
2012-08-15 16:03:55 +08:00
James Chen
0fce637ec7
issue #1429 : First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest.
2012-08-15 14:33:56 +08:00
mustime
0933a032e9
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1284
2012-08-14 09:41:18 +08:00
mustime
89f0508043
issue #1284 : add detection for I9100 model
2012-08-13 17:14:33 +08:00
Walzer
d99b7463b7
Merge pull request #1172 from walzer/gles20
...
fix the out-of-range crash in CCArray::randomObject()
2012-08-11 08:34:58 -07:00
Walzer
9681c8d690
fix the out-of-range crash in CCArray::randomObject()
2012-08-11 23:31:51 +08:00
Walzer
e964e861f2
Merge pull request #1162 from tongpengfei/gles20
...
fixed linux FontTest vertical alignment
2012-08-11 07:32:32 -07:00
Walzer
a77a4eac03
add more details in doxygen comments.
2012-08-10 13:58:34 +08:00
James Chen
ba78ac7d6d
issue #1405 : Remove unused method 'CCEGLView::getFrameSize' for ios port.
2012-08-09 18:28:49 +08:00
James Chen
03c2366821
Merge branch 'minggo_res' of https://github.com/dumganhar/cocos2d-x into gles20
2012-08-09 17:50:39 +08:00
James Chen
6e2cace72d
Merge branch 'iss1405_multi_resolution' of https://github.com/minggo/cocos2d-x into minggo_res
2012-08-09 17:19:20 +08:00
James Chen
a7ce8f2e21
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into minggo_res
2012-08-09 17:16:10 +08:00
pengfei tong
82a2b9819c
[LOG] remove noused code
2012-08-09 16:57:16 +08:00
pengfei tong
075a2a6a8a
Merge branch 'test' into gles20
2012-08-09 16:41:24 +08:00
pengfei tong
188e267e7a
[FIX] FontTest vertical alignment
2012-08-09 16:35:43 +08:00
pengfei tong
11be0edb06
[FIX] FontTest vertical alignment
2012-08-09 16:08:16 +08:00
minggo
c31415b7bd
issue #1405:resolution supports on mac
2012-08-09 14:34:20 +08:00
James Chen
826dfe4102
issue #1405 : multi resolution works ok on win32. Add CCFileUtils::getResourceDirectory() method.
2012-08-09 12:49:33 +08:00
Walzer
7863375cf8
issue #1424 , http wrapper compiled pass on linux
2012-08-09 11:15:06 +08:00
Walzer
08198c082e
issue #1424 , http wrapper has been tested on iOS, mac, android port.
2012-08-09 10:45:11 +08:00
minggo
c34812567f
issue #1405 : modify macro names and comment and add getVisibleSize and getVisibleOrigin in CCDirector
2012-08-09 10:23:39 +08:00
minggo
cc39dc55f4
issue #1405:remove unneeded functions of CCFileUtils
2012-08-08 18:39:33 +08:00
minggo
3395bba327
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution
2012-08-08 17:42:45 +08:00
minggo
3853611e62
issue #1405:support loading resources from directory defined by developer
2012-08-08 17:42:04 +08:00
minggo
f6115d5667
issue #1405:zoom out work ok
2012-08-07 18:24:45 +08:00
minggo
5d8f909af4
issue #1405:multi resolution works ok
2012-08-07 14:29:46 +08:00
minggo
9ccf3cefdf
fixed #1417:add header search path and add CCTouch.cpp into mac project
2012-08-06 11:08:06 +08:00
James Chen
e9aa3743fa
issue #1405 : muti-resolution works ok on linux.
2012-08-03 13:56:18 +08:00
James Chen
ed69b62461
fixed #1419 : Update cocos2d.h.
2012-08-03 11:16:34 +08:00
James Chen
086e63103d
fixed #1419 : Merge gles20 linux port.
...
There are still some issues:
1. CocosDeshionTest crash.
2. FontTest result is not correct.
2012-08-03 11:07:59 +08:00
James Chen
9c26e38563
Merge branch 'gles20' of https://github.com/tongpengfei/cocos2d-x into linux_gles20
2012-08-03 10:10:33 +08:00
pengfei tong
a37fd743e0
[FIX] testjs
2012-08-02 16:23:31 +08:00
pengfei tong
c82c8412a8
[LOG] fix makefile
2012-08-02 13:19:40 +08:00
pengfei tong
b93d0b5ebf
[LOG] add linux port
2012-08-02 13:02:59 +08:00
minggo
5399aac590
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution
2012-08-02 10:50:15 +08:00
minggo
426a52447d
issue #1405:correct touch coordinate when enable retina with retina supportted device
2012-08-01 18:44:10 +08:00
minggo
0b2396c54b
issue #1405:support three type of resolution
2012-08-01 16:56:12 +08:00
Walzer
cc3d850892
fixed #1416 , add object orientated APIs for CCGeometry, replace "CCFloat" with "float"
2012-08-01 15:30:12 +08:00
Walzer
dc37896ed9
change the param sequence of CCLabelTTF::create and initWithString, according to JS APIs
2012-08-01 13:24:23 +08:00
Walzer
ba224cc283
add CCTouch.cpp into proj.win32, android.mk, xcode4 template.
2012-07-31 23:32:19 +08:00
Walzer
0431cb455b
fixed #1413 , add CCTouch::getLocation(), getDelta() method
...
return OpenGL coordinates directly, to make the usage more convenient.
2012-07-31 17:41:53 +08:00
mustime
1a55b7c5ba
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1381
2012-07-27 18:29:57 +08:00
mustime
5bc130dee7
issue #1381 : change the setContentSize interface in CCScrollView
2012-07-27 18:20:11 +08:00
mustime
9949a34669
issue 1381: change setContentSize(CCSize size) to setContentSize(const
...
CCsize & size) in CCNode
2012-07-27 16:57:56 +08:00
minggo
7bfc88c568
Merge pull request #1130 from mustime/bug1284
...
issue #1284 : using OpenSL for playing effects on I9100
2012-07-26 20:31:51 -07:00
mustime
bfc53e3453
issue #1284 : using OpenSL for playing effects on I9100
2012-07-26 15:30:09 +08:00
James Chen
18b1d097c7
Merge pull request #1126 from dumganhar/gles20
...
fixed a compile error on win32.
2012-07-25 22:56:46 -07:00
minggo
16c469fa4e
Merge pull request #1127 from mustime/bug1381
...
issue #1381 : change the setContentSize interface in the subclasses of CCNode
2012-07-25 21:39:44 -07:00
mustime
9ad241c8f8
issue #1381 : change the setContentSize interface in the subclasses of
...
CCNode
2012-07-26 12:03:37 +08:00
James Chen
b716f4ff62
fixed a compile error on win32.
2012-07-26 11:42:31 +08:00
Nat Weiss
9f0be2de05
Added Mac cpp HelloWorld and Tests.
2012-07-24 19:07:31 -07:00
minggo
ed6b396782
fixed #1403:support png8
2012-07-24 16:43:48 +08:00
minggo
0a2570fec7
fixed #1383:save UserDefault.xml to Library/caches
2012-07-24 11:34:20 +08:00
Walzer
685b70e6fb
fixed #1402 , résolve conflicting "create" functions
...
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
2012-07-23 22:49:11 +08:00
James Chen
9a6729551c
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399
2012-07-23 11:59:47 +08:00
James Chen
2ab5e4ab9c
issue #1399 : Added vs2010 support.
2012-07-23 11:57:34 +08:00
James Chen
7f6ffef8cf
issue #1399 : Set the flag 'LinkIncremental' value to false.
2012-07-23 11:47:27 +08:00
minggo
ac70f8def5
Merge branch 'gles20-adjust-structure' into merge
2012-07-23 11:36:46 +08:00
minggo
f38629fbfc
Merge pull request #1109 from NatWeiss/addmac4
...
Adding Mac support!
2012-07-22 19:48:52 -07:00
Nat Weiss
fcfea04bbc
iPad detection is now where it belongs in CCApplication.
2012-07-21 11:46:42 -07:00
Nat Weiss
a4760698ca
Determines whether to use iPad graphics statically, so if the window is resized the graphics loaded are consistent.
2012-07-21 11:35:28 -07:00
Nat Weiss
dc7ce1cd0f
Improved mac file utils and event responsiveness.
2012-07-21 02:19:03 -07:00
James Chen
5e5b008742
issue #1399 : Built four android projects(HelloCpp, HelloLua, TestJavascript, TestCpp) successfully on Ubuntu System.
2012-07-21 13:49:20 +08:00
Nat Weiss
d4b6d1262b
Adding Mac support!
2012-07-20 21:23:40 -07:00
James Chen
557f654cf3
Built successfully on android.
2012-07-20 17:06:00 +08:00
James Chen
77f1fba566
issue #1399 : Adjust folder structure, made it built successfully on win32.
2012-07-20 14:05:52 +08:00
minggo
7467d254d4
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399_adjust_structure
2012-07-19 17:26:39 +08:00
minggo
f9c40f7372
issue #1399 : work ok on iOS after adjusting directory structure
2012-07-19 17:22:36 +08:00
Yasith Vidanaarachchi
59a3bd1a9a
Fix the re-assigning of texture rectangle to consider sprite frame's orientation.
...
If the progress sprite is vertical, in the sprite sheet it's rendered incorrectly without this fix.
2012-07-17 15:56:58 -03:00
Walzer
5bec3b3ac3
CCTextureCache.cpp:L532, tex -> texture
2012-07-14 23:44:56 +08:00
Walzer
a46c53421c
consistent the variable name in different functions.
2012-07-14 15:21:42 +08:00
Walzer
e6ae45e1b2
fixed issue #1395 , which was reported at https://github.com/cocos2d/cocos2d-x/issues/1095
2012-07-14 15:06:11 +08:00