vcs.maemo.org Git - neverball/commit

author	parasti <parasti@78b8d119-cf0a-0410-b17c-f493084dd1d7>
	Wed, 6 Jul 2011 17:45:55 +0000 (17:45 +0000)
committer	parasti <parasti@78b8d119-cf0a-0410-b17c-f493084dd1d7>
	Wed, 6 Jul 2011 17:45:55 +0000 (17:45 +0000)
commit	9151af610f5c6a1ba57563e6c0d66e141648a5b8
tree	6a0a5c609fc3a1826e6055c59725237266199423	tree \| snapshot
parent	9371891953d968ef558ac2dcfa056c698a1e5167	commit \| diff

Merge branch 'gles'

Conflicts:
data/mtrl/leaf
share/glext.h

git-svn-id: https://s.snth.net/svn/neverball/trunk@3607 78b8d119-cf0a-0410-b17c-f493084dd1d7

305 files changed:

Makefile		diff \| blob \| history
ball/game_client.c		diff \| blob \| history
ball/game_draw.c		diff \| blob \| history
ball/game_draw.h		diff \| blob \| history
ball/hud.c		diff \| blob \| history
ball/main.c		diff \| blob \| history
ball/set.c		diff \| blob \| history
ball/st_ball.c		diff \| blob \| history
ball/st_conf.c		diff \| blob \| history
ball/st_name.c		diff \| blob \| history
ball/st_start.c		diff \| blob \| history
ball/util.c		diff \| blob \| history
data/back/alien.png		diff \| blob \| history
data/back/land.png		diff \| blob \| history
data/back/ocean.png		diff \| blob \| history
data/back/space.png		diff \| blob \| history
data/back/volcano.png		diff \| blob \| history
data/ball/atom/atom-glow		diff \| blob \| history
data/ball/atom/electron		diff \| blob \| history
data/ball/atom/neutron		diff \| blob \| history
data/ball/atom/proton		diff \| blob \| history
data/ball/basic-ball/basic-ball		diff \| blob \| history
data/ball/blinky/blinky		diff \| blob \| history
data/ball/earth/earth-atmos		diff \| blob \| history
data/ball/earth/earth-cloud		diff \| blob \| history
data/ball/earth/earth-color		diff \| blob \| history
data/ball/earth/earth-ocean		diff \| blob \| history
data/ball/eyeball/eyeball		diff \| blob \| history
data/ball/lava/lava-glow		diff \| blob \| history
data/ball/lava/lava-inner		diff \| blob \| history
data/ball/lava/lava-solid		diff \| blob \| history
data/ball/magic-eightball/magic-eightball		diff \| blob \| history
data/ball/reactor/reactor-surface		diff \| blob \| history
data/ball/reactor/sparkle1		diff \| blob \| history
data/ball/saturn/saturn-ring		diff \| blob \| history
data/ball/saturn/saturn-surface		diff \| blob \| history
data/ball/snowglobe/snowglobe-atlas		diff \| blob \| history
data/ball/snowglobe/snowglobe-star		diff \| blob \| history
data/ball/snowglobe/snowglobe-surface		diff \| blob \| history
data/ball/sootsprite/sootsprite-body		diff \| blob \| history
data/ball/sootsprite/sootsprite-eye		diff \| blob \| history
data/geom/back/back.map	[new file with mode: 0644]	blob
data/geom/back/back.obj	[new file with mode: 0644]	blob
data/geom/beam/beam	[new file with mode: 0644]	blob
data/geom/beam/beam.map	[new file with mode: 0644]	blob
data/geom/beam/beam.mtl	[new file with mode: 0644]	blob
data/geom/beam/beam.obj	[new file with mode: 0644]	blob
data/geom/beam/beam.png	[new file with mode: 0644]	blob
data/geom/beam/beam.wings	[new file with mode: 0644]	blob
data/geom/flag/flag.map	[new file with mode: 0644]	blob
data/geom/flag/flag.mtl	[new file with mode: 0644]	blob
data/geom/flag/flag.obj	[new file with mode: 0644]	blob
data/geom/flag/flag.wings	[new file with mode: 0644]	blob
data/geom/goal/goal	[new file with mode: 0644]	blob
data/geom/goal/goal.map	[new file with mode: 0644]	blob
data/geom/goal/goal.mtl	[new file with mode: 0644]	blob
data/geom/goal/goal.obj	[new file with mode: 0644]	blob
data/geom/goal/goal.png	[new file with mode: 0644]	blob
data/geom/goal/goal.wings	[new file with mode: 0644]	blob
data/geom/jump/jump	[new file with mode: 0644]	blob
data/geom/jump/jump.map	[new file with mode: 0644]	blob
data/geom/jump/jump.mtl	[new file with mode: 0644]	blob
data/geom/jump/jump.obj	[new file with mode: 0644]	blob
data/geom/jump/jump.png	[new file with mode: 0644]	blob
data/geom/jump/jump.wings	[new file with mode: 0644]	blob
data/geom/mark/mark.map	[new file with mode: 0644]	blob
data/geom/mark/mark.mtl	[new file with mode: 0644]	blob
data/geom/mark/mark.obj	[new file with mode: 0644]	blob
data/geom/mark/mark.wings	[new file with mode: 0644]	blob
data/geom/vect/vect	[new file with mode: 0644]	blob
data/geom/vect/vect.map	[new file with mode: 0644]	blob
data/geom/vect/vect.mtl	[new file with mode: 0644]	blob
data/geom/vect/vect.obj	[new file with mode: 0644]	blob
data/geom/vect/vect.png	[new file with mode: 0644]	blob
data/geom/vect/vect.wings	[new file with mode: 0644]	blob
data/item/coin/coin		diff \| blob \| history
data/item/coin/coin-glow	[new file with mode: 0644]	blob
data/item/coin/coin-glow.png	[new file with mode: 0644]	blob
data/item/grow/grow		diff \| blob \| history
data/item/shrink/shrink		diff \| blob \| history
data/map-back/alien.map		diff \| blob \| history
data/mtrl/arrow-dark		diff \| blob \| history
data/mtrl/arrow-green-light		diff \| blob \| history
data/mtrl/arrow-light		diff \| blob \| history
data/mtrl/asteroid		diff \| blob \| history
data/mtrl/black		diff \| blob \| history
data/mtrl/black-decal		diff \| blob \| history
data/mtrl/blue		diff \| blob \| history
data/mtrl/blue-fade		diff \| blob \| history
data/mtrl/blue-gas		diff \| blob \| history
data/mtrl/blue-glossy		diff \| blob \| history
data/mtrl/blue-gradient		diff \| blob \| history
data/mtrl/blue-gradient-bright		diff \| blob \| history
data/mtrl/blue-natural		diff \| blob \| history
data/mtrl/blue-sea		diff \| blob \| history
data/mtrl/blue-sea.png		diff \| blob \| history
data/mtrl/blue-wave		diff \| blob \| history
data/mtrl/border-carpet		diff \| blob \| history
data/mtrl/brass		diff \| blob \| history
data/mtrl/brass-faceted		diff \| blob \| history
data/mtrl/brick		diff \| blob \| history
data/mtrl/brick-small		diff \| blob \| history
data/mtrl/carpet		diff \| blob \| history
data/mtrl/caution		diff \| blob \| history
data/mtrl/chalk		diff \| blob \| history
data/mtrl/check-black-white		diff \| blob \| history
data/mtrl/chrome		diff \| blob \| history
data/mtrl/chrome-faceted		diff \| blob \| history
data/mtrl/coin-blue		diff \| blob \| history
data/mtrl/coin-brown-small		diff \| blob \| history
data/mtrl/coin-green-check		diff \| blob \| history
data/mtrl/coin-green-check2		diff \| blob \| history
data/mtrl/coin-green-dark		diff \| blob \| history
data/mtrl/coin-green-light		diff \| blob \| history
data/mtrl/coin-green-small		diff \| blob \| history
data/mtrl/coin-mirror-check		diff \| blob \| history
data/mtrl/coin-orange		diff \| blob \| history
data/mtrl/coin-orange-big		diff \| blob \| history
data/mtrl/coin-pad-dot-blue		diff \| blob \| history
data/mtrl/coin-pad-dot-red		diff \| blob \| history
data/mtrl/coin-pad-dot-yellow		diff \| blob \| history
data/mtrl/coin-pad-green-dark		diff \| blob \| history
data/mtrl/coin-pad-red-dark		diff \| blob \| history
data/mtrl/coin-purple		diff \| blob \| history
data/mtrl/coin-purple-check		diff \| blob \| history
data/mtrl/coin-red		diff \| blob \| history
data/mtrl/coin-shiny		diff \| blob \| history
data/mtrl/crate		diff \| blob \| history
data/mtrl/crate-small		diff \| blob \| history
data/mtrl/curtain-check-diagonal		diff \| blob \| history
data/mtrl/cyan		diff \| blob \| history
data/mtrl/default	[new file with mode: 0644]	blob
data/mtrl/dot-grey		diff \| blob \| history
data/mtrl/edge		diff \| blob \| history
data/mtrl/edge-blue		diff \| blob \| history
data/mtrl/edge-brown		diff \| blob \| history
data/mtrl/edge-green		diff \| blob \| history
data/mtrl/edge-green-check		diff \| blob \| history
data/mtrl/edge-green-check2		diff \| blob \| history
data/mtrl/edge-green-dark		diff \| blob \| history
data/mtrl/edge-green-light		diff \| blob \| history
data/mtrl/edge-green-offset		diff \| blob \| history
data/mtrl/edge-orange		diff \| blob \| history
data/mtrl/edge-orange-big		diff \| blob \| history
data/mtrl/edge-purple		diff \| blob \| history
data/mtrl/edge-purple-check		diff \| blob \| history
data/mtrl/edge-red		diff \| blob \| history
data/mtrl/edge-x		diff \| blob \| history
data/mtrl/edge-y		diff \| blob \| history
data/mtrl/edge2		diff \| blob \| history
data/mtrl/edge2-blue		diff \| blob \| history
data/mtrl/edge2-brown		diff \| blob \| history
data/mtrl/edge2-green		diff \| blob \| history
data/mtrl/edge2-green-check		diff \| blob \| history
data/mtrl/edge2-green-dark		diff \| blob \| history
data/mtrl/edge2-green-light		diff \| blob \| history
data/mtrl/edge2-green-offset		diff \| blob \| history
data/mtrl/edge2-green-small		diff \| blob \| history
data/mtrl/edge2-orange		diff \| blob \| history
data/mtrl/edge2-orange-big		diff \| blob \| history
data/mtrl/edge2-purple		diff \| blob \| history
data/mtrl/edge2-purple-check		diff \| blob \| history
data/mtrl/edge2-red		diff \| blob \| history
data/mtrl/edge2-x		diff \| blob \| history
data/mtrl/edge2-y		diff \| blob \| history
data/mtrl/glass		diff \| blob \| history
data/mtrl/glass-dark		diff \| blob \| history
data/mtrl/goal		diff \| blob \| history
data/mtrl/goal-1024		diff \| blob \| history
data/mtrl/goal-special		diff \| blob \| history
data/mtrl/green		diff \| blob \| history
data/mtrl/green-gas		diff \| blob \| history
data/mtrl/hole		diff \| blob \| history
data/mtrl/invisible		diff \| blob \| history
data/mtrl/leaf		diff \| blob \| history
data/mtrl/marble-brown-polished		diff \| blob \| history
data/mtrl/marble-grey		diff \| blob \| history
data/mtrl/marble-grey-polished		diff \| blob \| history
data/mtrl/marble-purple		diff \| blob \| history
data/mtrl/marble-purple-polished		diff \| blob \| history
data/mtrl/mirror		diff \| blob \| history
data/mtrl/mirror-blue		diff \| blob \| history
data/mtrl/mirror-check		diff \| blob \| history
data/mtrl/mirror-check-weak		diff \| blob \| history
data/mtrl/mirror-cyan		diff \| blob \| history
data/mtrl/mirror-dark		diff \| blob \| history
data/mtrl/mirror-green		diff \| blob \| history
data/mtrl/mirror-orange		diff \| blob \| history
data/mtrl/mirror-purple		diff \| blob \| history
data/mtrl/mirror-red		diff \| blob \| history
data/mtrl/mirror-yellow		diff \| blob \| history
data/mtrl/orb-blue		diff \| blob \| history
data/mtrl/pink-cream		diff \| blob \| history
data/mtrl/plank		diff \| blob \| history
data/mtrl/plank-diagonal		diff \| blob \| history
data/mtrl/plank-small		diff \| blob \| history
data/mtrl/plank-small-light		diff \| blob \| history
data/mtrl/poof-blue		diff \| blob \| history
data/mtrl/poof-green		diff \| blob \| history
data/mtrl/poof-red		diff \| blob \| history
data/mtrl/poof-yellow		diff \| blob \| history
data/mtrl/purple-pattern		diff \| blob \| history
data/mtrl/rail		diff \| blob \| history
data/mtrl/rainbow		diff \| blob \| history
data/mtrl/red		diff \| blob \| history
data/mtrl/red-gas		diff \| blob \| history
data/mtrl/red-glass		diff \| blob \| history
data/mtrl/red-glossy		diff \| blob \| history
data/mtrl/red-gradient		diff \| blob \| history
data/mtrl/red-gradient-bright		diff \| blob \| history
data/mtrl/red-pattern		diff \| blob \| history
data/mtrl/rotate180		diff \| blob \| history
data/mtrl/rotate90		diff \| blob \| history
data/mtrl/shadow-rock		diff \| blob \| history
data/mtrl/sign-end		diff \| blob \| history
data/mtrl/sign-no-smoking		diff \| blob \| history
data/mtrl/sign-warning		diff \| blob \| history
data/mtrl/space-mapped		diff \| blob \| history
data/mtrl/stripes		diff \| blob \| history
data/mtrl/switch		diff \| blob \| history
data/mtrl/teleporter		diff \| blob \| history
data/mtrl/thwomp		diff \| blob \| history
data/mtrl/thwomp-fear		diff \| blob \| history
data/mtrl/thwomp-grim		diff \| blob \| history
data/mtrl/thwomp-gufaw		diff \| blob \| history
data/mtrl/thwomp-incred		diff \| blob \| history
data/mtrl/thwomp-mocking		diff \| blob \| history
data/mtrl/thwomp-sullen		diff \| blob \| history
data/mtrl/thwomp-whistler		diff \| blob \| history
data/mtrl/timer		diff \| blob \| history
data/mtrl/transparent		diff \| blob \| history
data/mtrl/transparent-dark		diff \| blob \| history
data/mtrl/turf-blue		diff \| blob \| history
data/mtrl/turf-brown		diff \| blob \| history
data/mtrl/turf-brown-small		diff \| blob \| history
data/mtrl/turf-disco		diff \| blob \| history
data/mtrl/turf-green		diff \| blob \| history
data/mtrl/turf-green-check		diff \| blob \| history
data/mtrl/turf-green-check2		diff \| blob \| history
data/mtrl/turf-green-dark		diff \| blob \| history
data/mtrl/turf-green-light		diff \| blob \| history
data/mtrl/turf-green-offset		diff \| blob \| history
data/mtrl/turf-green-small		diff \| blob \| history
data/mtrl/turf-grey		diff \| blob \| history
data/mtrl/turf-grey-dark		diff \| blob \| history
data/mtrl/turf-orange		diff \| blob \| history
data/mtrl/turf-orange-big		diff \| blob \| history
data/mtrl/turf-purple		diff \| blob \| history
data/mtrl/turf-purple-check		diff \| blob \| history
data/mtrl/turf-red		diff \| blob \| history
data/mtrl/turf-shiny		diff \| blob \| history
data/mtrl/turf-shiny-light		diff \| blob \| history
data/mtrl/white		diff \| blob \| history
data/mtrl/wood		diff \| blob \| history
data/mtrl/wood-check		diff \| blob \| history
data/mtrl/wood-check-glossy		diff \| blob \| history
data/mtrl/wood-glossy		diff \| blob \| history
data/mtrl/wood-light		diff \| blob \| history
data/mtrl/wood-light-glossy		diff \| blob \| history
data/mtrl/words		diff \| blob \| history
data/mtrl/yellow		diff \| blob \| history
data/mtrl/yellow-decal		diff \| blob \| history
data/mtrl/yellow-glossy		diff \| blob \| history
data/mtrl/yellow-gradient		diff \| blob \| history
data/mtrl/yellow-gradient-bright		diff \| blob \| history
data/mtrl/yellow-natural		diff \| blob \| history
data/mtrl/zip		diff \| blob \| history
data/png/stars1	[new file with mode: 0644]	blob
data/png/stars2	[new file with mode: 0644]	blob
data/png/stars3	[new file with mode: 0644]	blob
data/png/stars4	[new file with mode: 0644]	blob
putt/game.c		diff \| blob \| history
putt/game.h		diff \| blob \| history
putt/hole.c		diff \| blob \| history
putt/hole.h		diff \| blob \| history
putt/hud.c		diff \| blob \| history
putt/main.c		diff \| blob \| history
putt/st_all.c		diff \| blob \| history
putt/st_conf.c		diff \| blob \| history
share/audio.c		diff \| blob \| history
share/back.c	[deleted file]	blob \| history
share/back.h	[deleted file]	blob \| history
share/ball.c		diff \| blob \| history
share/ball.h		diff \| blob \| history
share/fs_ov.h		diff \| blob \| history
share/geom.c		diff \| blob \| history
share/geom.h		diff \| blob \| history
share/glext.c	[new file with mode: 0644]	blob
share/glext.h		diff \| blob \| history
share/gui.c		diff \| blob \| history
share/gui.h		diff \| blob \| history
share/image.c		diff \| blob \| history
share/item.c		diff \| blob \| history
share/item.h		diff \| blob \| history
share/mapc.c		diff \| blob \| history
share/part.c		diff \| blob \| history
share/part.h		diff \| blob \| history
share/solid_base.c		diff \| blob \| history
share/solid_base.h		diff \| blob \| history
share/solid_draw.c		diff \| blob \| history
share/solid_draw.h		diff \| blob \| history
share/st_resol.c		diff \| blob \| history
share/state.c		diff \| blob \| history
share/sync.c		diff \| blob \| history
share/video.c		diff \| blob \| history

Unnamed repository; edit this file to name it for gitweb.

RSS Atom