-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
base: v3.5.0
Are you sure you want to change the base?
Commits on Feb 3, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 36038df - Browse repository at this point
Copy the full SHA 36038dfView commit details
Commits on Feb 6, 2016
-
CCLayoutBox now takes into account a transform of a node
issue cocos2d#1333
s1ddok authored and s1ddok committedFeb 6, 2016 Configuration menu - View commit details
-
Copy full SHA for 93de923 - Browse repository at this point
Copy the full SHA 93de923View commit details -
s1ddok authored and s1ddok committed
Feb 6, 2016 Configuration menu - View commit details
-
Copy full SHA for 86b74ad - Browse repository at this point
Copy the full SHA 86b74adView commit details -
s1ddok authored and s1ddok committed
Feb 6, 2016 Configuration menu - View commit details
-
Copy full SHA for 03cec7e - Browse repository at this point
Copy the full SHA 03cec7eView commit details -
TileMaps now server as an extension
s1ddok authored and s1ddok committedFeb 6, 2016 Configuration menu - View commit details
-
Copy full SHA for 2e6cbc6 - Browse repository at this point
Copy the full SHA 2e6cbc6View commit details
Commits on Feb 7, 2016
-
Clean up android, add triggering delegate calls during programming animations
s1ddok authored and s1ddok committedFeb 7, 2016 Configuration menu - View commit details
-
Copy full SHA for 48ca679 - Browse repository at this point
Copy the full SHA 48ca679View commit details -
CCTransition mechanism refactoring
It is possible now to create custom transitions without any objc-runtime hacks
s1ddok authored and s1ddok committedFeb 7, 2016 Configuration menu - View commit details
-
Copy full SHA for 7153714 - Browse repository at this point
Copy the full SHA 7153714View commit details -
s1ddok authored and s1ddok committed
Feb 7, 2016 Configuration menu - View commit details
-
Copy full SHA for 9147323 - Browse repository at this point
Copy the full SHA 9147323View commit details -
s1ddok authored and s1ddok committed
Feb 7, 2016 Configuration menu - View commit details
-
Copy full SHA for ba395a4 - Browse repository at this point
Copy the full SHA ba395a4View commit details -
s1ddok authored and s1ddok committed
Feb 7, 2016 Configuration menu - View commit details
-
Copy full SHA for bfde24b - Browse repository at this point
Copy the full SHA bfde24bView commit details -
s1ddok authored and s1ddok committed
Feb 7, 2016 Configuration menu - View commit details
-
Copy full SHA for 88a0a76 - Browse repository at this point
Copy the full SHA 88a0a76View commit details -
s1ddok authored and s1ddok committed
Feb 7, 2016 Configuration menu - View commit details
-
Copy full SHA for 5d2186e - Browse repository at this point
Copy the full SHA 5d2186eView commit details
Commits on Feb 8, 2016
-
s1ddok authored and s1ddok committed
Feb 8, 2016 Configuration menu - View commit details
-
Copy full SHA for 81b2107 - Browse repository at this point
Copy the full SHA 81b2107View commit details -
Drop direct SSZipArchive dependency
s1ddok authored and s1ddok committedFeb 8, 2016 Configuration menu - View commit details
-
Copy full SHA for 4c569fe - Browse repository at this point
Copy the full SHA 4c569feView commit details
Commits on Feb 9, 2016
-
s1ddok authored and s1ddok committed
Feb 9, 2016 Configuration menu - View commit details
-
Copy full SHA for 22a4ec4 - Browse repository at this point
Copy the full SHA 22a4ec4View commit details -
s1ddok authored and s1ddok committed
Feb 9, 2016 Configuration menu - View commit details
-
Copy full SHA for 169b65d - Browse repository at this point
Copy the full SHA 169b65dView commit details
Commits on Feb 10, 2016
-
s1ddok authored and s1ddok committed
Feb 10, 2016 Configuration menu - View commit details
-
Copy full SHA for f569233 - Browse repository at this point
Copy the full SHA f569233View commit details -
ObjectAL is marked deprecated now by Apple. Somebody may prefer to use AVAudioSession instead of pulling the whole code for ObjectAL
s1ddok authored and s1ddok committedFeb 10, 2016 Configuration menu - View commit details
-
Copy full SHA for a5970b8 - Browse repository at this point
Copy the full SHA a5970b8View commit details -
s1ddok authored and s1ddok committed
Feb 10, 2016 Configuration menu - View commit details
-
Copy full SHA for 230bec1 - Browse repository at this point
Copy the full SHA 230bec1View commit details -
CCPhysics moved to -ext, removed direct Chipmunk dependency
CCPhysics code is an ugly monster. Also, there is still a lot of attention paid to Box2D, so no reason for including Chipmunk physics in stock cocos2d package
s1ddok authored and s1ddok committedFeb 10, 2016 Configuration menu - View commit details
-
Copy full SHA for a58a72c - Browse repository at this point
Copy the full SHA a58a72cView commit details -
s1ddok authored and s1ddok committed
Feb 10, 2016 Configuration menu - View commit details
-
Copy full SHA for 788ed57 - Browse repository at this point
Copy the full SHA 788ed57View commit details -
Forgot about android. Completely.
s1ddok authored and s1ddok committedFeb 10, 2016 Configuration menu - View commit details
-
Copy full SHA for abcffbd - Browse repository at this point
Copy the full SHA abcffbdView commit details
Commits on Feb 12, 2016
-
cocos2d-core compiles to TVOS now.
Temporary solution
s1ddok authored and s1ddok committedFeb 12, 2016 Configuration menu - View commit details
-
Copy full SHA for afef57a - Browse repository at this point
Copy the full SHA afef57aView commit details
Commits on Feb 21, 2016
-
s1ddok authored and s1ddok committed
Feb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 2943774 - Browse repository at this point
Copy the full SHA 2943774View commit details -
Remove android leftovers in CCTouch
s1ddok authored and s1ddok committedFeb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 8b567c1 - Browse repository at this point
Copy the full SHA 8b567c1View commit details -
s1ddok authored and s1ddok committed
Feb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 0d7e90a - Browse repository at this point
Copy the full SHA 0d7e90aView commit details -
s1ddok authored and s1ddok committed
Feb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 87f484b - Browse repository at this point
Copy the full SHA 87f484bView commit details -
xcasset support for texture cache + refactoring
s1ddok authored and s1ddok committedFeb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 20181f0 - Browse repository at this point
Copy the full SHA 20181f0View commit details -
Merge remote-tracking branch 'origin/develop-v3.x' into develop-v3.5
s1ddok authored and s1ddok committedFeb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 28b6267 - Browse repository at this point
Copy the full SHA 28b6267View commit details -
exclude CCResponderTest from mac
s1ddok authored and s1ddok committedFeb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 81dc83f - Browse repository at this point
Copy the full SHA 81dc83fView commit details -
s1ddok authored and s1ddok committed
Feb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 5d7ab7e - Browse repository at this point
Copy the full SHA 5d7ab7eView commit details -
New potentiometer control in -UI
s1ddok authored and s1ddok committedFeb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 6d05b22 - Browse repository at this point
Copy the full SHA 6d05b22View commit details -
s1ddok authored and s1ddok committed
Feb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 4b32f33 - Browse repository at this point
Copy the full SHA 4b32f33View commit details -
s1ddok authored and s1ddok committed
Feb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for f7a27f7 - Browse repository at this point
Copy the full SHA f7a27f7View commit details -
s1ddok authored and s1ddok committed
Feb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 9f2f966 - Browse repository at this point
Copy the full SHA 9f2f966View commit details -
s1ddok authored and s1ddok committed
Feb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 1964a81 - Browse repository at this point
Copy the full SHA 1964a81View commit details -
s1ddok authored and s1ddok committed
Feb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for f190854 - Browse repository at this point
Copy the full SHA f190854View commit details -
s1ddok authored and s1ddok committed
Feb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 6064d26 - Browse repository at this point
Copy the full SHA 6064d26View commit details -
s1ddok authored and s1ddok committed
Feb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 1679203 - Browse repository at this point
Copy the full SHA 1679203View commit details -
s1ddok authored and s1ddok committed
Feb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for 185a517 - Browse repository at this point
Copy the full SHA 185a517View commit details -
s1ddok authored and s1ddok committed
Feb 21, 2016 Configuration menu - View commit details
-
Copy full SHA for e5a2c75 - Browse repository at this point
Copy the full SHA e5a2c75View commit details
Commits on Feb 24, 2016
-
Fix duplicating system methods
s1ddok authored and s1ddok committedFeb 24, 2016 Configuration menu - View commit details
-
Copy full SHA for 64eb71c - Browse repository at this point
Copy the full SHA 64eb71cView commit details
Commits on Feb 26, 2016
-
s1ddok authored and s1ddok committed
Feb 26, 2016 Configuration menu - View commit details
-
Copy full SHA for e4df9b3 - Browse repository at this point
Copy the full SHA e4df9b3View commit details -
s1ddok authored and s1ddok committed
Feb 26, 2016 Configuration menu - View commit details
-
Copy full SHA for 64da625 - Browse repository at this point
Copy the full SHA 64da625View commit details
Commits on Feb 27, 2016
-
s1ddok committed
Feb 27, 2016 Configuration menu - View commit details
-
Copy full SHA for 1ebd554 - Browse repository at this point
Copy the full SHA 1ebd554View commit details -
s1ddok committed
Feb 27, 2016 Configuration menu - View commit details
-
Copy full SHA for 92dcc6e - Browse repository at this point
Copy the full SHA 92dcc6eView commit details -
s1ddok committed
Feb 27, 2016 Configuration menu - View commit details
-
Copy full SHA for 0f62a1a - Browse repository at this point
Copy the full SHA 0f62a1aView commit details -
Configuration menu - View commit details
-
Copy full SHA for d1a8d3e - Browse repository at this point
Copy the full SHA d1a8d3eView commit details
Commits on Feb 29, 2016
-
Merge CCNode private header into main
s1ddok authored and s1ddok committedFeb 29, 2016 Configuration menu - View commit details
-
Copy full SHA for 7251af9 - Browse repository at this point
Copy the full SHA 7251af9View commit details -
s1ddok authored and s1ddok committed
Feb 29, 2016 Configuration menu - View commit details
-
Copy full SHA for 05bf8b4 - Browse repository at this point
Copy the full SHA 05bf8b4View commit details -
Get rid of CCProgressNode private header + general header clean-up
s1ddok authored and s1ddok committedFeb 29, 2016 Configuration menu - View commit details
-
Copy full SHA for 7b5e475 - Browse repository at this point
Copy the full SHA 7b5e475View commit details -
s1ddok authored and s1ddok committed
Feb 29, 2016 Configuration menu - View commit details
-
Copy full SHA for f7104cc - Browse repository at this point
Copy the full SHA f7104ccView commit details -
Get rid of CCActiomManager_Private
s1ddok authored and s1ddok committedFeb 29, 2016 Configuration menu - View commit details
-
Copy full SHA for fb3f66c - Browse repository at this point
Copy the full SHA fb3f66cView commit details -
Get rid of private CCTexture header
s1ddok authored and s1ddok committedFeb 29, 2016 Configuration menu - View commit details
-
Copy full SHA for 2df6e96 - Browse repository at this point
Copy the full SHA 2df6e96View commit details -
Simply move CCLabelBMF private header into the bottom of main one
s1ddok authored and s1ddok committedFeb 29, 2016 Configuration menu - View commit details
-
Copy full SHA for c46b3ca - Browse repository at this point
Copy the full SHA c46b3caView commit details -
s1ddok authored and s1ddok committed
Feb 29, 2016 Configuration menu - View commit details
-
Copy full SHA for 9ca335e - Browse repository at this point
Copy the full SHA 9ca335eView commit details -
Update read-me with grammer fixes and headers
s1ddok authored and s1ddok committedFeb 29, 2016 Configuration menu - View commit details
-
Copy full SHA for 1ca28a1 - Browse repository at this point
Copy the full SHA 1ca28a1View commit details -
s1ddok authored and s1ddok committed
Feb 29, 2016 Configuration menu - View commit details
-
Copy full SHA for f4fa0a2 - Browse repository at this point
Copy the full SHA f4fa0a2View commit details -
s1ddok authored and s1ddok committed
Feb 29, 2016 Configuration menu - View commit details
-
Copy full SHA for d3ff3b7 - Browse repository at this point
Copy the full SHA d3ff3b7View commit details -
s1ddok authored and s1ddok committed
Feb 29, 2016 Configuration menu - View commit details
-
Copy full SHA for 7a41874 - Browse repository at this point
Copy the full SHA 7a41874View commit details
Commits on Mar 4, 2016
-
Configuration menu - View commit details
-
Copy full SHA for b61f989 - Browse repository at this point
Copy the full SHA b61f989View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8d36ae4 - Browse repository at this point
Copy the full SHA 8d36ae4View commit details
Commits on Mar 5, 2016
-
s1ddok authored and s1ddok committed
Mar 5, 2016 Configuration menu - View commit details
-
Copy full SHA for 9768a5c - Browse repository at this point
Copy the full SHA 9768a5cView commit details -
s1ddok authored and s1ddok committed
Mar 5, 2016 Configuration menu - View commit details
-
Copy full SHA for d88bd93 - Browse repository at this point
Copy the full SHA d88bd93View commit details
Commits on Mar 6, 2016
-
Merge pull request cocos2d#1362 from xmkevinchen/develop-v3.5
Fixed contentScale logic while parsing the tile map file
Configuration menu - View commit details
-
Copy full SHA for e08ae7b - Browse repository at this point
Copy the full SHA e08ae7bView commit details -
s1ddok authored and s1ddok committed
Mar 6, 2016 Configuration menu - View commit details
-
Copy full SHA for b081ed9 - Browse repository at this point
Copy the full SHA b081ed9View commit details -
Merge remote-tracking branch 'origin/v3.4.9' into develop-v3.5
s1ddok authored and s1ddok committedMar 6, 2016 Configuration menu - View commit details
-
Copy full SHA for 0f25028 - Browse repository at this point
Copy the full SHA 0f25028View commit details -
Clean up the rest of android stuff
s1ddok authored and s1ddok committedMar 6, 2016 Configuration menu - View commit details
-
Copy full SHA for e33b972 - Browse repository at this point
Copy the full SHA e33b972View commit details -
s1ddok authored and s1ddok committed
Mar 6, 2016 Configuration menu - View commit details
-
Copy full SHA for 96a85ed - Browse repository at this point
Copy the full SHA 96a85edView commit details -
s1ddok authored and s1ddok committed
Mar 6, 2016 Configuration menu - View commit details
-
Copy full SHA for c7a8c5e - Browse repository at this point
Copy the full SHA c7a8c5eView commit details
Commits on Mar 7, 2016
-
Repeat of PR in cocos2d#1320 that got lost due branch changes and GitHub limitations.
Configuration menu - View commit details
-
Copy full SHA for 7c3833a - Browse repository at this point
Copy the full SHA 7c3833aView commit details -
Merge pull request cocos2d#1365 from richardgroves/patch-3
Simplifying font color setup
Configuration menu - View commit details
-
Copy full SHA for 0214207 - Browse repository at this point
Copy the full SHA 0214207View commit details
Commits on Mar 9, 2016
-
Remove circular import for Metal
s1ddok authored and s1ddok committedMar 9, 2016 Configuration menu - View commit details
-
Copy full SHA for a7a4151 - Browse repository at this point
Copy the full SHA a7a4151View commit details
Commits on Mar 10, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 57c9bd6 - Browse repository at this point
Copy the full SHA 57c9bd6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 116f8e8 - Browse repository at this point
Copy the full SHA 116f8e8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 40adc52 - Browse repository at this point
Copy the full SHA 40adc52View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3465149 - Browse repository at this point
Copy the full SHA 3465149View commit details
Commits on Mar 11, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 99b5af6 - Browse repository at this point
Copy the full SHA 99b5af6View commit details -
Configuration menu - View commit details
-
Copy full SHA for b415a46 - Browse repository at this point
Copy the full SHA b415a46View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6d1b6df - Browse repository at this point
Copy the full SHA 6d1b6dfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5e2ab92 - Browse repository at this point
Copy the full SHA 5e2ab92View commit details -
Configuration menu - View commit details
-
Copy full SHA for 548f24a - Browse repository at this point
Copy the full SHA 548f24aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2d50d32 - Browse repository at this point
Copy the full SHA 2d50d32View commit details -
Configuration menu - View commit details
-
Copy full SHA for 073890e - Browse repository at this point
Copy the full SHA 073890eView commit details -
Configuration menu - View commit details
-
Copy full SHA for d47ee4f - Browse repository at this point
Copy the full SHA d47ee4fView commit details -
Getting rid of CCPackage_private.h (+1 squashed commit)
Squashed commits: [bc26607] Getting rid of CCPackageManager_private.h This one was easy code was already in CCPackageManager.m
Configuration menu - View commit details
-
Copy full SHA for 197697a - Browse repository at this point
Copy the full SHA 197697aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 81ad356 - Browse repository at this point
Copy the full SHA 81ad356View commit details
Commits on Mar 12, 2016
-
Merge pull request cocos2d#1370 from oxeron/develop-v3.5-ext
Header modifications for -ext
Configuration menu - View commit details
-
Copy full SHA for b675974 - Browse repository at this point
Copy the full SHA b675974View commit details
Commits on Mar 15, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 73e4500 - Browse repository at this point
Copy the full SHA 73e4500View commit details -
Merge pull request cocos2d#1371 from oxeron/develop-v3.5-ext
Adding CCNodeTag to -ext
Configuration menu - View commit details
-
Copy full SHA for 5495647 - Browse repository at this point
Copy the full SHA 5495647View commit details
Commits on Mar 21, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 3c2f9d3 - Browse repository at this point
Copy the full SHA 3c2f9d3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 759b78d - Browse repository at this point
Copy the full SHA 759b78dView commit details -
Configuration menu - View commit details
-
Copy full SHA for ea4251f - Browse repository at this point
Copy the full SHA ea4251fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 242abaa - Browse repository at this point
Copy the full SHA 242abaaView commit details
Commits on Mar 22, 2016
-
Merge pull request cocos2d#1373 from twomedia/develop-v3.5
Fixed CCTextField textField property always being nil on mac.
Configuration menu - View commit details
-
Copy full SHA for 2843d7b - Browse repository at this point
Copy the full SHA 2843d7bView commit details
Commits on Mar 23, 2016
-
Merge pull request cocos2d#1372 from oxeron/develop-v3.5-ext
SpriteBuilder renamed to CocosBuilder
Configuration menu - View commit details
-
Copy full SHA for 0696052 - Browse repository at this point
Copy the full SHA 0696052View commit details
Commits on Apr 3, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 2ebdae1 - Browse repository at this point
Copy the full SHA 2ebdae1View commit details
Commits on Apr 27, 2016
-
Added new ccz header support from TexturePacker
On behalf from latest TexturePacker added his code changes from website, for details on contentprotection see: https://www.codeandweb.com/texturepacker/contentprotection Original ZipUtils could not handle pvr.ccz version 2 correctly (wrong byte header), currently version 3 (pvr.ccz = pvr+zlib) works fine.
Configuration menu - View commit details
-
Copy full SHA for ca68911 - Browse repository at this point
Copy the full SHA ca68911View commit details
Commits on May 15, 2016
-
Configuration menu - View commit details
-
Copy full SHA for cf37436 - Browse repository at this point
Copy the full SHA cf37436View commit details
Commits on May 21, 2016
-
Added method for loading sprite sheets and sprite frames from sprite …
…atlases stored in the image asset folder.
Configuration menu - View commit details
-
Copy full SHA for 7a2a1f7 - Browse repository at this point
Copy the full SHA 7a2a1f7View commit details -
Merge pull request cocos2d#1380 from danielgronlund/assets-sprite-atl…
…as-support CCSpriteFrameCache support for loading sprite sheets from image assets.
Configuration menu - View commit details
-
Copy full SHA for 12e0eac - Browse repository at this point
Copy the full SHA 12e0eacView commit details -
Merge pull request cocos2d#1379 from actinism/v3.5.0
Compatibility with latest TexturePacker SpriteSheets Using PVR+zlib
Configuration menu - View commit details
-
Copy full SHA for 091ce39 - Browse repository at this point
Copy the full SHA 091ce39View commit details
Commits on May 22, 2016
-
Fixes issue that caused graphics loading to fail when only using @1x …
…graphics in an atlas sprite asset.
Configuration menu - View commit details
-
Copy full SHA for c629f74 - Browse repository at this point
Copy the full SHA c629f74View commit details -
Merge pull request cocos2d#1381 from danielgronlund/atlas-assets-fix
Fixes atlas asset loading bug.
Configuration menu - View commit details
-
Copy full SHA for 623a76c - Browse repository at this point
Copy the full SHA 623a76cView commit details
Commits on Jun 25, 2016
-
Resolved compiler error when compiling a project that uses Objective-…
…C++ as well as Cocos2D-Objc. Also added an Objective-C++ test to cocos2d-tests; one involving a basic node hierarchy, the next involving a slightly more dicey manual visiting of a node with proper transforms, without necessarily adding it as a child of another node, using CCRenderer_Private. This patch does *not necessarily* allow you to compile cocos2d in Objective-C++ mode. It only ensures that you can use Objective-C++ in your project along with Cocos2D-Objc. The Objective-C++ fix within CCRenderer_Private.h was suggested by @slembcke here: http://forum.spritebuilder.com/t/cocos3d-c-mm-files-compiler-issue/15570/4
Configuration menu - View commit details
-
Copy full SHA for b0bb5ef - Browse repository at this point
Copy the full SHA b0bb5efView commit details