Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolved compiler error when compiling a project that uses ObjCpp #1382

Open
wants to merge 105 commits into
base: v3.5.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
36038df
initial commit
Feb 3, 2016
93de923
CCLayoutBox now takes into account a transform of a node
Feb 6, 2016
86b74ad
Compiles for Mac
Feb 6, 2016
03cec7e
Metal rendering works now
Feb 6, 2016
2e6cbc6
TileMaps now server as an extension
Feb 6, 2016
48ca679
CCScrollView improvements
Feb 7, 2016
7153714
CCTransition mechanism refactoring
Feb 7, 2016
9147323
Move CCMotionStreak to -ext
Feb 7, 2016
ba395a4
CCClippingNode moved to -ext
Feb 7, 2016
bfde24b
CCParticles moved to -ext
Feb 7, 2016
88a0a76
CCPackages moved to -ext
Feb 7, 2016
5d2186e
CCParallaxNode moved to -ext
Feb 7, 2016
81b2107
New start-up code
Feb 8, 2016
4c569fe
Drop direct SSZipArchive dependency
Feb 8, 2016
22a4ec4
subproj commit
Feb 9, 2016
169b65d
CCEffects moved to -ext
Feb 9, 2016
f569233
Remove unused files
Feb 10, 2016
a5970b8
ObjectAL moved to -ext
Feb 10, 2016
230bec1
CCBReader moved to -ext
Feb 10, 2016
a58a72c
CCPhysics moved to -ext, removed direct Chipmunk dependency
Feb 10, 2016
788ed57
CCLighting moved to -ext
Feb 10, 2016
abcffbd
Forgot about android. Completely.
Feb 10, 2016
afef57a
cocos2d-core compiles to TVOS now.
Feb 12, 2016
2943774
remove OAL headers include
Feb 21, 2016
8b567c1
Remove android leftovers in CCTouch
Feb 21, 2016
0d7e90a
Forget about CCTouch
Feb 21, 2016
87f484b
Eliminate warnings
Feb 21, 2016
20181f0
xcasset support for texture cache + refactoring
Feb 21, 2016
28b6267
Merge remote-tracking branch 'origin/develop-v3.x' into develop-v3.5
Feb 21, 2016
81dc83f
exclude CCResponderTest from mac
Feb 21, 2016
5d7ab7e
CCProgressNode moved to -ui
Feb 21, 2016
6d05b22
New potentiometer control in -UI
Feb 21, 2016
4b32f33
head imports
Feb 21, 2016
f7a27f7
remove -x related files
Feb 21, 2016
9f2f966
remove templates from repo
Feb 21, 2016
1964a81
remove dummy files
Feb 21, 2016
f190854
More folder cleanup
Feb 21, 2016
6064d26
clean-up
Feb 21, 2016
1679203
Mac fixes
Feb 21, 2016
185a517
#1271
Feb 21, 2016
e5a2c75
template clean-up
Feb 21, 2016
64eb71c
Fix duplicating system methods
Feb 24, 2016
e4df9b3
a fix for Siri Dictation
Feb 26, 2016
64da625
#1215
Feb 26, 2016
1ebd554
update cocos2d version
Feb 27, 2016
92dcc6e
fixes for extensions
Feb 27, 2016
0f62a1a
Update readme for 3.5
Feb 27, 2016
d1a8d3e
Update README.md
s1ddok Feb 27, 2016
7251af9
Merge CCNode private header into main
Feb 29, 2016
05bf8b4
Merge CCSprite private header
Feb 29, 2016
7b5e475
Get rid of CCProgressNode private header + general header clean-up
Feb 29, 2016
f7104cc
Get rid of CCShader_Private
Feb 29, 2016
fb3f66c
Get rid of CCActiomManager_Private
Feb 29, 2016
2df6e96
Get rid of private CCTexture header
Feb 29, 2016
c46b3ca
Simply move CCLabelBMF private header into the bottom of main one
Feb 29, 2016
9ca335e
Merged CCDirector headers
Feb 29, 2016
1ca28a1
Update read-me with grammer fixes and headers
Feb 29, 2016
f4fa0a2
reorgonize CCDirector methods
Feb 29, 2016
d3ff3b7
Remove relative header
Feb 29, 2016
7a41874
update -ext
Feb 29, 2016
b61f989
Fixed contentScale logic while parsing the tile map file
xmkevinchen Mar 4, 2016
8d36ae4
FIX the position setting of CCTMXLayer
xmkevinchen Mar 4, 2016
9768a5c
Fix for headers
Mar 5, 2016
d88bd93
Update wiki and readme
Mar 5, 2016
e08ae7b
Merge pull request #1362 from xmkevinchen/develop-v3.5
s1ddok Mar 6, 2016
b081ed9
#1351
Mar 6, 2016
0f25028
Merge remote-tracking branch 'origin/v3.4.9' into develop-v3.5
Mar 6, 2016
e33b972
Clean up the rest of android stuff
Mar 6, 2016
96a85ed
Delete deprecated files
Mar 6, 2016
c7a8c5e
delete useless assets
Mar 6, 2016
7c3833a
Simplifying font color setup
richardgroves Mar 7, 2016
0214207
Merge pull request #1365 from richardgroves/patch-3
s1ddok Mar 7, 2016
a7a4151
Remove circular import for Metal
Mar 9, 2016
57c9bd6
Adding explanations for -ext in ccConfig
oxeron Mar 10, 2016
116f8e8
Mostly header refactoring for using -ext
oxeron Mar 10, 2016
40adc52
Remove old CCEffectDropShadow_dist
oxeron Mar 10, 2016
3465149
Adding conditions in CCNoArc and CCSprite
oxeron Mar 10, 2016
99b5af6
Getting rid oc CCBReader_Private.h
oxeron Mar 10, 2016
b415a46
Getting rid of CCEffect_Private.h
oxeron Mar 10, 2016
6d1b6df
Getting rid of CCEffectStack_Private.h
oxeron Mar 10, 2016
5e2ab92
Getting rid of CCRenderTexture_Private.h
oxeron Mar 10, 2016
548f24a
Getting rid of CCParticleSystem_Private.h and CCParticleSystemBase_Pr…
oxeron Mar 11, 2016
2d50d32
Getting rid of CCTiledMapLayer_Private.h
oxeron Mar 11, 2016
073890e
Getting rid of CCAnimationManager_Private.h
oxeron Mar 11, 2016
d47ee4f
Getting rid of CCLightNode_Private.h
oxeron Mar 11, 2016
197697a
Getting rid of CCPackage_private.h (+1 squashed commit)
oxeron Mar 11, 2016
81ad356
Remove ANDROID from README and CCBReader
oxeron Mar 11, 2016
b675974
Merge pull request #1370 from oxeron/develop-v3.5-ext
s1ddok Mar 12, 2016
73e4500
Adding CCNodeTag to -ext
oxeron Mar 15, 2016
5495647
Merge pull request #1371 from oxeron/develop-v3.5-ext
s1ddok Mar 15, 2016
3c2f9d3
SpriteBuilderTranslations renamed to CocosBuidlerTranslations
oxeron Mar 19, 2016
759b78d
SpriteBuilder renamed to CocosBuilder
oxeron Mar 21, 2016
ea4251f
Strings.ccbLang files renamed to Strings.ccblang
oxeron Mar 21, 2016
242abaa
Fixed CCTextField textField property always being nil on mac.
twomedia Mar 21, 2016
2843d7b
Merge pull request #1373 from twomedia/develop-v3.5
s1ddok Mar 22, 2016
0696052
Merge pull request #1372 from oxeron/develop-v3.5-ext
s1ddok Mar 23, 2016
2ebdae1
Update README.md
s1ddok Apr 3, 2016
ca68911
Added new ccz header support from TexturePacker
cosimus Apr 27, 2016
cf37436
Corrected some typos
cosimus May 15, 2016
7a2a1f7
Added method for loading sprite sheets and sprite frames from sprite …
danielgronlund May 21, 2016
12e0eac
Merge pull request #1380 from danielgronlund/assets-sprite-atlas-support
s1ddok May 21, 2016
091ce39
Merge pull request #1379 from actinism/v3.5.0
s1ddok May 21, 2016
c629f74
Fixes issue that caused graphics loading to fail when only using @1x …
danielgronlund May 22, 2016
623a76c
Merge pull request #1381 from danielgronlund/atlas-assets-fix
s1ddok May 22, 2016
b0bb5ef
Resolved compiler error when compiling a project that uses Objective-…
logan-5 Jun 25, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions API-Index.md

