Update neverball to 1.6.0.

Changes:
* An OpenGL ES-compatible renderer.
* Port to SDL 2.
* Graphics performance improvements.
* Mapping documentation
* Configurable responsiveness of all three cameras via camera_*_speed
* Intelligent manual rotation behavior.
* Reworked configuration via joystick_axis_* and joystick_button_*
  options in neverballrc.
* Configurable tilt responsiveness via mouse_response and joystick_response
  options in neverballrc.  Accustomed keyboard users may want to set
  joystick_response to 50 to restore previous arrow key responsiveness.
* Move default camera keys from F1-F3 to 1-3.
* Automatically invalidate scores for older levels.
* Adjustable replay playback speed using the mouse wheel.
* Interpolate game state between updates for smooth display.
* Simulation and collision detection-related fixes.
* Rotating platforms!
* NeverballPack gamepack for Radiant:
    * Tailored defaults.
    * Built-in entity documentation.
    * Custom Build menu options.
* Ability to load levels in standalone mode from the command line.
* Recognize .pk3 (a renamed .zip) as a package extension for Radiant
  compatibility.
* Limit entity timer precision to milliseconds to fix a number of
  timing-related bugs.
* New level sets / courses:
    * Tones Levels, a level set by Ian Walker.
    * Golf Jambalaya, a golf course by vidski.
    * Reshaun's Easy-Putt, a golf course by Reshaun Francis.
* Updated level sets:
    * Countless highscore and bug fixes.
    * Some completely reworked levels.
    * Four all-new Nevermania levels.
* New balls:
    * Rift Ball, Octocat Ball, Melon Ball, Orange Ball, Diagonal Ball,
      Cheese Ball, Catseye Ball, UFO Ball.
* Updated balls:
    * Eyeball, Blinky.
* Countless translation updates.
* Language selection screen.
* Support for custom GUI themes. A GUI theme can be installed as any
  Neverball package and selected via the theme option in neverballrc.
* Lighting adjustments to improve visibility in levels.
* Error logging to a text file in the user folder.
* Incremental loading of replays.

6 files changed, 768 insertions, 390 deletions

diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index 728de25f47b..2cea0cc8fdf 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2014/08/21 14:08:04 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2015/02/09 09:02:12 snj Exp $
 
-DISTNAME=	neverball-1.5.4
-PKGREVISION=	7
+DISTNAME=	neverball-1.6.0
 CATEGORIES=	games
 MASTER_SITES=	http://neverball.org/
 
@@ -25,7 +24,7 @@ LDFLAGS.DragonFly=	-lX11 -lm
 LDFLAGS.SunOS+=		-lX11 -lm
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/MANUAL ${WRKSRC}/README \
+	${INSTALL_DATA} ${WRKSRC}/doc/manual.txt \
 	    ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_PROGRAM} ${WRKSRC}/neverball ${WRKSRC}/neverputt \
 	    ${DESTDIR}${PREFIX}/bin
@@ -38,8 +37,7 @@ do-install:
 	cd ${WRKSRC} && ${PAX} -rwppm data ${DESTDIR}${SHAREDIR}
 
 .include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/SDL_ttf/buildlink3.mk"
+.include "../../fonts/SDL2_ttf/buildlink3.mk"
 .include "../../devel/physfs/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/games/neverball/PLIST b/games/neverball/PLIST
index 020a995d1d5..343169095d7 100644
--- a/games/neverball/PLIST
+++ b/games/neverball/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2009/12/03 06:33:46 snj Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/02/09 09:02:12 snj Exp $
 bin/neverball
 bin/neverputt
-share/doc/neverball/MANUAL
-share/doc/neverball/README
+share/doc/neverball/manual.txt
 share/neverball/data/back/alien.png
 share/neverball/data/back/blk_blu.png
 share/neverball/data/back/blk_cyn.png
@@ -24,6 +23,20 @@ share/neverball/data/back/land.png
 share/neverball/data/back/ocean.png
 share/neverball/data/back/org_yel.png
 share/neverball/data/back/pastel.png
+share/neverball/data/back/paxed01.png
+share/neverball/data/back/paxed02.png
+share/neverball/data/back/paxed03.png
+share/neverball/data/back/paxed04.png
+share/neverball/data/back/paxed05.png
+share/neverball/data/back/paxed06.png
+share/neverball/data/back/paxed07.png
+share/neverball/data/back/paxed08.png
+share/neverball/data/back/paxed09.png
+share/neverball/data/back/paxed10.png
+share/neverball/data/back/paxed11.png
+share/neverball/data/back/paxed12.png
+share/neverball/data/back/paxed13.png
+share/neverball/data/back/paxed14.png
 share/neverball/data/back/purples.png
 share/neverball/data/back/red_blu.png
 share/neverball/data/back/red_prp.png
@@ -55,6 +68,26 @@ share/neverball/data/ball/blinky/blinky-outer.map
 share/neverball/data/ball/blinky/blinky-outer.sol
 share/neverball/data/ball/blinky/blinky.obj
 share/neverball/data/ball/blinky/blinky.png
+share/neverball/data/ball/catseye/bubble
+share/neverball/data/ball/catseye/bubble-small.obj
+share/neverball/data/ball/catseye/bubble.obj
+share/neverball/data/ball/catseye/bubble.png
+share/neverball/data/ball/catseye/catseye
+share/neverball/data/ball/catseye/catseye-solid.map
+share/neverball/data/ball/catseye/catseye-solid.sol
+share/neverball/data/ball/catseye/catseye-surface
+share/neverball/data/ball/catseye/catseye-surface.png
+share/neverball/data/ball/catseye/catseye.obj
+share/neverball/data/ball/catseye/catseye.png
+share/neverball/data/ball/cheese-ball/cheese-ball
+share/neverball/data/ball/cheese-ball/cheese-ball-solid.map
+share/neverball/data/ball/cheese-ball/cheese-ball-solid.sol
+share/neverball/data/ball/cheese-ball/cheese-ball.obj
+share/neverball/data/ball/cheese-ball/cheese-ball.png
+share/neverball/data/ball/diagonal-ball/diagonal-ball
+share/neverball/data/ball/diagonal-ball/diagonal-ball-solid.map
+share/neverball/data/ball/diagonal-ball/diagonal-ball-solid.sol
+share/neverball/data/ball/diagonal-ball/diagonal-ball.png
 share/neverball/data/ball/earth/earth-atmos
 share/neverball/data/ball/earth/earth-atmos.png
 share/neverball/data/ball/earth/earth-cloud
@@ -70,9 +103,14 @@ share/neverball/data/ball/earth/earth-outer.sol
 share/neverball/data/ball/earth/earth-solid.map
 share/neverball/data/ball/earth/earth-solid.sol
 share/neverball/data/ball/eyeball/eyeball
+share/neverball/data/ball/eyeball/eyeball-outer.map
+share/neverball/data/ball/eyeball/eyeball-outer.sol
 share/neverball/data/ball/eyeball/eyeball-solid.map
 share/neverball/data/ball/eyeball/eyeball-solid.sol
+share/neverball/data/ball/eyeball/eyeball.obj
 share/neverball/data/ball/eyeball/eyeball.png
+share/neverball/data/ball/eyeball/lens
+share/neverball/data/ball/eyeball/lens.png
 share/neverball/data/ball/lava/lava-glow
 share/neverball/data/ball/lava/lava-glow.png
 share/neverball/data/ball/lava/lava-inner
@@ -89,6 +127,23 @@ share/neverball/data/ball/magic-eightball/magic-eightball
 share/neverball/data/ball/magic-eightball/magic-eightball-solid.map
 share/neverball/data/ball/magic-eightball/magic-eightball-solid.sol
 share/neverball/data/ball/magic-eightball/magic-eightball.png
+share/neverball/data/ball/melon/melon
+share/neverball/data/ball/melon/melon-solid.map
+share/neverball/data/ball/melon/melon-solid.sol
+share/neverball/data/ball/melon/melon.png
+share/neverball/data/ball/octocat/octocat
+share/neverball/data/ball/octocat/octocat-inner.map
+share/neverball/data/ball/octocat/octocat-inner.sol
+share/neverball/data/ball/octocat/octocat-solid.map
+share/neverball/data/ball/octocat/octocat-solid.sol
+share/neverball/data/ball/octocat/octocat.mtl
+share/neverball/data/ball/octocat/octocat.obj
+share/neverball/data/ball/octocat/octocat.png
+share/neverball/data/ball/orange/orange
+share/neverball/data/ball/orange/orange-solid.map
+share/neverball/data/ball/orange/orange-solid.sol
+share/neverball/data/ball/orange/orange.png
+share/neverball/data/ball/orange/orange_sculpted.obj
 share/neverball/data/ball/reactor/flare1.png
 share/neverball/data/ball/reactor/flare2.png
 share/neverball/data/ball/reactor/reactor-inner.map
@@ -101,6 +156,14 @@ share/neverball/data/ball/reactor/reactor-surface
 share/neverball/data/ball/reactor/reactor-surface.png
 share/neverball/data/ball/reactor/sparkle1
 share/neverball/data/ball/reactor/sparkle1.png
+share/neverball/data/ball/rift/rift
+share/neverball/data/ball/rift/rift-outer.map
+share/neverball/data/ball/rift/rift-outer.sol
+share/neverball/data/ball/rift/rift-solid.map
+share/neverball/data/ball/rift/rift-solid.sol
+share/neverball/data/ball/rift/rift.jpg
+share/neverball/data/ball/rift/rift.mtl
+share/neverball/data/ball/rift/rift.obj
 share/neverball/data/ball/saturn/saturn-outer.map
 share/neverball/data/ball/saturn/saturn-outer.sol
 share/neverball/data/ball/saturn/saturn-ring
@@ -124,14 +187,28 @@ share/neverball/data/ball/snowglobe/snowglobe-star.png
 share/neverball/data/ball/snowglobe/snowglobe-surface
 share/neverball/data/ball/snowglobe/snowglobe-surface.png
 share/neverball/data/ball/snowglobe/snowglobe-train.obj
