Skip to content

Commit

Permalink
merge: professor form Paolo Caroni
Browse files Browse the repository at this point in the history
  • Loading branch information
rzr committed Apr 4, 2011
1 parent b5528f9 commit b3469fe
Show file tree
Hide file tree
Showing 7 changed files with 31,570 additions and 7,983 deletions.
23 changes: 23 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
CREW:

* Henrik Enqvist :
Lead developer

* Philippe Coval <http://rzr.online.fr> :
Coding, Porting

* Pedro Ferreira :
Coding


SPECIAL THANKS:

* Bastian Salmela for the splash screen.

* Thomas Thierry for maintaining a FreeBSD port.

* Jochen Friedrich <http://packages.qa.debian.org/p/pinball.html>

* Paolo Caroni for working on extra tables

* And everybody else we forgot to mention.
2 changes: 2 additions & 0 deletions bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ autoheader
automake --add-missing
autoconf

$@

echo "# $0 && ./configure && make && make install && src/pinball"
8 changes: 4 additions & 4 deletions data/hurd/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ libModuleHurd_la_LDFLAGS = -module
libModuleHurd_la_SOURCES = ModuleHurd.cpp

hurddata_DATA = \
$(wildcard *.wav) \
$(wildcard *.png) \
$(wildcard *.pbl) \
$(wildcard *.pcx) \
$(wildcard *.png) \
$(wildcard *.jpg) \
$(wildcard *.wav) \
$(wildcard *.ogg) \
$(wildcard *.mid) \
$(wildcard *.pbl) \
$(wildcard *.jpg) \
#

# This will create a new empty highscores file
Expand Down
20 changes: 8 additions & 12 deletions data/professor/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,14 @@ libModuleProfessor_la_LDFLAGS = -module
libModuleProfessor_la_SOURCES = ModuleProfessor.cpp

professordata_DATA = \
bump.wav \
bumphard.wav \
bumpsoft.wav \
flip.wav \
floor.png \
floor.png.pcx \
gameover.wav \
introp.ogg \
nudge.wav \
pinball.pbl \
professor.ogg \
professor.png
$(wildcard *.pbl) \
$(wildcard *.pcx) \
$(wildcard *.png) \
$(wildcard *.jpg) \
$(wildcard *.wav) \
$(wildcard *.ogg) \
$(wildcard *.mid) \
#

# This will create a new empty highscores file
# NOTE! The user games must exist!
Expand Down
5 changes: 5 additions & 0 deletions data/professor/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
The new version of the Professor Table is a develop by Paolo Caroni, released under the same
licences of The Emilia Pinball Project (GPLv2), if The Emilia Pinball Project changes version of GPL
the Professor Table can do the same.

Many thanks to the help in the packaging for rzr.
Loading

0 comments on commit b3469fe

Please sign in to comment.