This file was deleted.

3 changes: 3 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ Lead Developer:

People and companies, who have contributed, in alphabetical order.

* Andrey Volodin
Drives the project since 3.5

* Andy Korth
Co-author of chipmunk (http://howlingmoonsoftware.com/index.php)
CCPhysics
Expand Down
1,819 changes: 0 additions & 1,819 deletions CHANGELOG

This file was deleted.

4 changes: 1 addition & 3 deletions DONORS
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,4 @@ Zemlyanov, Anton

Thank you!


Do you want to donate ? Click here:
https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3316057
Do you want to donate ? Contact us!
23 changes: 0 additions & 23 deletions File Changes.txt

This file was deleted.

54 changes: 28 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
Cocos2D-ObjC
============
Cocos2D is currently trying to raise funds for a Swift version.
If you think this would be interesting, please consider supporting it.
[KickStarter Cocos2D-PureSwift][6]


**PLEASE READ BEFORE POSTING AN ISSUE!**
If in doubt, please post questions and comments in the forum
Expand All @@ -18,70 +14,77 @@ Please note, that the official site has moved. Please update your bookmarks
[The Official Forum][3]

[Cocos2D-ObjC][1] is a framework for building 2D games, demos, and other
graphical/interactive applications for iOS, Mac and Android.
graphical/interactive applications for iOS, Mac and tvOS.
It is based on the [Cocos2D][2] design, but instead of using Python it uses Swift and / or Objective-C.

Cocos2D-ObjC is:

* Fast
* Free
* Lightweight
* Modular
* Easy to use
* Community Supported


Creating New Projects
---------------------
We are in the process of adding a stand alone installer to Cocos2D-Objc. A temporary template can be found [here][5]

An alternative approach, is to use SpriteBuilder:

New Cocos2D projects can be created with SpriteBuilder. SpriteBuilder is, just like Cocos2D, free and open source. You can get SpriteBuilder from [spritebuilder.com](http://spritebuilder.com) or from the Mac App Store. Projects created using SpriteBuilder contains the complete Cocos2D source code, and after the project has been created using SpriteBuilder is optional.

SpriteBuilder also allows you to update the Cocos2D version in your project, to newest version, making it trivial to always keep you project updated to latest Cocos2D version.
For creating new projects you should use an official [Cocos2D Installer][5].

Documentation
---------------------
You can find the full Cocos2D documentation and user guide at our [documentation page](http://cocos2d-objc.org/docs/).

Important:
---------------------
Version 3.5 is introduced.
[See release notes](https://github.com/cocos2d/cocos2d-objc/wiki/Cocos2D-3.5-Release-notes)

Features
-------------
* Scene management (workflow)
* Transitions between scenes
* Sprites and Sprite Sheets
* Effects: Lens, Ripple, Waves, Liquid, etc.
* Effects: Lens, Ripple, Waves, Liquid, etc. *(Served as extension)*
* Actions (behaviours):
* Trasformation Actions: Move, Rotate, Scale, Fade, Tint, etc.
* Composable actions: Sequence, Spawn, Repeat, Reverse
* Ease Actions: Exp, Sin, Cubic, Elastic, etc.
* Misc actions: CallFunc, OrbitCamera, Follow, Tween
* Basic menus and buttons
* Integrated with [Chipmunk][4] physics engine
* Particle system
* Integrated with [Chipmunk][4] physics engine *(Served as extension)*
* Particle system *(Served as extension)*
* Fonts:
* Fast font rendering using Fixed and Variable width fonts
* Support for .ttf fonts
* Tile Map support: Orthogonal, Isometric and Hexagonal
* Parallax scrolling
* Motion Streak
* Render To Texture
* Tile Map support: Orthogonal, Isometric and Hexagonal *(Served as extension)*
* Parallax scrolling *(Served as extension)*
* Motion Streak *(Served as extension)*
* Render To Texture *(Served as extension)*
* Touch/Accelerometer on iOS
* Touch/Mouse/Keyboard on Mac
* Sound Engine support (CocosDenshion library) based on OpenAL
* Sound Engine support based on OpenAL *(Served as extension)*
* Integrated Slow motion/Fast forward
* Fast textures: PVR compressed and uncompressed textures
* Point based: RetinaDisplay mode compatible
* Language: Objective-C
* Language: Objective-C / Swift
* Open Source Commercial Friendly: Compatible with open and closed source projects
* OpenGL ES 2.0 (iOS) / OpenGL 2.1 (Mac) based
* Image assets support
* TVOS support
* App thinning support
* 3D touch support
* OpenGL ES 2.0 or Metal (iOS) / OpenGL 2.1 (Mac) based


Build Requirements
------------------

Mac OS X 10.6 (or newer), Xcode 4.2 (or newer)
Mac OS X 10.9 (or newer), Xcode 7.0 (or newer)


Runtime Requirements
--------------------
* iOS 6.0 or newer for iOS games
* iOS 6.0 (7.0 for Swift) or newer for iOS games
* Snow Leopard (v10.6) or newer for Mac games


Expand All @@ -108,5 +111,4 @@ Download from Github
[2]: http://www.cocos2d.org "cocos2d"
[3]: http://forum.cocos2d-objc.org "Cocos2D-ObjC Official Forum"
[4]: http://www.chipmunk-physics.net
[5]: https://github.com/slembcke/UnofficialCocos2DTemplate
[6]: https://www.kickstarter.com/projects/1455832115/cocos2d-pureswift
[5]: https://github.com/s1ddok/CCProjectGenerator
31 changes: 0 additions & 31 deletions RELEASE TODO.txt

This file was deleted.

15 changes: 0 additions & 15 deletions RELEASE_NOTES

This file was deleted.

Binary file removed Resources-iPad/Images/background1-ipad.jpg
Binary file not shown.
Binary file removed Resources-iPad/Images/background2-ipad.jpg
Binary file not shown.
Binary file removed Resources-iPad/Images/background3-ipad.png
Binary file not shown.
1 change: 0 additions & 1 deletion UnitTests/CCMemoryTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#import <XCTest/XCTest.h>
#import "cocos2d.h"
#import "CCNode_private.h"

@interface CCMemoryNode : CCNode

Expand Down
2 changes: 0 additions & 2 deletions UnitTests/CCNodeTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

#import <XCTest/XCTest.h>
#import "cocos2d.h"
#import "CCDirector_Private.h"
#import "CCNode_Private.h"

@interface CCNodeTests : XCTestCase

Expand Down
1 change: 0 additions & 1 deletion UnitTests/CCPhysicsTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#import "cocos2d.h"

#import "CCPhysics+ObjectiveChipmunk.h"
#import "CCDirector_Private.h"
#import "AppDelegate.h"

@interface CCScheduler(Test)
Expand Down
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

53 changes: 0 additions & 53 deletions cocos2d-demo/Info.plist

This file was deleted.

14 changes: 0 additions & 14 deletions cocos2d-demo/Prefix.pch

This file was deleted.

17 changes: 0 additions & 17 deletions cocos2d-demo/main.m

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import "CCAnimationManager+FrameAnimation.h"
#import "CCAnimationManager_Private.h"
#import "CCAnimationManager.h"

@implementation CCAnimationManager (FrameAnimation)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
*/

#import <Foundation/Foundation.h>
#import "cocos2d.h"
#import "CCBSequenceProperty.h"

@class CCBSequence;
Expand All @@ -47,7 +46,7 @@
#pragma mark Animation Manager

/**
The animation manager plays back animations, usually created by a tool such as SpriteBuilder.
The animation manager plays back animations, usually created by a tool such as CocosBuilder.
Any animation can have an arbitrary number of sequences (timelines) which each have keyframes for different properties.

@note Animation names are case sensitive.
Expand Down Expand Up @@ -130,4 +129,35 @@
/// @see CCBAnimationManagerDelegate
@property (nonatomic,weak) NSObject<CCBAnimationManagerDelegate>* delegate;

// Sequence Array
@property (nonatomic,readonly) NSMutableArray* sequences;


// Auto play sequence id.
@property (nonatomic,assign) int autoPlaySequenceId;

// Base node.
@property (nonatomic,unsafe_unretained) CCNode* rootNode;

// (CCB) Optional owner
@property (nonatomic,unsafe_unretained) id owner;

// (CCB) Resolution and default container size.
@property (nonatomic,assign) CGSize rootContainerSize;

// (CCB) Node Management
- (CGSize) containerSize:(CCNode*)node;
- (void) addNode:(CCNode*)node andSequences:(NSDictionary*)seq;
- (void) moveAnimationsFromNode:(CCNode*)fromNode toNode:(CCNode*)toNode;

// Reset node state.
- (void) setBaseValue:(id)value forNode:(CCNode*)node propertyName:(NSString*)propName;

- (void) runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuration;

- (void)timeSeekForSequenceId:(int)seqId time:(float)time;

#pragma mark Simple Sequence Builder
- (void)addKeyFramesForSequenceNamed:(NSString*)name propertyType:(CCBSequencePropertyType)propertyType frameArray:(NSArray*)frameArray node:(CCNode *)node loop:(BOOL)loop;

@end
Loading