-share/neverball/data/ball/sootsprite/sootsprite-body
-share/neverball/data/ball/sootsprite/sootsprite-body.png
+share/neverball/data/ball/sootsprite/sootsprite-body-outer
+share/neverball/data/ball/sootsprite/sootsprite-body-outer.png
+share/neverball/data/ball/sootsprite/sootsprite-body-solid
+share/neverball/data/ball/sootsprite/sootsprite-body-solid.png
 share/neverball/data/ball/sootsprite/sootsprite-eye
 share/neverball/data/ball/sootsprite/sootsprite-eye.png
 share/neverball/data/ball/sootsprite/sootsprite-outer.map
 share/neverball/data/ball/sootsprite/sootsprite-outer.sol
 share/neverball/data/ball/sootsprite/sootsprite-solid.map
 share/neverball/data/ball/sootsprite/sootsprite-solid.sol
+share/neverball/data/ball/ufo/alien
+share/neverball/data/ball/ufo/alien.png
+share/neverball/data/ball/ufo/poof-blue
+share/neverball/data/ball/ufo/poof-blue.png
+share/neverball/data/ball/ufo/thruster
+share/neverball/data/ball/ufo/thruster.png
+share/neverball/data/ball/ufo/ufo-alien.obj
+share/neverball/data/ball/ufo/ufo-body.obj
+share/neverball/data/ball/ufo/ufo-glass.obj
+share/neverball/data/ball/ufo/ufo-outer.map
+share/neverball/data/ball/ufo/ufo-outer.sol
+share/neverball/data/ball/ufo/ufo-thrusters.obj
 share/neverball/data/bgm/inter.ogg
 share/neverball/data/bgm/title.ogg
 share/neverball/data/bgm/track1.ogg
@@ -141,7 +218,52 @@ share/neverball/data/bgm/track4.ogg
 share/neverball/data/bgm/track5.ogg
 share/neverball/data/bgm/track6.ogg
 share/neverball/data/courses.txt
+share/neverball/data/geom/back/back.map
+share/neverball/data/geom/back/back.obj
+share/neverball/data/geom/back/back.sol
+share/neverball/data/geom/beam/beam
+share/neverball/data/geom/beam/beam.map
+share/neverball/data/geom/beam/beam.mtl
+share/neverball/data/geom/beam/beam.obj
+share/neverball/data/geom/beam/beam.png
+share/neverball/data/geom/beam/beam.sol
+share/neverball/data/geom/beam/beam.wings
+share/neverball/data/geom/flag/flag.map
+share/neverball/data/geom/flag/flag.mtl
+share/neverball/data/geom/flag/flag.obj
+share/neverball/data/geom/flag/flag.sol
+share/neverball/data/geom/flag/flag.wings
+share/neverball/data/geom/goal/goal
+share/neverball/data/geom/goal/goal.map
+share/neverball/data/geom/goal/goal.obj
+share/neverball/data/geom/goal/goal.png
+share/neverball/data/geom/goal/goal.sol
+share/neverball/data/geom/jump/jump
+share/neverball/data/geom/jump/jump.map
+share/neverball/data/geom/jump/jump.obj
+share/neverball/data/geom/jump/jump.png
+share/neverball/data/geom/jump/jump.sol
+share/neverball/data/geom/mark/mark.map
+share/neverball/data/geom/mark/mark.mtl
+share/neverball/data/geom/mark/mark.obj
+share/neverball/data/geom/mark/mark.sol
+share/neverball/data/geom/mark/mark.wings
+share/neverball/data/geom/vect/vect
+share/neverball/data/geom/vect/vect.map
+share/neverball/data/geom/vect/vect.mtl
+share/neverball/data/geom/vect/vect.obj
+share/neverball/data/geom/vect/vect.png
+share/neverball/data/geom/vect/vect.sol
+share/neverball/data/geom/vect/vect.wings
+share/neverball/data/gui/ball.map
 share/neverball/data/gui/ball.nbr
+share/neverball/data/gui/ball.sol
+share/neverball/data/gui/classic/back-hilite-focus.png
+share/neverball/data/gui/classic/back-hilite.png
+share/neverball/data/gui/classic/back-plain-focus.png
+share/neverball/data/gui/classic/back-plain.png
+share/neverball/data/gui/classic/theme.txt
+share/neverball/data/gui/cursor.png
 share/neverball/data/gui/demo1.nbr
 share/neverball/data/gui/demo2.nbr
 share/neverball/data/gui/help1.jpg
@@ -149,23 +271,43 @@ share/neverball/data/gui/help2.jpg
 share/neverball/data/gui/help3.jpg
 share/neverball/data/gui/help4.jpg
 share/neverball/data/holes-abc.txt
+share/neverball/data/holes-easyputt.txt
 share/neverball/data/holes-kk.txt
 share/neverball/data/holes-paxed.txt
 share/neverball/data/holes-paxed2.txt
 share/neverball/data/holes-paxed3.txt
 share/neverball/data/holes-putt.txt
 share/neverball/data/holes-slippi.txt
+share/neverball/data/holes-vidski.txt
 share/neverball/data/icon/neverball.png
 share/neverball/data/icon/neverputt.png
+share/neverball/data/item/coin/chinese_coin.png
 share/neverball/data/item/coin/coin
+share/neverball/data/item/coin/coin-glow
+share/neverball/data/item/coin/coin-glow.png
 share/neverball/data/item/coin/coin-no.png
 share/neverball/data/item/coin/coin.map
 share/neverball/data/item/coin/coin.obj
 share/neverball/data/item/coin/coin.png
 share/neverball/data/item/coin/coin.sol
 share/neverball/data/item/coin/coin.wings
+share/neverball/data/item/coin/coin1.png
+share/neverball/data/item/coin/coin10
+share/neverball/data/item/coin/coin10.map
+share/neverball/data/item/coin/coin10.png
+share/neverball/data/item/coin/coin10.sol
+share/neverball/data/item/coin/coin5
+share/neverball/data/item/coin/coin5.map
+share/neverball/data/item/coin/coin5.png
+share/neverball/data/item/coin/coin5.sol
 share/neverball/data/item/coin/euro_coin.png
+share/neverball/data/item/coin/forint_coin.png
+share/neverball/data/item/coin/pound_coin.png
+share/neverball/data/item/coin/ruble_coin.png
+share/neverball/data/item/coin/won_coin.png
+share/neverball/data/item/coin/zloty_coin.png
 share/neverball/data/item/grow/grow
+share/neverball/data/item/grow/grow+shrink.wings
 share/neverball/data/item/grow/grow.map
 share/neverball/data/item/grow/grow.obj
 share/neverball/data/item/grow/grow.png
@@ -175,6 +317,28 @@ share/neverball/data/item/shrink/shrink.map
 share/neverball/data/item/shrink/shrink.obj
 share/neverball/data/item/shrink/shrink.png
 share/neverball/data/item/shrink/shrink.sol
+share/neverball/data/lang/ca.txt
+share/neverball/data/lang/de.txt
+share/neverball/data/lang/el.txt
+share/neverball/data/lang/en_US.txt
+share/neverball/data/lang/eo.txt
+share/neverball/data/lang/es.txt
+share/neverball/data/lang/fi.txt
+share/neverball/data/lang/fr.txt
+share/neverball/data/lang/gd.txt
+share/neverball/data/lang/gl.txt
+share/neverball/data/lang/hu.txt
+share/neverball/data/lang/it.txt
+share/neverball/data/lang/ko.txt
+share/neverball/data/lang/lv.txt
+share/neverball/data/lang/nn.txt
+share/neverball/data/lang/pl.txt
+share/neverball/data/lang/pt_BR.txt
+share/neverball/data/lang/ru.txt
+share/neverball/data/lang/sv.txt
+share/neverball/data/lang/zh_CN.txt
+share/neverball/data/lang/zh_TW.txt
+share/neverball/data/lights.txt
 share/neverball/data/map-back/alien.map
 share/neverball/data/map-back/alien.sol
 share/neverball/data/map-back/blank.map
@@ -275,16 +439,58 @@ share/neverball/data/map-easy/thwomp2.map
 share/neverball/data/map-easy/thwomp2.sol
 share/neverball/data/map-easy/wakka.map
 share/neverball/data/map-easy/wakka.sol
+share/neverball/data/map-easyputt/easyputt1.map
+share/neverball/data/map-easyputt/easyputt1.sol
+share/neverball/data/map-easyputt/easyputt10.map
+share/neverball/data/map-easyputt/easyputt10.sol
+share/neverball/data/map-easyputt/easyputt11.map
+share/neverball/data/map-easyputt/easyputt11.sol
+share/neverball/data/map-easyputt/easyputt12.map
+share/neverball/data/map-easyputt/easyputt12.sol
+share/neverball/data/map-easyputt/easyputt13.map
+share/neverball/data/map-easyputt/easyputt13.sol
+share/neverball/data/map-easyputt/easyputt14.map
+share/neverball/data/map-easyputt/easyputt14.sol
+share/neverball/data/map-easyputt/easyputt15.map
+share/neverball/data/map-easyputt/easyputt15.sol
+share/neverball/data/map-easyputt/easyputt16.map
+share/neverball/data/map-easyputt/easyputt16.sol
+share/neverball/data/map-easyputt/easyputt17.map
+share/neverball/data/map-easyputt/easyputt17.sol
+share/neverball/data/map-easyputt/easyputt18.map
+share/neverball/data/map-easyputt/easyputt18.sol
+share/neverball/data/map-easyputt/easyputt2.map
+share/neverball/data/map-easyputt/easyputt2.sol
+share/neverball/data/map-easyputt/easyputt3.map
+share/neverball/data/map-easyputt/easyputt3.sol
+share/neverball/data/map-easyputt/easyputt4.map
+share/neverball/data/map-easyputt/easyputt4.sol
+share/neverball/data/map-easyputt/easyputt5.map
+share/neverball/data/map-easyputt/easyputt5.sol
+share/neverball/data/map-easyputt/easyputt6.map
+share/neverball/data/map-easyputt/easyputt6.sol
+share/neverball/data/map-easyputt/easyputt7.map
+share/neverball/data/map-easyputt/easyputt7.sol
+share/neverball/data/map-easyputt/easyputt8.map
+share/neverball/data/map-easyputt/easyputt8.sol
+share/neverball/data/map-easyputt/easyputt9.map
+share/neverball/data/map-easyputt/easyputt9.sol
 share/neverball/data/map-fwp/adventure.map
 share/neverball/data/map-fwp/adventure.sol
 share/neverball/data/map-fwp/atrium.map
 share/neverball/data/map-fwp/atrium.sol
