James Chen
edc8444ca4
Updating blackberry project configurations.
2013-04-27 14:07:54 +08:00
zhangbin
4db988f51d
Change the package name of project HelloIAP-JS.
2013-04-27 13:47:27 +08:00
James Chen
cbfa89868b
Merge pull request #2473 from natural-law/master
...
Update JS bindings in plugin for the new interfaces.
2013-04-26 20:59:25 -07:00
zhangbin
30a2e55adf
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2013-04-27 11:35:54 +08:00
minggo
de60057621
Merge pull request #2472 from minggo/master
...
disable depth test for clipping test
2013-04-26 20:34:38 -07:00
minggo
fa0370bba5
disable depth test for clipping test
2013-04-27 11:33:23 +08:00
zhangbin
e2c3d33a77
Update the JS bindings for plugin.
2013-04-27 11:32:12 +08:00
James Chen
a2248258b0
Merge pull request #2471 from dumganhar/master
...
[Linux]Updating template of multi-platform-cpp
2013-04-26 20:19:11 -07:00
minggo
9f7d091e95
Merge pull request #2470 from minggo/master
...
disable menutest in lua
2013-04-26 20:18:23 -07:00
James Chen
ec3d870231
[Linux]Updating template of multi-platform-cpp
2013-04-27 11:18:09 +08:00
minggo
ff207b68e0
disable menutest in lua
2013-04-27 11:17:10 +08:00
James Chen
c60224a3c4
Merge pull request #2441 from natural-law/master
...
Add social protocol & plugin twitter
2013-04-26 19:36:13 -07:00
James Chen
eeb1965710
Merge pull request #2468 from dumganhar/master
...
[HelloLua] print ~> cclog
2013-04-26 18:50:07 -07:00
James Chen
5b45f85216
[HelloLua] print ~> cclog
2013-04-27 09:48:35 +08:00
James Chen
98a2cdaf28
Merge pull request #2467 from dumganhar/master
...
Fixing compilation errors for linux port.
2013-04-26 18:35:05 -07:00
James Chen
8c779ff98f
Fixing compilation errors for linux port.
2013-04-27 09:32:46 +08:00
Rohan Kuruvilla
d7020a7ab2
Adding new status messages for Android
2013-04-26 13:47:26 -07:00
Rohan Kuruvilla
8209fa56a2
Fixing bug where screen rotate would keep creating new NSD services
2013-04-26 13:47:26 -07:00
Rohan Kuruvilla
eb85a6c1fb
Handle evalScript from JNI. Also adds helpers for settings status
2013-04-26 13:47:25 -07:00
Rohan Kuruvilla
615329eee5
Add evalScript over the network code and force portrait mode on stop
2013-04-26 13:47:25 -07:00
Rohan Kuruvilla
374c456749
change orientation to Portrait on CCB Stop
2013-04-26 13:47:25 -07:00
Rohan Kuruvilla
ece710c4d8
Adding eval script wrapper for ScriptingCore to AppDelegate
2013-04-26 13:41:15 -07:00
Andre Rudlaff
5e12d9f8fe
don't use named semaphore for syncing image loading thread
...
Named semaphores are unique across process bounds, therefore a semaphore
left in an invalid state may cause locks on other processes.
The code has been exchanged by using pthread mutex and condition variables
2013-04-26 18:55:36 +02:00
zhangbin
7ccd6f5c9a
Add licenses in source code files of HelloAds.
2013-04-26 17:18:17 +08:00
zhangbin
81e1f5c4c7
Optimize the interfaces design in ProtocolAds.
2013-04-26 17:16:06 +08:00
zhangbin
0b08d88f27
Optimize the interface & type names in plugin.
2013-04-26 17:12:51 +08:00
minggo
f0b792eb2d
Merge pull request #2462 from minggo/master
...
add SpiteTest into Android.mk
2013-04-25 23:03:05 -07:00
minggo
d40fdd24b7
fixed #2075:add SpiteTest into Android.mk
2013-04-26 14:02:13 +08:00
minggo
f29f84b0ab
Merge pull request #2461 from minggo/lua-loader
...
add lua loader for all platforms
2013-04-25 21:14:01 -07:00
minggo
89591fdccc
fixed #2084:add lua loader for all platforms
2013-04-26 12:12:19 +08:00
minggo
62231912be
Merge https://github.com/cocos2d/cocos2d-x
2013-04-26 10:36:46 +08:00
Rohan Kuruvilla
c12268bd70
Modifying little log statements
2013-04-25 18:44:59 -07:00
Rohan Kuruvilla
56a1ba9e42
Removing unneeded code
2013-04-25 18:41:58 -07:00
Rohan Kuruvilla
e2edc04946
Fixing handling starting and stopping of NSD service in Android
2013-04-25 18:41:53 -07:00
Rohan Kuruvilla
8a59680175
Removing onSurfaceChange update since it was being executed after ccb_run. This resulted in frame size being changed after game was running (bug)
2013-04-25 18:41:48 -07:00
Rohan Kuruvilla
188f0354f3
Fixing configChanges flag to disable GL context being deleted on rotate
2013-04-25 18:41:43 -07:00
Rohan Kuruvilla
b1f9dd30e7
Using iOS specific text entry for setting pairing code
2013-04-25 18:41:38 -07:00
Rohan Kuruvilla
76f334797d
Refactoring applicationDidFinishLaunching. Also adding scaling for large non-retina Android tablets
2013-04-25 18:41:33 -07:00
Rohan Kuruvilla
2636bafd0c
Fixing network logging for Android and iOS
2013-04-25 18:41:29 -07:00
Rohan Kuruvilla
cecb157f22
Fixing rotation for iOS
2013-04-25 18:41:24 -07:00
Rohan Kuruvilla
0378a97fa0
Adding sending of filelist when reset is pressed on iOS
2013-04-25 18:41:18 -07:00
Rohan Kuruvilla
7bd3f2a260
Fixing resolution handling for iOS and Android
...
1. Adding iPhone5 support
2. Changing Android resolution management based on DPI (Tablet mode or Phone mode)
3. Modifying distribution of xlarge,large,medium,small and xsmall assets to do it properly
4. Using kResolutionFixedWidth (kResolutionFixedHeight for landscape games) to properly calculate aspect ratio
5. Tested on all iOS devices and Nexus 4 (which is correctly identified as Retina phone)
2013-04-25 18:41:14 -07:00
Rohan Kuruvilla
f95b802866
Adding rudemntary support for Rotation in Android
2013-04-25 18:41:01 -07:00
Rohan Kuruvilla
bb91f1eb30
Adding rudementary support for Rotation in iOS
2013-04-25 18:40:56 -07:00
Rohan Kuruvilla
d8c30e0c5b
Adding log redirect over the network for iOS. Also fixing Stop command crash in Android
2013-04-25 18:39:51 -07:00
Rohan Kuruvilla
e6fc611346
Commiting out orientation change code. was causing gl errors with landscape games
2013-04-25 18:39:47 -07:00
Rohan Kuruvilla
9b86791eef
Adding CocosPlayer for iOS
2013-04-25 18:39:43 -07:00
Ed Bartley
f89d39953e
Add PVR.CCZ encryption support to ZipUtils based upon http://www.codeandweb.com/texturepacker/contentprotection
...
Add sample to TestCPP.
2013-04-25 13:40:49 -04:00
James Chen
b648d392ba
Merge pull request #2457 from dumganhar/master
...
Fixing a bug in CCFileUtilsIOS::isFileExist(). Improving performance of isFileExist for all platforms.
2013-04-25 07:09:15 -07:00
James Chen
c5cb886b72
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into lua-bytecode-test
2013-04-25 22:06:43 +08:00