Commit Graph

7828 Commits

Author SHA1 Message Date
minggo 3ab63dcc96 Merge pull request #2118 from minggo/refactor-ccuserdefault
issue #1529:modify CCUserDefault.cpp path in linux makefile
2013-03-07 19:19:49 -08:00
minggo e8d4b17a23 issue #1529:modify CCUserDefault.cpp path in linux makefile 2013-03-08 11:18:34 +08:00
minggo d730c9749d Merge pull request #2117 from vipsbpig/master
fixed CCControl::registerWithTouchDispatcher()
2013-03-07 18:56:01 -08:00
vipsbpig ce14169f4d Update CCControl.cpp 2013-03-08 10:26:16 +08:00
vipsbpig 76e247fb9a fix CCControl::registerWithTouchDispatcher() 2013-03-08 10:25:09 +08:00
Rohan Kuruvilla 7149f0598d Adding missing eclipse project files 2013-03-07 12:13:50 -08:00
Rohan Kuruvilla 360519dad5 Removing /bin/bash for executing build command, and keep only bash 2013-03-07 12:09:17 -08:00
minggo 4d8a735463 Merge pull request #2115 from CocosRobot/updategeneratedsubmodule_1362643478
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-07 00:39:13 -08:00
CocosRobot da5d1dcce8 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-07 16:04:48 +08:00
linshun 6fa2e4d054 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-03-07 15:50:21 +08:00
linshun d60ba89b36 Added compatible functions for HTML5 multi resources preloading. 2013-03-07 15:49:05 +08:00
minggo dd8681b18b Merge pull request #2113 from minggo/refactor-ccuserdefault
Refactor ccuserdefault
2013-03-06 23:05:50 -08:00
minggo a691df2251 Merge pull request #2100 from fins/master
getStartLocationInView() and getStartLocation() methods in CCTouch
2013-03-06 22:40:12 -08:00
minggo b06380432b Merge pull request #2109 from youknowone/include
Add missing <UIKit/UIKit.h> for UITextField
2013-03-06 22:35:38 -08:00
minggo 8b86d95e2f Merge pull request #2111 from yuezang/feature_1802
feature #1802:add touches lua test
2013-03-06 22:33:52 -08:00
wangshuai d5cdba484e Merge branch 'master' into feature_1802
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-07 14:32:31 +08:00
wangshuai 6914c9d902 feature #1802:add touches lua test 2013-03-07 11:55:57 +08:00
minggo ee156bd898 Update AUTHORS 2013-03-07 11:12:49 +08:00
minggo 44857e5137 Merge pull request #2093 from sbc100/linux_build_system
Linux build system
2013-03-06 19:09:49 -08:00
minggo 3cb4ab8f31 issue #1529:update xcode template 2013-03-07 10:41:45 +08:00
minggo 2842719e35 issue #1529:add user_default into vs2010 project 2013-03-07 10:31:01 +08:00
minggo e85989f76e issue #1529:modify marmalade and native client project configuration 2013-03-07 09:51:26 +08:00
minggo 61dcf588ca Merge pull request #2104 from yuezang/iss1425-lua
issue #1425:exist lua test case is ok!
2013-03-06 17:35:53 -08:00
Sam Clegg ce247a6304 [NaCl] Fix warnings in ARM build 2013-03-06 13:02:55 -08:00
Sam Clegg 7ad171d8ee Use same top level Makefile for nacl and linux builds.
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.

Fix remaining warnings in NaCl builds.
2013-03-06 13:02:55 -08:00
Sam Clegg 8677dad3c6 Improved build system from linux.
This change makes several fundamental improvements to the linux
build system:

- Remove duplication: a lot of the common make logic is now in
  a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk

- Quiet by default: unless you specify V=1 on the commandline
  the output is now very clean and quiet.

- Dependencies: gcc's automatic dependancy generation is now
  used (-MMD).  This means that if you change a header file
  then all the object that depend on it now get rebuilt.

- Don't store objects in the source tree: previously object
  files were stored alongside the sources, which meant that
  debug and release object clobbered each other which leads
  to confusion and lots of unnecessary rebuilding.Q

- Library dependencies: each binary now depends on the libraries
  it links aginst.  This means that if the cocos2dx library
  changes then all examples will get re-linked.

- Top level Makefile: there is now a top level Makefile that
  can be shared/used by any platform the uses make as the
  build system (for example NaCl).  Everything can be built
  by simply running 'make' at the top level. e.g:

    make DEBUG=1
    make DEBUG=1 clean
2013-03-06 13:02:55 -08:00
wangshuai 3aaa18f7f4 Merge branch 'master' into iss1425-lua
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-06 20:39:01 +08:00
Jeong YunWon bd9656bb08 Add missing <UIKit/UIKit.h> for UITextField 2013-03-06 21:22:43 +09:00
Sergej Tatarincev 56ab904e0a Use shared NodeLoaderLibrary in CCBReader bindings 2013-03-06 14:09:01 +02:00
minggo 648e9a7bf1 issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault 2013-03-06 16:36:44 +08:00
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