+share/neverball/data/map-fwp/buoys.map
+share/neverball/data/map-fwp/buoys.sol
 share/neverball/data/map-fwp/cargo.map
 share/neverball/data/map-fwp/cargo.sol
 share/neverball/data/map-fwp/confetti.map
 share/neverball/data/map-fwp/confetti.sol
 share/neverball/data/map-fwp/discs.map
 share/neverball/data/map-fwp/discs.sol
+share/neverball/data/map-fwp/inferno.map
+share/neverball/data/map-fwp/inferno.sol
+share/neverball/data/map-fwp/ladybirds.map
+share/neverball/data/map-fwp/ladybirds.sol
 share/neverball/data/map-fwp/mountains.map
 share/neverball/data/map-fwp/mountains.sol
 share/neverball/data/map-fwp/museum.map
@@ -295,6 +501,8 @@ share/neverball/data/map-fwp/rails.map
 share/neverball/data/map-fwp/rails.sol
 share/neverball/data/map-fwp/ramps.map
 share/neverball/data/map-fwp/ramps.sol
+share/neverball/data/map-fwp/rings.map
+share/neverball/data/map-fwp/rings.sol
 share/neverball/data/map-fwp/slope.map
 share/neverball/data/map-fwp/slope.sol
 share/neverball/data/map-fwp/spacetime.map
@@ -417,8 +625,12 @@ share/neverball/data/map-misc/bounce.map
 share/neverball/data/map-misc/bounce.sol
 share/neverball/data/map-misc/bounce2.map
 share/neverball/data/map-misc/bounce2.sol
+share/neverball/data/map-misc/centrifuge.map
+share/neverball/data/map-misc/centrifuge.sol
 share/neverball/data/map-misc/checkers.map
 share/neverball/data/map-misc/checkers.sol
+share/neverball/data/map-misc/edge-test.map
+share/neverball/data/map-misc/edge-test.sol
 share/neverball/data/map-misc/elevator.map
 share/neverball/data/map-misc/elevator.sol
 share/neverball/data/map-misc/freefall-old.map
@@ -437,6 +649,8 @@ share/neverball/data/map-misc/thwomp1.map
 share/neverball/data/map-misc/thwomp1.sol
 share/neverball/data/map-misc/timer-test.map
 share/neverball/data/map-misc/timer-test.sol
+share/neverball/data/map-misc/timer-test_2.map
+share/neverball/data/map-misc/timer-test_2.sol
 share/neverball/data/map-mym/assault.map
 share/neverball/data/map-mym/assault.sol
 share/neverball/data/map-mym/circuit1.map
@@ -769,354 +983,86 @@ share/neverball/data/map-slippi/17_bumpy.map
 share/neverball/data/map-slippi/17_bumpy.sol
 share/neverball/data/map-slippi/18_dip.map
 share/neverball/data/map-slippi/18_dip.sol
