File tree
2,170 files changed
+18718
-148218
lines changed- build
- cocos2d_libs.xcodeproj
- cocos2d_tests.xcodeproj
- cmake
- Modules
- cocos
- 2d
- libcocos2d_win10
- win10_props
- 3d
- audio
- android
- jni
- apple
- include
- ios
- mac
- tizen
- win32
- winrt
- base
- allocator
- deprecated
- editor-support
- cocosbuilder
- cocostudio
- ActionTimeline
- WidgetReader
- GameMapReader
- ParticleReader
- SkeletonReader
- SpriteReader
- spine
- proj.win10
- proj.win32
- math
- network
- physics
- platform
- android
- java
- libs
- src/org/cocos2dx/lib
- jni
- apple
- desktop
- ios
- linux
- mac
- tizen
- win32
- win8.1-universal
- cocos2d-js
- winrt
- shaders
- renderer
- backend
- metal
- opengl
- shaders
- scripting
- js-bindings
- manual
- 3d
- proj.android
- proj.win32
- script
- 3d
- ccui
- chipmunk
- debugger
- actors
- utils
- core
- webconsole
- extension
- physics3d
- physicsSprite
- studio
- parsers
- lua-bindings
- auto
- api
- manual
- cocos2d
- proj.android
- proj.tizen
- Build
- proj.win32
- storage/local-storage
- ui
- UIEditBox
- UIWebView
- proj.win32
- vr
- docs
- extensions
- GUI
- CCControlExtension
- CCScrollView
- Particle3D/PU
- assets-manager
- external
- templates
- cpp-template-default
- Classes
- Resources
- proj.android/app
- jni
- res
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- proj.ios_mac
- HelloCpp.xcodeproj
- ios
- Images.xcassets/AppIcon.appiconset
- proj.win32
- js-template-default
- frameworks/runtime-src
- Classes
- proj.android/app
- jni
- res
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- proj.ios_mac/ios
- Images.xcassets/AppIcon.appiconset
- proj.win32
- res
- lua-template-default
- frameworks/runtime-src
- proj.android/app
- jni
- res
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- proj.ios_mac/ios
- Images.xcassets/AppIcon.appiconset
- proj.win32
- res
- tests
- cpp-empty-test
- Classes
- Resources
- icons
- ipadhd
- ipad
- iphone
- proj.android
- app
- jni
- res
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- proj.ios
- Images.xcassets/AppIcon-cpp-empty-test.appiconset
- proj.win10
- Assets
- proj.win32
- cpp-tests
- Classes
- ActionsTest
- AllocatorTest
- BugsTest
- Camera3DTest
- ChipmunkTest
- ClippingNodeTest
- CocosDenshionTest
- ConsoleTest
- DataVisitorTest
- DrawPrimitivesTest
- EffectsAdvancedTest
- EffectsTest
- ExtensionsTest/NetworkTest
- FileUtilsTest
- LabelTest
- LayerTest
- NewAudioEngineTest
- NewEventDispatcherTest
- NewRendererTest
- NodeTest
- ParticleTest
- Physics3DTest
- RenderTextureTest
- ShaderTest
- Sprite3DTest
- SpriteFrameCacheTest
- SpritePolygonTest
- SpriteTest
- Texture2dTest
- TileMapTest
- UITest/CocoStudioGUITest
- UILayoutTest
- UIPageViewTest
- UIRichTextTest
- UISliderTest
- UIVideoPlayerTest
- UnitTest
- Resources
- ActionTimeline
- Default
- testAnimationResource
- Images
- bugs
- sprite_frames_test
- sprites_test
- Particle3D/textures
- Particles
- Presentation
- Sprite3DTest
- TerrainTest
- TileMaps
- animations
- ccb
- components
- extensions
- fonts
- hd
- ActionTimeline
- Default
- testAnimationResource
- Images
- bugs
- TileMaps
- animations
- components
- extensions
- fonts
- spine
- zwoptex
- proj.android
- app
- res
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- proj.ios
- Classes
- Images.xcassets/AppIcon-cpp-tests.appiconset
- proj.mac
- proj.win10
- Assets
- proj.win32
- game-controller-test
- Classes
- Resources
- fonts
- ipadhd
- ipad
- iphone
- proj.android
- app
- jni
- res
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- values
- src/org/cocos2dx/game_controller_test
- gradle/wrapper
- proj.ios
- proj.mac
- en.lproj
- proj.win32
- js-tests
- project
- Classes
- proj.android
- app
- jni
- res
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- proj.ios
- Images.xcassets/AppIcon-js-tests.appiconset
- proj.win32
- resjs/ccb
- src/DrawPrimitivesTest
- lua-empty-test
- project
- Classes
- proj.android
- app
- jni
- res
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- proj.ios
- Images.xcassets/AppIcon-lua-empty-test.appiconset
- proj.win32
- res
- lua-game-controller-test
- project
- Classes
- proj.android
- app
- jni
- res
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- values
- src/org/cocos2dx/LuaGameControllerTest
- gradle/wrapper
- proj.ios
- res
- src
- lua-tests
- project
- proj.android
- app
- jni
- res
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- proj.ios_mac/ios
- Images.xcassets/AppIcon-lua-tests.appiconset
- proj.win32
- res/cocosbuilderRes/ccb
- src
- DrawPrimitivesTest
- performance-tests
- Classes/tests
- Resources
- Images
- sprites_test
- Particle3D/textures
- TileMaps
- fonts
- proj.android
- app
- jni
- res
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- proj.ios
- proj.win32
- tools
- appveyor-scripts
- coding-style
- simulator
- frameworks/runtime-src
- proj.android/res
- drawable-hdpi
- drawable-ldpi
- drawable-mdpi
- proj.ios_mac/ios
- proj.win32
- libsimulator
- lib
- network
- platform
- mac
- win32
- proj.win32
- tojs
- tolua
- travis-scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
2,170 files changed
+18718
-148218
lines changedOriginal file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
37 | 37 |
| |
38 | 38 |
| |
39 | 39 |
| |
| 40 | + | |
40 | 41 |
| |
41 | 42 |
| |
42 | 43 |
| |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
168 | 168 |
| |
169 | 169 |
| |
170 | 170 |
| |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + |
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
2 | 2 |
| |
3 | 3 |
| |
4 | 4 |
| |
| 5 | + | |
5 | 6 |
| |
6 | 7 |
| |
7 | 8 |
| |
| |||
61 | 62 |
| |
62 | 63 |
| |
63 | 64 |
| |
64 |
| - | |
| 65 | + | |
65 | 66 |
| |
66 | 67 |
| |
| 68 | + | |
67 | 69 |
| |
68 | 70 |
| |
69 | 71 |
| |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
34 | 34 |
| |
35 | 35 |
| |
36 | 36 |
| |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
37 | 41 |
| |
38 | 42 |
| |
39 | 43 |
| |
40 |
| - | |
41 |
| - | |
42 |
| - | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
43 | 61 |
| |
44 |
| - | |
45 |
| - | |
| 62 | + | |
| 63 | + | |
46 | 64 |
| |
47 |
| - | |
48 | 65 |
| |
| 66 | + | |
| 67 | + |
This file was deleted.
0 commit comments