⚲
Project
General
Profile
Sign in
Register
Home
Projects
Search
:
Distorted Android
All Projects
Distorted Android
Issues
News
Documents
Wiki
Forums
Repository
«
Previous
|
Next
»
Revision 3eb6f354
Added by
Leszek Koltunski
over 4 years
ago
ID
3eb6f3546c240ed9336f819b5b03a48efb053c7a
Parent
7594a5d2
Child
c0f5af7b
Merge branch 'empty-matrix-effects-in-the-center' into modern-empty-matrix-effects-in-the-center
Conflicts:
src/main/AndroidManifest.xml
src/main/java/org/distorted/examples/TableOfContents.java
src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java
src/main/java/org/distorted/examples/bean/BeanRenderer.java
src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java
src/main/java/org/distorted/examples/deform/DeformRenderer.java
src/main/java/org/distorted/examples/earth/EarthRenderer.java
src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java
src/main/java/org/distorted/examples/effects3d/Effects3DActivity2.java
src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java
src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java
src/main/java/org/distorted/examples/effects3d/Effects3DSurfaceView.java
src/main/java/org/distorted/examples/effects3d/Effects3DTab.java
src/main/java/org/distorted/examples/effects3d/Effects3DTabViewPager.java
src/main/java/org/distorted/examples/flag/FlagRenderer.java
src/main/java/org/distorted/examples/generic/Effects3DActivity.java
src/main/java/org/distorted/examples/generic/Effects3DActivity2.java
src/main/java/org/distorted/examples/generic/Effects3DEffect.java
src/main/java/org/distorted/examples/generic/Effects3DRenderer.java
src/main/java/org/distorted/examples/generic/Effects3DSurfaceView.java
src/main/java/org/distorted/examples/generic/Effects3DTab.java
src/main/java/org/distorted/examples/generic/Effects3DTabViewPager.java
src/main/java/org/distorted/examples/generic/GenericActivity.java
src/main/java/org/distorted/examples/generic/GenericActivity2.java
src/main/java/org/distorted/examples/generic/GenericEffect.java
src/main/java/org/distorted/examples/generic/GenericRenderer.java
src/main/java/org/distorted/examples/generic/GenericSurfaceView.java
src/main/java/org/distorted/examples/generic/GenericTab.java
src/main/java/org/distorted/examples/glow/GlowRenderer.java
src/main/java/org/distorted/examples/inflate/InflateRenderer.java
src/main/java/org/distorted/examples/listener/ListenerRenderer.java
src/main/java/org/distorted/examples/meshjoin/MeshJoinActivity.java
src/main/java/org/distorted/examples/mirror/MirrorRenderer.java
src/main/java/org/distorted/examples/movingglow/MovingGlowRenderer.java
src/main/java/org/distorted/examples/multiblur/MultiblurRenderer.java
src/main/java/org/distorted/examples/objecttree/ObjectTreeRenderer.java
src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java
src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeRenderer.java
src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java
src/main/java/org/distorted/examples/rubik/RubikRenderer.java
src/main/java/org/distorted/examples/sink/SinkRenderer.java
src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java
src/main/java/org/distorted/examples/stencil/StencilRenderer.java
src/main/java/org/distorted/examples/transparency/TransparencyRenderer.java
src/main/java/org/distorted/examples/triblur/TriblurRenderer.java
src/main/java/org/distorted/examples/wind/WindEffectsManager.java
src/main/java/org/distorted/examples/wind/WindRenderer.java
src/main/res/layout/genericlayout.xml
Changes
View differences
added
modified
copied
renamed
deleted
src
main
java
org
distorted
library
effectqueue
EffectQueueMatrix.java
(
diff
)
Loading...
Merge branch 'empty-matrix-effects-in-the-center' into modern-empty-matrix-effects-in-the-center