-share/neverball/data/mtrl/arrow-dark
-share/neverball/data/mtrl/arrow-dark.png
-share/neverball/data/mtrl/arrow-green-light
-share/neverball/data/mtrl/arrow-green-light.png
-share/neverball/data/mtrl/arrow-light
-share/neverball/data/mtrl/arrow-light.png
-share/neverball/data/mtrl/asteroid
-share/neverball/data/mtrl/asteroid.png
-share/neverball/data/mtrl/black
-share/neverball/data/mtrl/black.png
-share/neverball/data/mtrl/blue
-share/neverball/data/mtrl/blue-fade
-share/neverball/data/mtrl/blue-fade.png
-share/neverball/data/mtrl/blue-gas
-share/neverball/data/mtrl/blue-gas.png
-share/neverball/data/mtrl/blue-glossy
-share/neverball/data/mtrl/blue-glossy.png
-share/neverball/data/mtrl/blue-gradient
-share/neverball/data/mtrl/blue-gradient-bright
-share/neverball/data/mtrl/blue-gradient-bright.png
-share/neverball/data/mtrl/blue-gradient.png
-share/neverball/data/mtrl/blue-natural
-share/neverball/data/mtrl/blue-natural.png
-share/neverball/data/mtrl/blue-sea
-share/neverball/data/mtrl/blue-sea.png
-share/neverball/data/mtrl/blue-wave
-share/neverball/data/mtrl/blue-wave.png
-share/neverball/data/mtrl/blue.png
-share/neverball/data/mtrl/border-carpet
-share/neverball/data/mtrl/border-carpet.jpg
-share/neverball/data/mtrl/brass
-share/neverball/data/mtrl/brass-faceted
-share/neverball/data/mtrl/brass-faceted.jpg
-share/neverball/data/mtrl/brass.jpg
-share/neverball/data/mtrl/brick
-share/neverball/data/mtrl/brick-small
-share/neverball/data/mtrl/brick-small.png
-share/neverball/data/mtrl/brick.jpg
-share/neverball/data/mtrl/carpet
-share/neverball/data/mtrl/carpet.jpg
-share/neverball/data/mtrl/caution
-share/neverball/data/mtrl/caution.png
-share/neverball/data/mtrl/chalk
-share/neverball/data/mtrl/chalk.jpg
-share/neverball/data/mtrl/check-black-white
-share/neverball/data/mtrl/check-black-white.png
-share/neverball/data/mtrl/chrome
-share/neverball/data/mtrl/chrome-faceted
-share/neverball/data/mtrl/chrome-faceted.jpg
-share/neverball/data/mtrl/chrome.jpg
-share/neverball/data/mtrl/coin-blue
-share/neverball/data/mtrl/coin-blue.jpg
-share/neverball/data/mtrl/coin-brown-small
-share/neverball/data/mtrl/coin-brown-small.jpg
-share/neverball/data/mtrl/coin-green-check
-share/neverball/data/mtrl/coin-green-check.jpg
-share/neverball/data/mtrl/coin-green-check2
-share/neverball/data/mtrl/coin-green-check2.jpg
-share/neverball/data/mtrl/coin-green-dark
-share/neverball/data/mtrl/coin-green-dark.jpg
-share/neverball/data/mtrl/coin-green-light
-share/neverball/data/mtrl/coin-green-light.jpg
-share/neverball/data/mtrl/coin-green-small
-share/neverball/data/mtrl/coin-green-small.jpg
-share/neverball/data/mtrl/coin-mirror-check
-share/neverball/data/mtrl/coin-mirror-check.png
-share/neverball/data/mtrl/coin-orange
-share/neverball/data/mtrl/coin-orange-big
-share/neverball/data/mtrl/coin-orange-big.jpg
-share/neverball/data/mtrl/coin-orange.jpg
-share/neverball/data/mtrl/coin-pad-dot-blue
-share/neverball/data/mtrl/coin-pad-dot-blue.png
-share/neverball/data/mtrl/coin-pad-dot-red
-share/neverball/data/mtrl/coin-pad-dot-red.png
-share/neverball/data/mtrl/coin-pad-dot-yellow
-share/neverball/data/mtrl/coin-pad-dot-yellow.png
-share/neverball/data/mtrl/coin-pad-green-dark
-share/neverball/data/mtrl/coin-pad-green-dark.png
-share/neverball/data/mtrl/coin-purple
-share/neverball/data/mtrl/coin-purple-check
-share/neverball/data/mtrl/coin-purple-check.jpg
-share/neverball/data/mtrl/coin-purple.jpg
-share/neverball/data/mtrl/coin-red
-share/neverball/data/mtrl/coin-red.jpg
-share/neverball/data/mtrl/coin-shiny
-share/neverball/data/mtrl/coin-shiny.jpg
-share/neverball/data/mtrl/crate
-share/neverball/data/mtrl/crate-small
-share/neverball/data/mtrl/crate-small.jpg
-share/neverball/data/mtrl/crate.jpg
-share/neverball/data/mtrl/curtain-check-diagonal
-share/neverball/data/mtrl/curtain-check-diagonal.png
-share/neverball/data/mtrl/cyan
-share/neverball/data/mtrl/cyan.png
-share/neverball/data/mtrl/dot-grey
-share/neverball/data/mtrl/dot-grey.png
-share/neverball/data/mtrl/edge
-share/neverball/data/mtrl/edge-blue
-share/neverball/data/mtrl/edge-blue.jpg
-share/neverball/data/mtrl/edge-brown
-share/neverball/data/mtrl/edge-brown.jpg
-share/neverball/data/mtrl/edge-green
-share/neverball/data/mtrl/edge-green-check
-share/neverball/data/mtrl/edge-green-check.jpg
-share/neverball/data/mtrl/edge-green-check2
-share/neverball/data/mtrl/edge-green-check2.jpg
-share/neverball/data/mtrl/edge-green-dark
-share/neverball/data/mtrl/edge-green-dark.jpg
-share/neverball/data/mtrl/edge-green-light
-share/neverball/data/mtrl/edge-green-light.jpg
-share/neverball/data/mtrl/edge-green-offset
-share/neverball/data/mtrl/edge-green-offset.jpg
-share/neverball/data/mtrl/edge-green.jpg
-share/neverball/data/mtrl/edge-orange
-share/neverball/data/mtrl/edge-orange-big
-share/neverball/data/mtrl/edge-orange-big.jpg
-share/neverball/data/mtrl/edge-orange.jpg
-share/neverball/data/mtrl/edge-purple
-share/neverball/data/mtrl/edge-purple-check
-share/neverball/data/mtrl/edge-purple-check.jpg
-share/neverball/data/mtrl/edge-purple.jpg
-share/neverball/data/mtrl/edge-red
-share/neverball/data/mtrl/edge-red.jpg
-share/neverball/data/mtrl/edge-x
-share/neverball/data/mtrl/edge-x.png
-share/neverball/data/mtrl/edge-y
-share/neverball/data/mtrl/edge-y.png
-share/neverball/data/mtrl/edge.png
-share/neverball/data/mtrl/edge2
-share/neverball/data/mtrl/edge2-blue
-share/neverball/data/mtrl/edge2-blue.jpg
-share/neverball/data/mtrl/edge2-brown
-share/neverball/data/mtrl/edge2-brown.jpg
-share/neverball/data/mtrl/edge2-green
-share/neverball/data/mtrl/edge2-green-check
-share/neverball/data/mtrl/edge2-green-check.jpg
-share/neverball/data/mtrl/edge2-green-dark
-share/neverball/data/mtrl/edge2-green-dark.jpg
-share/neverball/data/mtrl/edge2-green-light
-share/neverball/data/mtrl/edge2-green-light.jpg
-share/neverball/data/mtrl/edge2-green-offset
-share/neverball/data/mtrl/edge2-green-offset.jpg
-share/neverball/data/mtrl/edge2-green-small
-share/neverball/data/mtrl/edge2-green-small.jpg
-share/neverball/data/mtrl/edge2-green.jpg
-share/neverball/data/mtrl/edge2-orange
-share/neverball/data/mtrl/edge2-orange-big
-share/neverball/data/mtrl/edge2-orange-big.jpg
-share/neverball/data/mtrl/edge2-orange.jpg
-share/neverball/data/mtrl/edge2-purple
-share/neverball/data/mtrl/edge2-purple-check
-share/neverball/data/mtrl/edge2-purple-check.jpg
-share/neverball/data/mtrl/edge2-purple.jpg
-share/neverball/data/mtrl/edge2-red
-share/neverball/data/mtrl/edge2-red.jpg
-share/neverball/data/mtrl/edge2-x
-share/neverball/data/mtrl/edge2-x.png
-share/neverball/data/mtrl/edge2-y
-share/neverball/data/mtrl/edge2-y.png
-share/neverball/data/mtrl/edge2.png
-share/neverball/data/mtrl/glass
-share/neverball/data/mtrl/glass-dark
-share/neverball/data/mtrl/glass-dark.png
-share/neverball/data/mtrl/glass.png
-share/neverball/data/mtrl/goal
-share/neverball/data/mtrl/goal-special
-share/neverball/data/mtrl/goal-special.png
-share/neverball/data/mtrl/goal.png
-share/neverball/data/mtrl/green
-share/neverball/data/mtrl/green-gas
-share/neverball/data/mtrl/green-gas.png
-share/neverball/data/mtrl/green.png
-share/neverball/data/mtrl/hole
-share/neverball/data/mtrl/hole.png
-share/neverball/data/mtrl/invisible
-share/neverball/data/mtrl/invisible.png
-share/neverball/data/mtrl/leaf
-share/neverball/data/mtrl/leaf.png
-share/neverball/data/mtrl/marble-brown-polished
-share/neverball/data/mtrl/marble-brown-polished.jpg
-share/neverball/data/mtrl/marble-grey-polished
-share/neverball/data/mtrl/marble-grey-polished.jpg
-share/neverball/data/mtrl/marble-purple
-share/neverball/data/mtrl/marble-purple-polished
-share/neverball/data/mtrl/marble-purple-polished.jpg
-share/neverball/data/mtrl/marble-purple.jpg
-share/neverball/data/mtrl/mirror
-share/neverball/data/mtrl/mirror-blue
-share/neverball/data/mtrl/mirror-blue.png
-share/neverball/data/mtrl/mirror-check
-share/neverball/data/mtrl/mirror-check-weak
-share/neverball/data/mtrl/mirror-check-weak.png
-share/neverball/data/mtrl/mirror-check.png
-share/neverball/data/mtrl/mirror-cyan
-share/neverball/data/mtrl/mirror-cyan.png
-share/neverball/data/mtrl/mirror-dark
-share/neverball/data/mtrl/mirror-dark.png
-share/neverball/data/mtrl/mirror-green
-share/neverball/data/mtrl/mirror-green.png
-share/neverball/data/mtrl/mirror-orange
-share/neverball/data/mtrl/mirror-orange.png
-share/neverball/data/mtrl/mirror-purple
-share/neverball/data/mtrl/mirror-purple.png
-share/neverball/data/mtrl/mirror-red
-share/neverball/data/mtrl/mirror-red.png
-share/neverball/data/mtrl/mirror-yellow
-share/neverball/data/mtrl/mirror-yellow.png
-share/neverball/data/mtrl/mirror.png
-share/neverball/data/mtrl/mtrl.shader
-share/neverball/data/mtrl/pink-cream
-share/neverball/data/mtrl/pink-cream.png
-share/neverball/data/mtrl/plank
-share/neverball/data/mtrl/plank-diagonal
-share/neverball/data/mtrl/plank-diagonal.jpg
-share/neverball/data/mtrl/plank-small
-share/neverball/data/mtrl/plank-small-light
-share/neverball/data/mtrl/plank-small-light.jpg
-share/neverball/data/mtrl/plank-small.jpg
-share/neverball/data/mtrl/plank.jpg
-share/neverball/data/mtrl/poof-blue
-share/neverball/data/mtrl/poof-blue.png
-share/neverball/data/mtrl/poof-green
-share/neverball/data/mtrl/poof-green.png
-share/neverball/data/mtrl/poof-red
-share/neverball/data/mtrl/poof-red.png
-share/neverball/data/mtrl/poof-yellow
-share/neverball/data/mtrl/poof-yellow.png
-share/neverball/data/mtrl/purple-pattern
-share/neverball/data/mtrl/purple-pattern.jpg
-share/neverball/data/mtrl/rail
-share/neverball/data/mtrl/rail.png
-share/neverball/data/mtrl/rainbow
-share/neverball/data/mtrl/rainbow.png
-share/neverball/data/mtrl/red
-share/neverball/data/mtrl/red-gas
-share/neverball/data/mtrl/red-gas.png
-share/neverball/data/mtrl/red-glass
-share/neverball/data/mtrl/red-glass.png
-share/neverball/data/mtrl/red-glossy
-share/neverball/data/mtrl/red-glossy.png
-share/neverball/data/mtrl/red-gradient
-share/neverball/data/mtrl/red-gradient-bright
-share/neverball/data/mtrl/red-gradient-bright.png
-share/neverball/data/mtrl/red-gradient.png
-share/neverball/data/mtrl/red-pattern
-share/neverball/data/mtrl/red-pattern.jpg
-share/neverball/data/mtrl/red.png
-share/neverball/data/mtrl/rotate180
-share/neverball/data/mtrl/rotate180.png
-share/neverball/data/mtrl/rotate90
-share/neverball/data/mtrl/rotate90.png
-share/neverball/data/mtrl/shadow-rock
-share/neverball/data/mtrl/shadow-rock.png
-share/neverball/data/mtrl/sign-end
-share/neverball/data/mtrl/sign-end.png
-share/neverball/data/mtrl/sign-no-smoking
-share/neverball/data/mtrl/sign-no-smoking.png
-share/neverball/data/mtrl/sign-warning
-share/neverball/data/mtrl/sign-warning.png
-share/neverball/data/mtrl/space-mapped
-share/neverball/data/mtrl/space-mapped.jpg
-share/neverball/data/mtrl/stripes
-share/neverball/data/mtrl/stripes.png
-share/neverball/data/mtrl/switch
-share/neverball/data/mtrl/switch.png
-share/neverball/data/mtrl/teleporter
-share/neverball/data/mtrl/teleporter.png
-share/neverball/data/mtrl/thwomp
-share/neverball/data/mtrl/thwomp.png
-share/neverball/data/mtrl/timer
-share/neverball/data/mtrl/timer.png
-share/neverball/data/mtrl/transparent
-share/neverball/data/mtrl/transparent-dark
-share/neverball/data/mtrl/transparent-dark.png
-share/neverball/data/mtrl/transparent.png
-share/neverball/data/mtrl/turf-blue
-share/neverball/data/mtrl/turf-blue.jpg
-share/neverball/data/mtrl/turf-brown
-share/neverball/data/mtrl/turf-brown-small
-share/neverball/data/mtrl/turf-brown-small.jpg
-share/neverball/data/mtrl/turf-brown.jpg
-share/neverball/data/mtrl/turf-disco
-share/neverball/data/mtrl/turf-disco.jpg
-share/neverball/data/mtrl/turf-green
-share/neverball/data/mtrl/turf-green-check
-share/neverball/data/mtrl/turf-green-check.jpg
-share/neverball/data/mtrl/turf-green-check2
-share/neverball/data/mtrl/turf-green-check2.jpg
-share/neverball/data/mtrl/turf-green-dark
-share/neverball/data/mtrl/turf-green-dark.jpg
-share/neverball/data/mtrl/turf-green-light
-share/neverball/data/mtrl/turf-green-light.jpg
-share/neverball/data/mtrl/turf-green-offset
-share/neverball/data/mtrl/turf-green-offset.jpg
-share/neverball/data/mtrl/turf-green-small
-share/neverball/data/mtrl/turf-green-small.jpg
-share/neverball/data/mtrl/turf-green.jpg
-share/neverball/data/mtrl/turf-grey
-share/neverball/data/mtrl/turf-grey-dark
-share/neverball/data/mtrl/turf-grey-dark.jpg
-share/neverball/data/mtrl/turf-grey.jpg
-share/neverball/data/mtrl/turf-orange
-share/neverball/data/mtrl/turf-orange-big
-share/neverball/data/mtrl/turf-orange-big.jpg
-share/neverball/data/mtrl/turf-orange.jpg
-share/neverball/data/mtrl/turf-purple
-share/neverball/data/mtrl/turf-purple-check
-share/neverball/data/mtrl/turf-purple-check.jpg
-share/neverball/data/mtrl/turf-purple.jpg
-share/neverball/data/mtrl/turf-red
-share/neverball/data/mtrl/turf-red.jpg
-share/neverball/data/mtrl/turf-shiny
-share/neverball/data/mtrl/turf-shiny-light
-share/neverball/data/mtrl/turf-shiny-light.jpg
-share/neverball/data/mtrl/turf-shiny.jpg
-share/neverball/data/mtrl/white
-share/neverball/data/mtrl/white.png
-share/neverball/data/mtrl/wood
-share/neverball/data/mtrl/wood-check
-share/neverball/data/mtrl/wood-check-glossy
-share/neverball/data/mtrl/wood-check-glossy.jpg
-share/neverball/data/mtrl/wood-check.jpg
-share/neverball/data/mtrl/wood-glossy
-share/neverball/data/mtrl/wood-glossy.jpg
-share/neverball/data/mtrl/wood-light
-share/neverball/data/mtrl/wood-light-glossy
-share/neverball/data/mtrl/wood-light-glossy.jpg
-share/neverball/data/mtrl/wood-light.jpg
-share/neverball/data/mtrl/wood.jpg
-share/neverball/data/mtrl/words
-share/neverball/data/mtrl/words-ca.png
-share/neverball/data/mtrl/words-de.png
-share/neverball/data/mtrl/words-fr.png
-share/neverball/data/mtrl/words-lv.png
-share/neverball/data/mtrl/words-nn.png
-share/neverball/data/mtrl/words.png
-share/neverball/data/mtrl/yellow
-share/neverball/data/mtrl/yellow-glossy
-share/neverball/data/mtrl/yellow-glossy.png
-share/neverball/data/mtrl/yellow-gradient
-share/neverball/data/mtrl/yellow-gradient-bright
-share/neverball/data/mtrl/yellow-gradient-bright.png
-share/neverball/data/mtrl/yellow-gradient.png
-share/neverball/data/mtrl/yellow-natural
-share/neverball/data/mtrl/yellow-natural.png
-share/neverball/data/mtrl/yellow.png
-share/neverball/data/mtrl/zip
-share/neverball/data/mtrl/zip.png
+share/neverball/data/map-tones/bigtube.map
+share/neverball/data/map-tones/bigtube.sol
+share/neverball/data/map-tones/blue.map
+share/neverball/data/map-tones/blue.sol
+share/neverball/data/map-tones/bumperoo.map
+share/neverball/data/map-tones/bumperoo.sol
+share/neverball/data/map-tones/canals.map
+share/neverball/data/map-tones/canals.sol
+share/neverball/data/map-tones/check.map
+share/neverball/data/map-tones/check.sol
+share/neverball/data/map-tones/city.map
+share/neverball/data/map-tones/city.sol
+share/neverball/data/map-tones/discs.map
+share/neverball/data/map-tones/discs.sol
+share/neverball/data/map-tones/easyian.map
+share/neverball/data/map-tones/easyian.sol
+share/neverball/data/map-tones/easyone.map
+share/neverball/data/map-tones/easyone.sol
+share/neverball/data/map-tones/hotwheels.map
+share/neverball/data/map-tones/hotwheels.sol
+share/neverball/data/map-tones/hurdles.map
+share/neverball/data/map-tones/hurdles.sol
+share/neverball/data/map-tones/leaps.map
+share/neverball/data/map-tones/leaps.sol
+share/neverball/data/map-tones/marble.map
+share/neverball/data/map-tones/marble.sol
+share/neverball/data/map-tones/runner.map
+share/neverball/data/map-tones/runner.sol
+share/neverball/data/map-tones/skiball.map
+share/neverball/data/map-tones/skiball.sol
+share/neverball/data/map-tones/swish.map
+share/neverball/data/map-tones/swish.sol
+share/neverball/data/map-tones/swoop.map
+share/neverball/data/map-tones/swoop.sol
+share/neverball/data/map-tones/tonesmaze.map
+share/neverball/data/map-tones/tonesmaze.sol
+share/neverball/data/map-tones/twisted.map
+share/neverball/data/map-tones/twisted.sol
+share/neverball/data/map-tones/waves.map
+share/neverball/data/map-tones/waves.sol
+share/neverball/data/map-vidski/4way.map
+share/neverball/data/map-vidski/4way.sol
+share/neverball/data/map-vidski/bankaround.map
+share/neverball/data/map-vidski/bankaround.sol
+share/neverball/data/map-vidski/bigpipe.map
+share/neverball/data/map-vidski/bigpipe.sol
+share/neverball/data/map-vidski/bounce.map
+share/neverball/data/map-vidski/bounce.sol
+share/neverball/data/map-vidski/clovertop.map
+share/neverball/data/map-vidski/clovertop.sol
+share/neverball/data/map-vidski/corkscrew.map
+share/neverball/data/map-vidski/corkscrew.sol
+share/neverball/data/map-vidski/corkscrewspin.map
+share/neverball/data/map-vidski/corkscrewspin.sol
+share/neverball/data/map-vidski/hoops.map
+share/neverball/data/map-vidski/hoops.sol
+share/neverball/data/map-vidski/hotwheels.map
+share/neverball/data/map-vidski/hotwheels.sol
+share/neverball/data/map-vidski/hourglass.map
+share/neverball/data/map-vidski/hourglass.sol
+share/neverball/data/map-vidski/loopdloop.map
+share/neverball/data/map-vidski/loopdloop.sol
+share/neverball/data/map-vidski/ovalzigzag.map
+share/neverball/data/map-vidski/ovalzigzag.sol
+share/neverball/data/map-vidski/skiball.map
+share/neverball/data/map-vidski/skiball.sol
+share/neverball/data/map-vidski/spinaround.map
+share/neverball/data/map-vidski/spinaround.sol
+share/neverball/data/map-vidski/spiralwall.map
+share/neverball/data/map-vidski/spiralwall.sol
+share/neverball/data/map-vidski/splitfinish.map
+share/neverball/data/map-vidski/splitfinish.sol
+share/neverball/data/map-vidski/squareramp.map
+share/neverball/data/map-vidski/squareramp.sol
+share/neverball/data/map-vidski/uturntunnel.map
+share/neverball/data/map-vidski/uturntunnel.sol
+share/neverball/data/map-vidski/voodoo.map
+share/neverball/data/map-vidski/voodoo.sol
+share/neverball/data/map-vidski/windmill.map
+share/neverball/data/map-vidski/windmill.sol
 share/neverball/data/obj/peg.obj
 share/neverball/data/obj/pin.obj
 share/neverball/data/obj/platform.obj
