commit c18f506d
Updated a lot of auther information. New libraries, changed file names. Removed official
scons support.
Changed files
| M | .travis.yml before |
| M | README.md before |
| M | SConstruct before |
| M | source/AUTH before |
| M | source/code/AUTHORS before |
| M | travis_build.script before |
diff --git a/.travis.yml b/.travis.yml
index 389cebd..fb0a8e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ addons:
- libphysfs-dev
- libboost1.55-dev
- libjsoncpp-dev
- - scons
cache:
apt: true
diff --git a/README.md b/README.md
index 8c63982..b4abd09 100644
--- a/README.md
+++ b/README.md
@@ -5,15 +5,17 @@ A Tetris Attack Clone under the GPL.
# Dependencies
* A version of g++ with C++11 support. Tested on g++-4.9
* libSDL
- * libSDL_image
- * libSDL_mixer
- * libSDL_ttf
+ * libSDL2_image
+ * libSDL2_mixer
+ * libSDL2_ttf
* libenet
* libphysfs
* libboost (only needed for compiling)
* libutfcpp (only needed for compiling)
+ * jsoncpp
# Building
+The only supported build method is using the Makefile
To build do:
```
cd source/code
@@ -21,8 +23,7 @@ make
```
The result should be in the "Game"-folder. To run
```
-cd ../..
-cd Game
+cd ../../Game
./blockattack
```
diff --git a/SConstruct b/SConstruct
index 28bd25d..843d9a7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -9,6 +9,8 @@ opts.Add('mandir', 'Directory to use to store data file', '$prefix/share/man')
opts.Add('CXXFLAGS', 'C++ flags', "-std=c++11")
+print "Warning: scons is absolutely unsupported for building Block Attack - Rise of the blocks"
+
# Copy Build Environment #
env = Environment(options = opts)
if 'PATH' in os.environ:
diff --git a/source/AUTH b/source/AUTH
index dc032b2..ea2ec24 100644
--- a/source/AUTH
+++ b/source/AUTH
@@ -7,146 +7,93 @@ Data from the OpenArena team is under GPL v2
Data from the Trackballs team is under GPL v2
Poul Sander's files are multi licensed under "GPL v2 or later" OR "CC-BY-SA any version"
-/fonts/
-FreeSerif.ttf Free Software Foundation
-PenguinAttack.ttf Dustin Norlander - GPLv2
-
-/gfx/
-14P_Arial_Angle_Red.png Karl Bartel - http://user.cs.tu-berlin.de/~karlb/sfont/fonts.html
-b1024.png Poul Sander
-bBack.png Poul Sander
-bBlank.png Poul Sander
-bChange.png Poul Sander
-bConnect.png qubodup
-bConfigure.png qubodup
-bEndless.png qubodup
-bExit.png qubodup
-bForward.png Poul Sander
-bHighScore.png qubodup
-bHost.png qubodup
-bHowToPlay.png Poul Sander
-bInternet.png Poul Sander
-bLoad.png qubodup
-bNetwork.png qubodup
-bNewGame.png qubodup
-bNext.png Poul Sander
-bOff.png Poul Sander
-bOn.png Poul Sander
-bOnePlayer.png qubodup
-bOptions.png qubodup
-bPuzzle.png qubodup
-bReplays.png qubodup
-bRetry.png Poul Sander
-bSave.png qubodup
-bSelectPuzzle.png qubodup
-bSkip.png Poul Sander
-bTheme.png Poul Sander (based on qubodup's buttons)
-bVsGameConfig.png Poul Sander (based on qubodup's buttons)
-bTimeTrial.png qubodup
-bVsGame.png qubodup
-bStageClear.png qubodup
-bTwoPlayers.png qubodup
+Misc:
blockAttack.ico Poul Sander
-changeButtonsBack1.png Poul Sander
-iDraw.png Poul Sander
-changeButtonsBack.png Poul Sander
-iGameOver.png Poul Sander
-iLevelCheckBox.png Poul Sander
-iLevelCheckBoxMarked.png Poul Sander
-topscores.png Poul Sander
+
+/fonts/
+freeserif.ttf Free Software Foundation
+penguinattack.ttf Dustin Norlander - GPLv2
+
+/textures/
+back_board.png qubodup
+background.png qubodup
+ball_blue.png qubodup
+ball_gray.png qubodup
+ball_green.png qubodup
+ball_purple.png qubodup
+ball_red.png qubodup
+ball_turkish.png qubodup
+ball_yellow.png qubodup
+b_blank.png Poul Sander
+b_exit.png qubodup
+b_highscore.png qubodup
+black_back_ground.png Poul Sander
+black_line.png Poul Sander
+blue.png qubodup
+board_back_back.png qubodup
+bomb.png Poul Sander
+chain_frame.png Poul Sander
+counter_1.png Poul Sander
+counter_2.png Poul Sander
+counter_3.png Poul Sander
crossover.png Poul Sander
-iLevelCheck.png Poul Sander
-transCover.png Poul Sander
-BackBoard.png qubodup
+cursor.png Poul Sander
dialogbox.png Poul Sander
-iLoser.png Poul Sander
-boardBackBack.png qubodup
+explosion0.png openarena-svn887:/textures/sfx/130boom
+explosion1.png openarena-svn887:/textures/sfx/130boom
+explosion2.png openarena-svn887:/textures/sfx/130boom
+explosion3.png openarena-svn887:/textures/sfx/130boom
+fallback.png Poul Sander
fileDialogbox.png Poul Sander
-iStageClearLimit.png Poul Sander
-background.png qubodup
-iWinner.png Poul Sander
-mouse.png Poul Sander
-blackBackGround.png Poul Sander
-options.png Poul Sander
-blackLine.png Poul Sander
-iCheckBoxArea.png Poul Sander
-chainFrame.png Poul Sander
-icon.png Poul Sander
-
-/gfx/bricks/
-blue.png qubodup
+garbage_bl.png qubodup
+garbage_b.png qubodup
+garbage_br.png qubodup
+garbage_fill.png qubodup
+garbage_gml.png qubodup
+garbage_gm.png qubodup
+garbage_gmr.png qubodup
+garbage_l.png qubodup
+garbage_ml.png qubodup
+garbage_m.png qubodup
+garbage_mr.png qubodup
+garbage_r.png qubodup
+garbage_tl.png qubodup
+garbage_t.png qubodup
+garbage_tr.png qubodup
green.png qubodup
grey.png qubodup
+i_check_box_area.png Poul Sander
+icon.png Poul Sander
+i_draw.png Poul Sander
+i_game_over.png Poul Sander
+i_level_check_box_marked.png Poul Sander
+i_level_check_box.png Poul Sander
+i_level_check.png Poul Sander
+i_loser.png Poul Sander
+i_stage_clear_limit.png Poul Sander
+i_winner.png Poul Sander
+mouse.png Poul Sander
purple.png qubodup
+ready.png Poul Sander
red.png qubodup
+smileys0.png qubodup
+smileys1.png qubodup
+smileys2.png qubodup
+smileys3.png qubodup
+trans_cover.png Poul Sander
turkish.png qubodup
yellow.png qubodup
-/gfx/smileys/
-0.png qubodup
-1.png qubodup
-2.png qubodup
-3.png qubodup
-
-/gfx/animations/bomb/
-bomb_1.png Poul Sander
-bomb_2.png Poul Sander
-
-/gfx/animations/cursor/
-1.png Poul Sander
-2.png Poul Sander
-
-/gfx/animations/explosion/
-0.png openarena-svn887:/textures/sfx/130boom
-1.png openarena-svn887:/textures/sfx/130boom
-2.png openarena-svn887:/textures/sfx/130boom
-3.png openarena-svn887:/textures/sfx/130boom
-
-/gfx/animations/ready/
-ready_1.png Poul Sander
-ready_2.png Poul Sander
-
-/gfx/counter/
-1.png Poul Sander
-2.png Poul Sander
-3.png Poul Sander
-
-/gfx/garbage/
-garbageBL.png qubodup
-garbageBR.png qubodup
-garbageGML.png qubodup
-garbageGMR.png qubodup
-garbageML.png qubodup
-garbageMR.png qubodup
-garbageTL.png qubodup
-garbageTR.png qubodup
-garbageB.png qubodup
-garbageFill.png qubodup
-garbageGM.png qubodup
-garbageL.png qubodup
-garbageM.png qubodup
-garbageR.png qubodup
-garbageT.png qubodup
-
-/gfx/balls/
-ballBlue.png qubodup
-ballGray.png qubodup
-ballGreen.png qubodup
-ballPurple.png qubodup
-ballRed.png qubodup
-ballTurkish.png qubodup
-ballYellow.png qubodup
-
/sound/
pop.ogg openarena-svn887:/sound/weapons/rocket/rockf1a.wav
cameraclick.ogg openarean-svn887:/sound/misc/w_pkup.wav
typing.ogg openarena-svn887:/sound/world/clack.wav
counter.ogg openarena-svn900:/sound/feedback/hitlo.wav
-counterFinal.ogg openarena-svn900:/sound/feedback/hit.wav
+counter_final.ogg openarena-svn900:/sound/feedback/hit.wav
applause.ogg (CC-BY 3.0) Blender Foundation - Cut by LeeZH (http://opengameart.org/content/applause)
/music/
-bgMusic.ogg Trackballs team (http://trackballs.sourceforge.net/) v 1.2 (GPL2), copy of tb_design.ogg
+bgmusic.ogg Trackballs team (http://trackballs.sourceforge.net/) v 1.2 (GPL2), copy of tb_design.ogg
highbeat.ogg Trackballs team (http://trackballs.sourceforge.net/) v 1.2 (GPL2), derived from tb_genesis.ogg
diff --git a/source/code/AUTHORS b/source/code/AUTHORS
index ceb6a5e..5fcefaa 100644
--- a/source/code/AUTHORS
+++ b/source/code/AUTHORS
@@ -5,8 +5,8 @@ http://blockattack.sf.net
Gonéri Le Bouder
Done some work for making it work with SHAREDIR and all Scons scripts
-Contains SFont - SDL Font Library by
-Karl Bartel <karlb@gmx.net>
+Jonathan Dearborn
+NFont library
Jordà Polo
Two patches
@@ -14,4 +14,6 @@ Two patches
A lot of the 1.4.0 graphics is by
Iwan Gabovitch aka qubodup
+This does not cover non-embedded libraries.
+
Detailed auther information regarding media can be found in the blockattack.data zip-file
diff --git a/travis_build.script b/travis_build.script
index 1af8ae1..a49a44a 100755
--- a/travis_build.script
+++ b/travis_build.script
@@ -5,5 +5,6 @@ cp -r source/misc/travis_help/utf8_v2_3_4/source/utf8 source/code/
make -C source/code -f Makefile
make clean
./packdata.sh
-scons -Q prefix=$HOME -Q sharedir=$HOME/share/
+#I do not support scons.
+#scons -Q prefix=$HOME -Q sharedir=$HOME/share/