@@ -1146,9 +1092,6 @@ share/neverball/data/png/hills2.png
 share/neverball/data/png/hills3.png
 share/neverball/data/png/io.png
 share/neverball/data/png/jupiter.png
-share/neverball/data/png/lava.png
-share/neverball/data/png/lava_mask3.png
-share/neverball/data/png/lava_wave.png
 share/neverball/data/png/loops1.png
 share/neverball/data/png/loops2.png
 share/neverball/data/png/loops3.png
@@ -1162,10 +1105,13 @@ share/neverball/data/png/smoke1.png
 share/neverball/data/png/smoke2.png
 share/neverball/data/png/smoke3.png
 share/neverball/data/png/space.png
-share/neverball/data/png/squiggle.png
+share/neverball/data/png/stars1
 share/neverball/data/png/stars1.png
+share/neverball/data/png/stars2
 share/neverball/data/png/stars2.png
+share/neverball/data/png/stars3
 share/neverball/data/png/stars3.png
+share/neverball/data/png/stars4
 share/neverball/data/png/stars4.png
 share/neverball/data/png/sun.png
 share/neverball/data/png/v-cloud1.png
@@ -1173,6 +1119,11 @@ share/neverball/data/png/v-cloud2.png
 share/neverball/data/png/v-cloud3.png
 share/neverball/data/png/v-cloud4.png
 share/neverball/data/png/v-cloud5.png
+share/neverball/data/png/v-crack1.png
+share/neverball/data/png/v-crack2.png
+share/neverball/data/png/v-crack3.png
+share/neverball/data/png/v-crack4.png
+share/neverball/data/png/v-floor.png
 share/neverball/data/png/v-hill1.png
 share/neverball/data/png/v-hill2.png
 share/neverball/data/png/v-hill3.png
@@ -1180,6 +1131,14 @@ share/neverball/data/png/v-hill4.png
 share/neverball/data/png/v-mountains1.png
 share/neverball/data/png/v-mountains2.png
 share/neverball/data/png/v-mountains3.png
+share/neverball/data/png/v-stars1
+share/neverball/data/png/v-stars1.png
+share/neverball/data/png/v-stars2
+share/neverball/data/png/v-stars2.png
+share/neverball/data/png/v-stars3
+share/neverball/data/png/v-stars3.png
+share/neverball/data/png/v-stars4
+share/neverball/data/png/v-stars4.png
 share/neverball/data/png/v-sun.png
 share/neverball/data/png/volcano1.png
 share/neverball/data/png/volcano2.png
@@ -1193,6 +1152,7 @@ share/neverball/data/set-medium.txt
 share/neverball/data/set-misc.txt
 share/neverball/data/set-mym.txt
 share/neverball/data/set-mym2.txt
+share/neverball/data/set-tones.txt
 share/neverball/data/sets.txt
 share/neverball/data/shot-easy/bumper.jpg
 share/neverball/data/shot-easy/bumps.jpg
@@ -1221,14 +1181,18 @@ share/neverball/data/shot-easy/thwomp2.jpg
 share/neverball/data/shot-easy/wakka.jpg
 share/neverball/data/shot-fwp/adventure.png
 share/neverball/data/shot-fwp/atrium.png
+share/neverball/data/shot-fwp/buoys.png
 share/neverball/data/shot-fwp/cargo.png
 share/neverball/data/shot-fwp/confetti.png
 share/neverball/data/shot-fwp/discs.png
+share/neverball/data/shot-fwp/inferno.png
+share/neverball/data/shot-fwp/ladybirds.png
 share/neverball/data/shot-fwp/mountains.png
 share/neverball/data/shot-fwp/museum.png
 share/neverball/data/shot-fwp/oddities.png
 share/neverball/data/shot-fwp/rails.png
 share/neverball/data/shot-fwp/ramps.png
+share/neverball/data/shot-fwp/rings.png
 share/neverball/data/shot-fwp/slope.png
 share/neverball/data/shot-fwp/spacetime.png
 share/neverball/data/shot-fwp/swarm.png
@@ -1349,12 +1313,34 @@ share/neverball/data/shot-mym2/translation.jpg
 share/neverball/data/shot-mym2/updown.jpg
 share/neverball/data/shot-mym2/webs.jpg
 share/neverball/data/shot-putt/abc.jpg
+share/neverball/data/shot-putt/easyputt.jpg
 share/neverball/data/shot-putt/paxed.jpg
 share/neverball/data/shot-putt/paxed2.jpg
 share/neverball/data/shot-putt/paxed3.jpg
 share/neverball/data/shot-putt/putt.jpg
 share/neverball/data/shot-putt/slippi.jpg
 share/neverball/data/shot-putt/tricky-golf.jpg
+share/neverball/data/shot-putt/vidski.jpg
+share/neverball/data/shot-tones/bigtube.jpg
+share/neverball/data/shot-tones/blue.jpg
+share/neverball/data/shot-tones/bumperoo.jpg
+share/neverball/data/shot-tones/canals.jpg
+share/neverball/data/shot-tones/check.jpg
+share/neverball/data/shot-tones/city.jpg
+share/neverball/data/shot-tones/discs.jpg
+share/neverball/data/shot-tones/easyian.jpg
+share/neverball/data/shot-tones/easyone.jpg
+share/neverball/data/shot-tones/hotwheels.jpg
+share/neverball/data/shot-tones/hurdles.jpg
+share/neverball/data/shot-tones/leaps.jpg
+share/neverball/data/shot-tones/marble.jpg
+share/neverball/data/shot-tones/runner.jpg
+share/neverball/data/shot-tones/skiball.jpg
+share/neverball/data/shot-tones/swish.jpg
+share/neverball/data/shot-tones/swoop.jpg
+share/neverball/data/shot-tones/tonesmaze.jpg
+share/neverball/data/shot-tones/twisted.jpg
+share/neverball/data/shot-tones/waves.jpg
 share/neverball/data/snd/ball.ogg
 share/neverball/data/snd/bink.ogg
 share/neverball/data/snd/birdie.ogg
@@ -1366,6 +1352,14 @@ share/neverball/data/snd/coin.ogg
 share/neverball/data/snd/double.ogg
 share/neverball/data/snd/eagle.ogg
 share/neverball/data/snd/fall.ogg
+share/neverball/data/snd/gd/fall.ogg
+share/neverball/data/snd/gd/go.ogg
+share/neverball/data/snd/gd/over.ogg
+share/neverball/data/snd/gd/ready.ogg
+share/neverball/data/snd/gd/record.ogg
+share/neverball/data/snd/gd/select.ogg
+share/neverball/data/snd/gd/set.ogg
+share/neverball/data/snd/gd/time.ogg
 share/neverball/data/snd/go.ogg
 share/neverball/data/snd/goal.ogg
 share/neverball/data/snd/grow.ogg
@@ -1389,4 +1383,388 @@ share/neverball/data/snd/switch.ogg
 share/neverball/data/snd/tick.ogg
 share/neverball/data/snd/time.ogg
 share/neverball/data/snd/tock.ogg
+share/neverball/data/textures/mtrl.shader
+share/neverball/data/textures/mtrl/arrow-dark
+share/neverball/data/textures/mtrl/arrow-dark.png
+share/neverball/data/textures/mtrl/arrow-green-light
+share/neverball/data/textures/mtrl/arrow-green-light.png
+share/neverball/data/textures/mtrl/arrow-light
+share/neverball/data/textures/mtrl/arrow-light.png
+share/neverball/data/textures/mtrl/asteroid
+share/neverball/data/textures/mtrl/asteroid.png
+share/neverball/data/textures/mtrl/black
+share/neverball/data/textures/mtrl/black-decal
+share/neverball/data/textures/mtrl/black-decal.png
+share/neverball/data/textures/mtrl/black.png
+share/neverball/data/textures/mtrl/blue
+share/neverball/data/textures/mtrl/blue-fade
+share/neverball/data/textures/mtrl/blue-fade.png
+share/neverball/data/textures/mtrl/blue-gas
+share/neverball/data/textures/mtrl/blue-gas.png
+share/neverball/data/textures/mtrl/blue-glossy
+share/neverball/data/textures/mtrl/blue-glossy.png
+share/neverball/data/textures/mtrl/blue-gradient
+share/neverball/data/textures/mtrl/blue-gradient-bright
+share/neverball/data/textures/mtrl/blue-gradient-bright.png
+share/neverball/data/textures/mtrl/blue-gradient.png
+share/neverball/data/textures/mtrl/blue-natural
+share/neverball/data/textures/mtrl/blue-natural.png
+share/neverball/data/textures/mtrl/blue-sea
+share/neverball/data/textures/mtrl/blue-sea.png
+share/neverball/data/textures/mtrl/blue-wave
+share/neverball/data/textures/mtrl/blue-wave.png
+share/neverball/data/textures/mtrl/blue.png
+share/neverball/data/textures/mtrl/border-carpet
+share/neverball/data/textures/mtrl/border-carpet.jpg
+share/neverball/data/textures/mtrl/brass
+share/neverball/data/textures/mtrl/brass-faceted
+share/neverball/data/textures/mtrl/brass-faceted.jpg
+share/neverball/data/textures/mtrl/brass.jpg
+share/neverball/data/textures/mtrl/brick
+share/neverball/data/textures/mtrl/brick-small
+share/neverball/data/textures/mtrl/brick-small.png
+share/neverball/data/textures/mtrl/brick.jpg
+share/neverball/data/textures/mtrl/brown
+share/neverball/data/textures/mtrl/brown.png
+share/neverball/data/textures/mtrl/carpet
+share/neverball/data/textures/mtrl/carpet.jpg
+share/neverball/data/textures/mtrl/caution
+share/neverball/data/textures/mtrl/caution.png
+share/neverball/data/textures/mtrl/chalk
+share/neverball/data/textures/mtrl/chalk.jpg
+share/neverball/data/textures/mtrl/check-black-white
+share/neverball/data/textures/mtrl/check-black-white.png
+share/neverball/data/textures/mtrl/chrome
+share/neverball/data/textures/mtrl/chrome-faceted
+share/neverball/data/textures/mtrl/chrome-faceted.jpg
+share/neverball/data/textures/mtrl/chrome.jpg
+share/neverball/data/textures/mtrl/coin-blue
+share/neverball/data/textures/mtrl/coin-blue.jpg
+share/neverball/data/textures/mtrl/coin-brown-small
+share/neverball/data/textures/mtrl/coin-brown-small.jpg
+share/neverball/data/textures/mtrl/coin-green-check
+share/neverball/data/textures/mtrl/coin-green-check.jpg
+share/neverball/data/textures/mtrl/coin-green-check2
+share/neverball/data/textures/mtrl/coin-green-check2.jpg
+share/neverball/data/textures/mtrl/coin-green-dark
+share/neverball/data/textures/mtrl/coin-green-dark.jpg
+share/neverball/data/textures/mtrl/coin-green-light
+share/neverball/data/textures/mtrl/coin-green-light.jpg
+share/neverball/data/textures/mtrl/coin-green-small
+share/neverball/data/textures/mtrl/coin-green-small.jpg
+share/neverball/data/textures/mtrl/coin-mirror-check
+share/neverball/data/textures/mtrl/coin-mirror-check.png
+share/neverball/data/textures/mtrl/coin-orange
+share/neverball/data/textures/mtrl/coin-orange-big
+share/neverball/data/textures/mtrl/coin-orange-big.jpg
+share/neverball/data/textures/mtrl/coin-orange.jpg
+share/neverball/data/textures/mtrl/coin-pad-dot-blue
+share/neverball/data/textures/mtrl/coin-pad-dot-blue.png
+share/neverball/data/textures/mtrl/coin-pad-dot-red
+share/neverball/data/textures/mtrl/coin-pad-dot-red.png
+share/neverball/data/textures/mtrl/coin-pad-dot-yellow
+share/neverball/data/textures/mtrl/coin-pad-dot-yellow.png
+share/neverball/data/textures/mtrl/coin-pad-green-dark
+share/neverball/data/textures/mtrl/coin-pad-green-dark.png
+share/neverball/data/textures/mtrl/coin-pad-red-dark
+share/neverball/data/textures/mtrl/coin-pad-red-dark.png
+share/neverball/data/textures/mtrl/coin-purple
+share/neverball/data/textures/mtrl/coin-purple-check
+share/neverball/data/textures/mtrl/coin-purple-check.jpg
+share/neverball/data/textures/mtrl/coin-purple.jpg
+share/neverball/data/textures/mtrl/coin-red
+share/neverball/data/textures/mtrl/coin-red.jpg
+share/neverball/data/textures/mtrl/coin-shiny
+share/neverball/data/textures/mtrl/coin-shiny.jpg
+share/neverball/data/textures/mtrl/crate
+share/neverball/data/textures/mtrl/crate-small
+share/neverball/data/textures/mtrl/crate-small.jpg
+share/neverball/data/textures/mtrl/crate.jpg
+share/neverball/data/textures/mtrl/curtain-check-diagonal
+share/neverball/data/textures/mtrl/curtain-check-diagonal.png
+share/neverball/data/textures/mtrl/cyan
+share/neverball/data/textures/mtrl/cyan.png
+share/neverball/data/textures/mtrl/default
+share/neverball/data/textures/mtrl/dot-grey
+share/neverball/data/textures/mtrl/dot-grey.png
+share/neverball/data/textures/mtrl/edge
+share/neverball/data/textures/mtrl/edge-blue
+share/neverball/data/textures/mtrl/edge-blue.jpg
+share/neverball/data/textures/mtrl/edge-brown
+share/neverball/data/textures/mtrl/edge-brown.jpg
+share/neverball/data/textures/mtrl/edge-green
+share/neverball/data/textures/mtrl/edge-green-check
+share/neverball/data/textures/mtrl/edge-green-check.jpg
+share/neverball/data/textures/mtrl/edge-green-check2
+share/neverball/data/textures/mtrl/edge-green-check2.jpg
+share/neverball/data/textures/mtrl/edge-green-dark
+share/neverball/data/textures/mtrl/edge-green-dark.jpg
+share/neverball/data/textures/mtrl/edge-green-light
+share/neverball/data/textures/mtrl/edge-green-light.jpg
+share/neverball/data/textures/mtrl/edge-green-offset
+share/neverball/data/textures/mtrl/edge-green-offset.jpg
+share/neverball/data/textures/mtrl/edge-green.jpg
+share/neverball/data/textures/mtrl/edge-orange
+share/neverball/data/textures/mtrl/edge-orange-big
+share/neverball/data/textures/mtrl/edge-orange-big.jpg
+share/neverball/data/textures/mtrl/edge-orange.jpg
+share/neverball/data/textures/mtrl/edge-purple
+share/neverball/data/textures/mtrl/edge-purple-check
+share/neverball/data/textures/mtrl/edge-purple-check.jpg
+share/neverball/data/textures/mtrl/edge-purple.jpg
+share/neverball/data/textures/mtrl/edge-red
+share/neverball/data/textures/mtrl/edge-red.jpg
+share/neverball/data/textures/mtrl/edge-x
+share/neverball/data/textures/mtrl/edge-x.png
+share/neverball/data/textures/mtrl/edge-y
+share/neverball/data/textures/mtrl/edge-y.png
+share/neverball/data/textures/mtrl/edge.png
+share/neverball/data/textures/mtrl/edge2
+share/neverball/data/textures/mtrl/edge2-blue
+share/neverball/data/textures/mtrl/edge2-blue.jpg
+share/neverball/data/textures/mtrl/edge2-brown
+share/neverball/data/textures/mtrl/edge2-brown.jpg
+share/neverball/data/textures/mtrl/edge2-green
+share/neverball/data/textures/mtrl/edge2-green-check
+share/neverball/data/textures/mtrl/edge2-green-check.jpg
+share/neverball/data/textures/mtrl/edge2-green-dark
+share/neverball/data/textures/mtrl/edge2-green-dark.jpg
+share/neverball/data/textures/mtrl/edge2-green-light
+share/neverball/data/textures/mtrl/edge2-green-light.jpg
+share/neverball/data/textures/mtrl/edge2-green-offset
+share/neverball/data/textures/mtrl/edge2-green-offset.jpg
+share/neverball/data/textures/mtrl/edge2-green-small
+share/neverball/data/textures/mtrl/edge2-green-small.jpg
+share/neverball/data/textures/mtrl/edge2-green.jpg
+share/neverball/data/textures/mtrl/edge2-orange
+share/neverball/data/textures/mtrl/edge2-orange-big
+share/neverball/data/textures/mtrl/edge2-orange-big.jpg
+share/neverball/data/textures/mtrl/edge2-orange.jpg
+share/neverball/data/textures/mtrl/edge2-purple
+share/neverball/data/textures/mtrl/edge2-purple-check
+share/neverball/data/textures/mtrl/edge2-purple-check.jpg
+share/neverball/data/textures/mtrl/edge2-purple.jpg
+share/neverball/data/textures/mtrl/edge2-red
+share/neverball/data/textures/mtrl/edge2-red.jpg
+share/neverball/data/textures/mtrl/edge2-x
+share/neverball/data/textures/mtrl/edge2-x.png
+share/neverball/data/textures/mtrl/edge2-y
+share/neverball/data/textures/mtrl/edge2-y.png
+share/neverball/data/textures/mtrl/edge2.png
+share/neverball/data/textures/mtrl/fire
+share/neverball/data/textures/mtrl/fire.png
+share/neverball/data/textures/mtrl/glass
+share/neverball/data/textures/mtrl/glass-dark
+share/neverball/data/textures/mtrl/glass-dark.png
+share/neverball/data/textures/mtrl/glass.png
+share/neverball/data/textures/mtrl/goal
+share/neverball/data/textures/mtrl/goal-1024
+share/neverball/data/textures/mtrl/goal-1024.png
+share/neverball/data/textures/mtrl/goal-special
+share/neverball/data/textures/mtrl/goal-special.png
+share/neverball/data/textures/mtrl/goal.png
+share/neverball/data/textures/mtrl/green
+share/neverball/data/textures/mtrl/green-gas
+share/neverball/data/textures/mtrl/green-gas.png
+share/neverball/data/textures/mtrl/green.png
+share/neverball/data/textures/mtrl/hole
+share/neverball/data/textures/mtrl/hole.png
+share/neverball/data/textures/mtrl/invisible
+share/neverball/data/textures/mtrl/invisible.png
+share/neverball/data/textures/mtrl/leaf
+share/neverball/data/textures/mtrl/leaf.jpg
+share/neverball/data/textures/mtrl/marble-brown-polished
+share/neverball/data/textures/mtrl/marble-brown-polished.jpg
+share/neverball/data/textures/mtrl/marble-grey
+share/neverball/data/textures/mtrl/marble-grey-polished
+share/neverball/data/textures/mtrl/marble-grey-polished.jpg
+share/neverball/data/textures/mtrl/marble-grey.jpg
+share/neverball/data/textures/mtrl/marble-purple
+share/neverball/data/textures/mtrl/marble-purple-polished
+share/neverball/data/textures/mtrl/marble-purple-polished.jpg
+share/neverball/data/textures/mtrl/marble-purple.jpg
+share/neverball/data/textures/mtrl/mirror
+share/neverball/data/textures/mtrl/mirror-blue
+share/neverball/data/textures/mtrl/mirror-blue.png
+share/neverball/data/textures/mtrl/mirror-check
+share/neverball/data/textures/mtrl/mirror-check-weak
+share/neverball/data/textures/mtrl/mirror-check-weak.png
+share/neverball/data/textures/mtrl/mirror-check.png
+share/neverball/data/textures/mtrl/mirror-cyan
+share/neverball/data/textures/mtrl/mirror-cyan.png
+share/neverball/data/textures/mtrl/mirror-dark
+share/neverball/data/textures/mtrl/mirror-dark.png
+share/neverball/data/textures/mtrl/mirror-green
+share/neverball/data/textures/mtrl/mirror-green.png
+share/neverball/data/textures/mtrl/mirror-orange
+share/neverball/data/textures/mtrl/mirror-orange.png
+share/neverball/data/textures/mtrl/mirror-purple
+share/neverball/data/textures/mtrl/mirror-purple.png
+share/neverball/data/textures/mtrl/mirror-red
+share/neverball/data/textures/mtrl/mirror-red.png
+share/neverball/data/textures/mtrl/mirror-yellow
+share/neverball/data/textures/mtrl/mirror-yellow.png
+share/neverball/data/textures/mtrl/mirror.png
+share/neverball/data/textures/mtrl/orb-blue
+share/neverball/data/textures/mtrl/orb-blue.png
+share/neverball/data/textures/mtrl/pink-cream
+share/neverball/data/textures/mtrl/pink-cream.png
+share/neverball/data/textures/mtrl/plank
+share/neverball/data/textures/mtrl/plank-diagonal
+share/neverball/data/textures/mtrl/plank-diagonal.jpg
+share/neverball/data/textures/mtrl/plank-small
+share/neverball/data/textures/mtrl/plank-small-light
+share/neverball/data/textures/mtrl/plank-small-light.jpg
+share/neverball/data/textures/mtrl/plank-small.jpg
+share/neverball/data/textures/mtrl/plank.jpg
+share/neverball/data/textures/mtrl/polka-grey
+share/neverball/data/textures/mtrl/polka-grey.png
+share/neverball/data/textures/mtrl/poof-blue
+share/neverball/data/textures/mtrl/poof-blue.png
+share/neverball/data/textures/mtrl/poof-green
+share/neverball/data/textures/mtrl/poof-green.png
+share/neverball/data/textures/mtrl/poof-red
+share/neverball/data/textures/mtrl/poof-red.png
+share/neverball/data/textures/mtrl/poof-yellow
+share/neverball/data/textures/mtrl/poof-yellow.png
+share/neverball/data/textures/mtrl/purple-pattern
+share/neverball/data/textures/mtrl/purple-pattern.jpg
+share/neverball/data/textures/mtrl/rail
+share/neverball/data/textures/mtrl/rail.png
+share/neverball/data/textures/mtrl/rainbow
+share/neverball/data/textures/mtrl/rainbow.png
+share/neverball/data/textures/mtrl/red
+share/neverball/data/textures/mtrl/red-gas
+share/neverball/data/textures/mtrl/red-gas.png
+share/neverball/data/textures/mtrl/red-glass
+share/neverball/data/textures/mtrl/red-glass.png
+share/neverball/data/textures/mtrl/red-glossy
+share/neverball/data/textures/mtrl/red-glossy.png
+share/neverball/data/textures/mtrl/red-gradient
+share/neverball/data/textures/mtrl/red-gradient-bright
+share/neverball/data/textures/mtrl/red-gradient-bright.png
+share/neverball/data/textures/mtrl/red-gradient.png
+share/neverball/data/textures/mtrl/red-pattern
+share/neverball/data/textures/mtrl/red-pattern.jpg
+share/neverball/data/textures/mtrl/red.png
+share/neverball/data/textures/mtrl/rotate180
+share/neverball/data/textures/mtrl/rotate180.png
+share/neverball/data/textures/mtrl/rotate90
+share/neverball/data/textures/mtrl/rotate90.png
+share/neverball/data/textures/mtrl/shadow-rock
+share/neverball/data/textures/mtrl/shadow-rock.png
+share/neverball/data/textures/mtrl/sign-end
+share/neverball/data/textures/mtrl/sign-end.png
+share/neverball/data/textures/mtrl/sign-no-smoking
+share/neverball/data/textures/mtrl/sign-no-smoking.png
+share/neverball/data/textures/mtrl/sign-warning
+share/neverball/data/textures/mtrl/sign-warning.png
+share/neverball/data/textures/mtrl/space-mapped
+share/neverball/data/textures/mtrl/space-mapped.jpg
+share/neverball/data/textures/mtrl/stripes
+share/neverball/data/textures/mtrl/stripes.png
+share/neverball/data/textures/mtrl/switch
+share/neverball/data/textures/mtrl/switch.png
+share/neverball/data/textures/mtrl/teleporter
+share/neverball/data/textures/mtrl/teleporter.png
+share/neverball/data/textures/mtrl/thwomp
+share/neverball/data/textures/mtrl/thwomp-fear
+share/neverball/data/textures/mtrl/thwomp-fear.png
+share/neverball/data/textures/mtrl/thwomp-grim
+share/neverball/data/textures/mtrl/thwomp-grim.png
+share/neverball/data/textures/mtrl/thwomp-gufaw
+share/neverball/data/textures/mtrl/thwomp-gufaw.png
+share/neverball/data/textures/mtrl/thwomp-incred
+share/neverball/data/textures/mtrl/thwomp-incred.png
+share/neverball/data/textures/mtrl/thwomp-mocking
+share/neverball/data/textures/mtrl/thwomp-mocking.png
+share/neverball/data/textures/mtrl/thwomp-sullen
+share/neverball/data/textures/mtrl/thwomp-sullen.png
+share/neverball/data/textures/mtrl/thwomp-whistler
+share/neverball/data/textures/mtrl/thwomp-whistler.png
+share/neverball/data/textures/mtrl/thwomp.png
+share/neverball/data/textures/mtrl/timer
+share/neverball/data/textures/mtrl/timer.png
+share/neverball/data/textures/mtrl/transparent
+share/neverball/data/textures/mtrl/transparent-dark
+share/neverball/data/textures/mtrl/transparent-dark.png
+share/neverball/data/textures/mtrl/transparent.png
+share/neverball/data/textures/mtrl/turf-blue
+share/neverball/data/textures/mtrl/turf-blue.jpg
+share/neverball/data/textures/mtrl/turf-brown
+share/neverball/data/textures/mtrl/turf-brown-small
+share/neverball/data/textures/mtrl/turf-brown-small.jpg
+share/neverball/data/textures/mtrl/turf-brown.jpg
+share/neverball/data/textures/mtrl/turf-disco
+share/neverball/data/textures/mtrl/turf-disco.jpg
+share/neverball/data/textures/mtrl/turf-green
+share/neverball/data/textures/mtrl/turf-green-check
+share/neverball/data/textures/mtrl/turf-green-check.jpg
+share/neverball/data/textures/mtrl/turf-green-check2
+share/neverball/data/textures/mtrl/turf-green-check2.jpg
+share/neverball/data/textures/mtrl/turf-green-dark
+share/neverball/data/textures/mtrl/turf-green-dark.jpg
+share/neverball/data/textures/mtrl/turf-green-light
+share/neverball/data/textures/mtrl/turf-green-light.jpg
+share/neverball/data/textures/mtrl/turf-green-offset
+share/neverball/data/textures/mtrl/turf-green-offset.jpg
+share/neverball/data/textures/mtrl/turf-green-small
+share/neverball/data/textures/mtrl/turf-green-small.jpg
+share/neverball/data/textures/mtrl/turf-green.jpg
+share/neverball/data/textures/mtrl/turf-grey
+share/neverball/data/textures/mtrl/turf-grey-dark
+share/neverball/data/textures/mtrl/turf-grey-dark.jpg
+share/neverball/data/textures/mtrl/turf-grey.jpg
+share/neverball/data/textures/mtrl/turf-orange
+share/neverball/data/textures/mtrl/turf-orange-big
+share/neverball/data/textures/mtrl/turf-orange-big.jpg
+share/neverball/data/textures/mtrl/turf-orange.jpg
+share/neverball/data/textures/mtrl/turf-purple
+share/neverball/data/textures/mtrl/turf-purple-check
+share/neverball/data/textures/mtrl/turf-purple-check.jpg
+share/neverball/data/textures/mtrl/turf-purple.jpg
+share/neverball/data/textures/mtrl/turf-red
+share/neverball/data/textures/mtrl/turf-red.jpg
+share/neverball/data/textures/mtrl/turf-shiny
+share/neverball/data/textures/mtrl/turf-shiny-light
+share/neverball/data/textures/mtrl/turf-shiny-light.jpg
+share/neverball/data/textures/mtrl/turf-shiny.jpg
+share/neverball/data/textures/mtrl/white
+share/neverball/data/textures/mtrl/white.png
+share/neverball/data/textures/mtrl/wood
+share/neverball/data/textures/mtrl/wood-check
+share/neverball/data/textures/mtrl/wood-check-glossy
+share/neverball/data/textures/mtrl/wood-check-glossy.jpg
+share/neverball/data/textures/mtrl/wood-check.jpg
+share/neverball/data/textures/mtrl/wood-glossy
+share/neverball/data/textures/mtrl/wood-glossy.jpg
+share/neverball/data/textures/mtrl/wood-light
+share/neverball/data/textures/mtrl/wood-light-glossy
+share/neverball/data/textures/mtrl/wood-light-glossy.jpg
+share/neverball/data/textures/mtrl/wood-light.jpg
+share/neverball/data/textures/mtrl/wood.jpg
+share/neverball/data/textures/mtrl/words
+share/neverball/data/textures/mtrl/words-ca.png
+share/neverball/data/textures/mtrl/words-de.png
+share/neverball/data/textures/mtrl/words-fr.png
+share/neverball/data/textures/mtrl/words-gd.png
+share/neverball/data/textures/mtrl/words-lv.png
+share/neverball/data/textures/mtrl/words-nn.png
+share/neverball/data/textures/mtrl/words.png
+share/neverball/data/textures/mtrl/yellow
+share/neverball/data/textures/mtrl/yellow-decal
+share/neverball/data/textures/mtrl/yellow-decal.png
+share/neverball/data/textures/mtrl/yellow-glossy
+share/neverball/data/textures/mtrl/yellow-glossy.png
+share/neverball/data/textures/mtrl/yellow-gradient
+share/neverball/data/textures/mtrl/yellow-gradient-bright
+share/neverball/data/textures/mtrl/yellow-gradient-bright.png
+share/neverball/data/textures/mtrl/yellow-gradient.png
+share/neverball/data/textures/mtrl/yellow-natural
+share/neverball/data/textures/mtrl/yellow-natural.png
+share/neverball/data/textures/mtrl/yellow.png
+share/neverball/data/textures/mtrl/zip
+share/neverball/data/textures/mtrl/zip.png
+share/neverball/data/textures/shaderlist.txt
 share/neverball/data/ttf/DejaVuSans-Bold.ttf
+share/neverball/data/ttf/wqy-microhei.ttc
diff --git a/games/neverball/distinfo b/games/neverball/distinfo
index 439991a18c8..226c7206dc2 100644
--- a/games/neverball/distinfo
+++ b/games/neverball/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2013/02/26 11:16:19 joerg Exp $
+$NetBSD: distinfo,v 1.9 2015/02/09 09:02:12 snj Exp $
 
-SHA1 (neverball-1.5.4.tar.gz) = 619c227e1958bd60738f12dbbde9b30c91dd79a7
-RMD160 (neverball-1.5.4.tar.gz) = f546b5e6c12df1a125976a7e23fa55146480241d
-Size (neverball-1.5.4.tar.gz) = 26767623 bytes
-SHA1 (patch-ab) = 15b6864e06d363698c0855af42d0d4f7b010886f
-SHA1 (patch-share_base__image.c) = c7dd953bec0a8b44e18153c17d66b2cc7169b6d0
+SHA1 (neverball-1.6.0.tar.gz) = 3faebf15fea9361358a416176b9689f966c456ea
+RMD160 (neverball-1.6.0.tar.gz) = 3489fcec1efe38c0faac62fe08573117a0f63c9f
+Size (neverball-1.6.0.tar.gz) = 37772911 bytes
+SHA1 (patch-ab) = 3cca20f42390d22c73c03171f725fe562f73cb0d
+SHA1 (patch-share_solid__draw.h) = 85b3271eb10056f19d79688fca305464063752ba
diff --git a/games/neverball/patches/patch-ab b/games/neverball/patches/patch-ab
index 07eb3cc4a86..f2d819215fa 100644
--- a/games/neverball/patches/patch-ab
+++ b/games/neverball/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2009/12/03 06:33:46 snj Exp $
+$NetBSD: patch-ab,v 1.2 2015/02/09 09:02:12 snj Exp $
 
---- Makefile.orig	2009-09-20 03:06:00.000000000 -0700
-+++ Makefile	2009-12-02 21:39:12.000000000 -0800
-@@ -27,7 +27,7 @@ endif
+--- Makefile.orig	2014-05-21 06:21:43.000000000 -0700
++++ Makefile	2015-01-07 22:18:15.000000000 -0800
+@@ -21,7 +21,7 @@ endif
  # Paths (packagers might want to set DATADIR and LOCALEDIR)
  
  USERDIR   := .neverball
@@ -10,13 +10,13 @@ $NetBSD: patch-ab,v 1.1 2009/12/03 06:33:46 snj Exp $
 +DATADIR   := ${PREFIX}/share/neverball/data
  LOCALEDIR := ./locale
  
- ifdef MINGW
-@@ -309,7 +309,7 @@ DESKTOPS := $(basename $(wildcard dist/*
+ ifeq ($(PLATFORM),mingw)
+@@ -409,7 +409,7 @@ WINDRES ?= windres
  
  #------------------------------------------------------------------------------
  
 -all : $(BALL_TARG) $(PUTT_TARG) $(MAPC_TARG) sols locales desktops
 +all : $(BALL_TARG) $(PUTT_TARG) $(MAPC_TARG) sols locales
  
- $(BALL_TARG) : $(BALL_OBJS)
- 	$(CC) $(ALL_CFLAGS) -o $(BALL_TARG) $(BALL_OBJS) $(LDFLAGS) $(ALL_LIBS)
+ ifeq ($(ENABLE_HMD),libovr)
+ LINK := $(CXX) $(ALL_CXXFLAGS)
diff --git a/games/neverball/patches/patch-share_base__image.c b/games/neverball/patches/patch-share_base__image.c
deleted file mode 100644
index 023e096cd33..00000000000
--- a/games/neverball/patches/patch-share_base__image.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-share_base__image.c,v 1.1 2013/02/26 11:16:19 joerg Exp $
-
---- share/base_image.c.orig	2013-02-25 20:30:28.000000000 +0000
-+++ share/base_image.c
-@@ -94,7 +94,7 @@ static void *image_load_png(const char *
-         default: longjmp(png_jmpbuf(readp), -1);
-         }
- 
--        if (!(bytep = png_malloc(readp, h * png_sizeof(png_bytep))))
-+        if (!(bytep = png_malloc(readp, h * sizeof(*bytep))))
-             longjmp(png_jmpbuf(readp), -1);
- 
-         /* Allocate the final pixel buffer and read pixels there. */
diff --git a/games/neverball/patches/patch-share_solid__draw.h b/games/neverball/patches/patch-share_solid__draw.h
new file mode 100644
index 00000000000..e422ec8d94d
--- /dev/null
+++ b/games/neverball/patches/patch-share_solid__draw.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-share_solid__draw.h,v 1.1 2015/02/09 09:02:12 snj Exp $
+
+NetBSD's limits.h defines a PASS_MAX.
+
+--- share/solid_draw.h.orig	2015-01-07 23:09:04.000000000 -0800
++++ share/solid_draw.h	2015-01-07 23:09:52.000000000 -0800
+@@ -28,6 +28,8 @@
+ 
+ /* Named rendering pass indices. */
+ 
++#undef PASS_MAX
++
+ enum
+ {
+     PASS_OPAQUE = 0,