]> git.mxchange.org Git - quix0rs-blobwars.git/log
quix0rs-blobwars.git
9 years agoCoalesce printf() statements in main.cpp, make them translatable.
Guus Sliepen [Thu, 6 Aug 2015 15:33:11 +0000 (17:33 +0200)]
Coalesce printf() statements in main.cpp, make them translatable.

9 years agoRemove duplication of showVersion().
Guus Sliepen [Thu, 6 Aug 2015 15:27:01 +0000 (17:27 +0200)]
Remove duplication of showVersion().

9 years agoAdd the -window option as a counterpart to -fullscreen.
Guus Sliepen [Thu, 6 Aug 2015 15:21:50 +0000 (17:21 +0200)]
Add the -window option as a counterpart to -fullscreen.

9 years agoLoad configuration before parsing command line options.
Guus Sliepen [Thu, 6 Aug 2015 15:19:21 +0000 (17:19 +0200)]
Load configuration before parsing command line options.

Before, if there was a valid configuration file, then some command line
options did not have any effect.

9 years agoShow help when encountering an unknown argument on the command line.
Guus Sliepen [Thu, 6 Aug 2015 15:16:12 +0000 (17:16 +0200)]
Show help when encountering an unknown argument on the command line.

9 years agoFix compiling blobwars without SDL1 headers present.
Guus Sliepen [Thu, 6 Aug 2015 15:15:56 +0000 (17:15 +0200)]
Fix compiling blobwars without SDL1 headers present.

11 years agoDelay switching to fullscreen mode.
Guus Sliepen [Tue, 1 Oct 2013 12:26:50 +0000 (14:26 +0200)]
Delay switching to fullscreen mode.

If we make the window fullscreen too early during program start, then turning
fullscreen off will not change the window size back to 640x480 pixels.

11 years agoFix color key and alpha blending.
Guus Sliepen [Tue, 1 Oct 2013 12:26:27 +0000 (14:26 +0200)]
Fix color key and alpha blending.

11 years agoInitial conversion to SDL2.
Guus Sliepen [Tue, 1 Oct 2013 11:11:43 +0000 (13:11 +0200)]
Initial conversion to SDL2.

Color keys and alpha blending is not working correctly yet.

11 years agoAdd Language headers to all .po files.
Guus Sliepen [Tue, 1 Oct 2013 08:32:02 +0000 (10:32 +0200)]
Add Language headers to all .po files.

11 years agoDon't use gzclose() on a FILE *.
Guus Sliepen [Sun, 7 Jul 2013 16:55:29 +0000 (18:55 +0200)]
Don't use gzclose() on a FILE *.

11 years agoUpdated PNG icon files.
Tim Dickson [Sun, 7 Jul 2013 16:32:44 +0000 (18:32 +0200)]
Updated PNG icon files.

The PNG files under icons directory are not square, so that when KDE shows them
they get stretched. I have created updated icon files for 16x16,
32x32,48x48,64x64 to replace the 16x12,32,24,missing, and 64,48 icons.

12 years agoFix building with clang.
Cyril Roelandt [Mon, 3 Sep 2012 00:59:41 +0000 (02:59 +0200)]
Fix building with clang.

blobwars currently FTBFS with clang 3.1 (the full build log can be found at
http://clang.debian.net/logs/2012-06-23/blobwars_1.19-2_unstable_clang.log).
The attached patch should fix this issue.

13 years agoTell SDL to use double buffering if available.
Guus Sliepen [Mon, 29 Aug 2011 20:03:42 +0000 (22:03 +0200)]
Tell SDL to use double buffering if available.

13 years agoMake build system respect LDFLAGS.
Pacho Ramos [Mon, 29 Aug 2011 18:36:16 +0000 (20:36 +0200)]
Make build system respect LDFLAGS.

13 years agoTruncate machinegun sample to the sound of just one bullet.
Guus Sliepen [Fri, 5 Aug 2011 11:13:27 +0000 (13:13 +0200)]
Truncate machinegun sample to the sound of just one bullet.

13 years agoRecompress all PNG files.
Guus Sliepen [Fri, 5 Aug 2011 09:58:31 +0000 (11:58 +0200)]
Recompress all PNG files.

The advpng tool from AdvanceCOMP has been used to recompress all PNG files.
This decreases their size with 7%, which saves 152 kB.

13 years agoDon't link pak tool with SDL.
Guus Sliepen [Thu, 4 Aug 2011 14:08:47 +0000 (16:08 +0200)]
Don't link pak tool with SDL.

13 years agoDon't use sdlmain in the pak tool
Alan Trulock [Thu, 4 Aug 2011 14:07:21 +0000 (16:07 +0200)]
Don't use sdlmain in the pak tool

On Mac OS X, compiling pak from the command line works as expected but
compiling in Xcode results in bus errors when running the program. By patching
pak.h and linking only to libz within Xcode, pak compiles and runs as expected.

13 years agoIncorrect reference to SDL_FRMEWORK
Alan Trulock [Thu, 4 Aug 2011 14:01:12 +0000 (16:01 +0200)]
Incorrect reference to SDL_FRMEWORK

There are two references to SDL_FRAMEWORK that should have been written
FRAMEWORK_SDL. In CGame.cpp, I think the section should be removed in it's
entirety as there is really no need for it and correcting the define results in
failure when compiling. In init.cpp, correcting the define allows Mac OS X
builds to assign a custom icon. If this is not fixed, the icon gets replaced
every time the game is run.

13 years agoAdd SDL_net to frameworks
Alan Trulock [Mon, 25 Jul 2011 20:06:50 +0000 (22:06 +0200)]
Add SDL_net to frameworks

When SDL_net was introduced, the framework was not added to headers.h. This
causes a problem when compiling with -DFRAMEWORK_SDL=1.

13 years agoLIBS go after objects to allow linking with ld --as-needed
Andreas Moog [Sun, 19 Jun 2011 20:03:10 +0000 (22:03 +0200)]
LIBS go after objects to allow linking with ld --as-needed

13 years agoCheck return value of chdir
Hans de Goede [Fri, 22 Apr 2011 17:56:00 +0000 (19:56 +0200)]
Check return value of chdir

Not checking this causes a warning when building under Fedora which becomes
an error because of -Werror.

13 years agoUpdate copyrights to 2011.
Guus Sliepen [Sun, 17 Apr 2011 14:56:56 +0000 (16:56 +0200)]
Update copyrights to 2011.

13 years agoDon't forget to install the documentation.
Guus Sliepen [Sun, 17 Apr 2011 14:39:05 +0000 (16:39 +0200)]
Don't forget to install the documentation.

13 years agoBump version and update changelog.
Guus Sliepen [Sun, 17 Apr 2011 14:17:06 +0000 (16:17 +0200)]
Bump version and update changelog.

13 years agoFix posting medals to the medal server.
Guus Sliepen [Sun, 17 Apr 2011 13:45:20 +0000 (15:45 +0200)]
Fix posting medals to the medal server.

13 years agoEnsure all credits are shown.
Guus Sliepen [Mon, 28 Feb 2011 12:12:42 +0000 (13:12 +0100)]
Ensure all credits are shown.

The first line of the data/credits file is the number of lines in this file...

13 years agoUpdate credits for the song Herbs, originally Claustrophobia from LizardKing.
Guus Sliepen [Mon, 28 Feb 2011 12:09:40 +0000 (13:09 +0100)]
Update credits for the song Herbs, originally Claustrophobia from LizardKing.

LizardKing is the original composer of the song "Claustrophobia", which was
only slightly modified by Ambick and redistributed as "Herbs". LizardKing has
given permission to use his song under the CC-BY-SA 3.0 license, which allows
Ambick's version, but it does require proper attribution.

13 years agoPreserve timestamps when installing data files
Hans de Goede [Tue, 15 Feb 2011 08:55:33 +0000 (09:55 +0100)]
Preserve timestamps when installing data files

Since these are not regenerated each build, it is a good idea to preserve the
timestamps when installing.

13 years agoPictures are not executable.
Guus Sliepen [Mon, 14 Feb 2011 20:39:07 +0000 (21:39 +0100)]
Pictures are not executable.

13 years agoAdd .PHONY target.
Guus Sliepen [Mon, 14 Feb 2011 15:39:44 +0000 (16:39 +0100)]
Add .PHONY target.

13 years agoAllow many makefile variables to be overridden from the environment.
Guus Sliepen [Mon, 14 Feb 2011 15:34:02 +0000 (16:34 +0100)]
Allow many makefile variables to be overridden from the environment.

13 years agoDo not use DESTDIR in PREFIX, but only in the install target.
Guus Sliepen [Mon, 14 Feb 2011 15:30:07 +0000 (16:30 +0100)]
Do not use DESTDIR in PREFIX, but only in the install target.

13 years agoConditional building and installing of pak files.
Guus Sliepen [Mon, 14 Feb 2011 15:24:45 +0000 (16:24 +0100)]
Conditional building and installing of pak files.

13 years agoChdir() to the data directory when RELEASE is #defined.
Guus Sliepen [Mon, 14 Feb 2011 15:14:24 +0000 (16:14 +0100)]
Chdir() to the data directory when RELEASE is #defined.

This ensures an installed version of Blobwars can find the data files if it is
not in a .pak file.

13 years agoCleanup .desktop file
Hans de Goede [Mon, 14 Feb 2011 14:58:36 +0000 (15:58 +0100)]
Cleanup .desktop file

13 years agoDon't make the files / binaries owned by group games
Hans de Goede [Mon, 14 Feb 2011 14:57:34 +0000 (15:57 +0100)]
Don't make the files / binaries owned by group games

There is no need for this and it breaks running make install as a non
root user.

13 years agoAdd doc/samples which more accurately tracks samples origin
Hans de Goede [Mon, 14 Feb 2011 11:58:50 +0000 (12:58 +0100)]
Add doc/samples which more accurately tracks samples origin

doc/samples more accurately lists the origin of various samples, including
things like original filenames or full URL-s where possible. It also notes
if changes were made to the original and which changes were made.

This commit also adds the .sfxr files which can be opened in sfxr to edit
the sfxr generated effects.

13 years agoAdd missing credit for item sample
Hans de Goede [Mon, 14 Feb 2011 11:54:55 +0000 (12:54 +0100)]
Add missing credit for item sample

13 years agoFix -Wunused-result compiler warnings
Hans de Goede [Mon, 14 Feb 2011 11:22:07 +0000 (12:22 +0100)]
Fix -Wunused-result compiler warnings

Fedora uses -Wunused-result when building packages, combined with the -Werror
from the makefile, this causes compile errors in various places because
of not properly error checking various file io actions. This patch fixes this.

13 years agoFix new compiler warnings thrown by gcc-4.6
Hans de Goede [Sun, 13 Feb 2011 20:05:03 +0000 (21:05 +0100)]
Fix new compiler warnings thrown by gcc-4.6

13 years agoAdd NSIS script to create a Windows installer.
Guus Sliepen [Sun, 13 Feb 2011 17:14:00 +0000 (18:14 +0100)]
Add NSIS script to create a Windows installer.

13 years agoRemove unnecessary delay while initialising.
Guus Sliepen [Sun, 13 Feb 2011 17:12:23 +0000 (18:12 +0100)]
Remove unnecessary delay while initialising.

13 years agoAllow music tags to be stored in the pak file.
Guus Sliepen [Sun, 13 Feb 2011 17:11:28 +0000 (18:11 +0100)]
Allow music tags to be stored in the pak file.

13 years agoSmall fixes for the Windows makefile.
Guus Sliepen [Sun, 13 Feb 2011 17:08:56 +0000 (18:08 +0100)]
Small fixes for the Windows makefile.

13 years agoDon't enable gettext support on Windows for now.
Guus Sliepen [Sun, 13 Feb 2011 17:07:33 +0000 (18:07 +0100)]
Don't enable gettext support on Windows for now.

13 years agoBump version and update changelog.
Guus Sliepen [Thu, 30 Dec 2010 15:13:01 +0000 (16:13 +0100)]
Bump version and update changelog.

13 years agoUpdate readme file with all license information.
Guus Sliepen [Thu, 30 Dec 2010 15:00:23 +0000 (16:00 +0100)]
Update readme file with all license information.

13 years agoUpdate copyrights.
Guus Sliepen [Thu, 30 Dec 2010 14:53:29 +0000 (15:53 +0100)]
Update copyrights.

The last release from Parallel Realities was in 2010.

13 years agoDon't build pak file by default.
Guus Sliepen [Thu, 30 Dec 2010 14:52:47 +0000 (15:52 +0100)]
Don't build pak file by default.

13 years agoFix and localise exit screen.
Guus Sliepen [Thu, 30 Dec 2010 14:36:09 +0000 (15:36 +0100)]
Fix and localise exit screen.

13 years agoAdd exit screen with pointers to Blobwars 2 and The Battle for the Solar System.
Guus Sliepen [Thu, 30 Dec 2010 14:16:28 +0000 (15:16 +0100)]
Add exit screen with pointers to Blobwars 2 and The Battle for the Solar System.

13 years agoProper attribution of all sound samples in the credits.
Guus Sliepen [Wed, 29 Dec 2010 13:01:57 +0000 (14:01 +0100)]
Proper attribution of all sound samples in the credits.

13 years agoUse field width limits with fscanf().
Guus Sliepen [Sun, 26 Dec 2010 13:45:33 +0000 (14:45 +0100)]
Use field width limits with fscanf().

Cppcheck warns that unlimited field withs can lead to crashes with huge files.

13 years agoRemove unused hash calculation from fileExists().
Guus Sliepen [Sun, 26 Dec 2010 13:40:14 +0000 (14:40 +0100)]
Remove unused hash calculation from fileExists().

13 years agoRemove redundant NULL pointer checks when deallocating.
Guus Sliepen [Sun, 26 Dec 2010 13:16:49 +0000 (14:16 +0100)]
Remove redundant NULL pointer checks when deallocating.

13 years agoMake functions const where possible.
Guus Sliepen [Sun, 26 Dec 2010 13:07:48 +0000 (14:07 +0100)]
Make functions const where possible.

13 years agoUpdate credits.
Guus Sliepen [Sun, 26 Dec 2010 13:07:05 +0000 (14:07 +0100)]
Update credits.

13 years agoFix LDFLAGS to ensure proper compilation with MinGW.
Guus Sliepen [Sat, 25 Dec 2010 15:24:04 +0000 (16:24 +0100)]
Fix LDFLAGS to ensure proper compilation with MinGW.

13 years agoFix #includes for SDL_mutex and SDL_thread.
Guus Sliepen [Sat, 25 Dec 2010 15:20:39 +0000 (16:20 +0100)]
Fix #includes for SDL_mutex and SDL_thread.

13 years agoAdd DFSG compliant sound.
Guus Sliepen [Fri, 24 Dec 2010 13:01:32 +0000 (14:01 +0100)]
Add DFSG compliant sound.

The samples have been taken from various Free Software games.

13 years agoRemove extension from sound samples.
Guus Sliepen [Fri, 24 Dec 2010 12:55:58 +0000 (13:55 +0100)]
Remove extension from sound samples.

SDL can figure out the file type on its own, this allows us to change sample
formats without having to change the source code as well.

13 years agoAdd DFSG compliant music.
Guus Sliepen [Fri, 24 Dec 2010 12:34:56 +0000 (13:34 +0100)]
Add DFSG compliant music.

Big thanks to DJ Sjors, Ambick and SinQ, who have created the music that is now
used in Blobwars and have licensed it under the Creative Commons BY-SA 3.0 and
BY 3.0 licenses.

13 years agoAdd missing closedir() after opendir().
Guus Sliepen [Tue, 21 Dec 2010 15:01:54 +0000 (16:01 +0100)]
Add missing closedir() after opendir().

Found by cppcheck.

13 years agoFix mismatched allocation and deallocation and memory leak in medal code.
Guus Sliepen [Tue, 21 Dec 2010 15:01:15 +0000 (16:01 +0100)]
Fix mismatched allocation and deallocation and memory leak in medal code.

Found by cppcheck.

13 years agoFix reading past end of array containing the record of keypresses.
Guus Sliepen [Tue, 21 Dec 2010 14:54:10 +0000 (15:54 +0100)]
Fix reading past end of array containing the record of keypresses.

Found by cppcheck.

13 years agoSet vertical speed of target to zero when Aquablob recharges.
Guus Sliepen [Tue, 21 Dec 2010 14:48:45 +0000 (15:48 +0100)]
Set vertical speed of target to zero when Aquablob recharges.

Spotted by Theodore Lee.

14 years agoRemove bogus Exit LINEDEF in BioMech Communications.
Guus Sliepen [Sat, 31 Jul 2010 15:10:15 +0000 (17:10 +0200)]
Remove bogus Exit LINEDEF in BioMech Communications.

This LINEDEF prevents the player from going into the small alcoves in the right
wall of the tank.  However, it is buggy, and in some cases the LINEDEF can be
triggered in such a way that the player cannot back out of it anymore.  After
removing, the bug is gone, and the player can enter the alcove a little bit,
but this is harmless.

14 years agoIncrease storage size for message strings.
Guus Sliepen [Tue, 27 Jul 2010 16:56:01 +0000 (18:56 +0200)]
Increase storage size for message strings.

This should help especially for translations with many multi-byte Unicode
characters.

14 years agoUse strlcat() and strlcpy(), #define wrappers when these functions are not available.
Guus Sliepen [Tue, 27 Jul 2010 16:06:27 +0000 (18:06 +0200)]
Use strlcat() and strlcpy(), #define wrappers when these functions are not available.

14 years agoFix alignment of columsn in data/hub and expand tabs.
Guus Sliepen [Tue, 27 Jul 2010 16:04:45 +0000 (18:04 +0200)]
Fix alignment of columsn in data/hub and expand tabs.

14 years agoApply patch from Bas Wijnen preventing the player from getting the Jetpack too early.
Guus Sliepen [Tue, 27 Jul 2010 15:09:36 +0000 (17:09 +0200)]
Apply patch from Bas Wijnen preventing the player from getting the Jetpack too early.

From: Bas Wijnen <wijnen@debian.org>

Attached is a version of data/hub which implements the level order as I
consider it appropriate.  I reorganized and reindented the file, because
it wasn't clearly readable to me.  The actual changes aren't large
though.  What I did:

- Set the requirement for "Ancient Tomb #4" from "BioMech Assimilator"
  to "Stages 18"
- Set the requirement for "BioMech Assimilator" from "Stages 15" to
  "Ancient Tomb #4".

I have tested this using cheat mode, pressing F3 to finish all levels,
and it works as expected.

14 years agoCache text surfaces.
Guus Sliepen [Wed, 7 Jul 2010 17:08:12 +0000 (19:08 +0200)]
Cache text surfaces.

According to callgrind, a lot of time was spent drawing the same text over and
over to a surface.  A caching version of Graphics::drawString has been added,
that keeps the surface around when the text hasn't changed.

14 years agoDo not fill in comboString when we are not using it.
Guus Sliepen [Wed, 7 Jul 2010 14:22:26 +0000 (16:22 +0200)]
Do not fill in comboString when we are not using it.

According to callgrind, blobwars was spending 4% of its time in
enemyBulletCollisions(), calling snprintf() to fill in comboString. However,
this string was only used when an enemy was killed to check against objectives.
So now snprintf() has been moved to where it actually is being used, dropping
time spent in that function by 3.8%.

14 years agoShow music credits after some time in title screen, hub and credits.
Guus Sliepen [Sun, 4 Jul 2010 13:20:10 +0000 (15:20 +0200)]
Show music credits after some time in title screen, hub and credits.

14 years agoPut a dark grey rectangle behind music credits to improve readability.
Guus Sliepen [Sun, 4 Jul 2010 13:19:43 +0000 (15:19 +0200)]
Put a dark grey rectangle behind music credits to improve readability.

14 years agoRemove unused source files.
Guus Sliepen [Sat, 3 Jul 2010 21:39:06 +0000 (23:39 +0200)]
Remove unused source files.

14 years agoNicer wind particles in Arctic Wastes.
Guus Sliepen [Sat, 3 Jul 2010 19:21:28 +0000 (21:21 +0200)]
Nicer wind particles in Arctic Wastes.

14 years agoVarious fixes for bugs valgrind found.
Guus Sliepen [Sat, 3 Jul 2010 18:28:29 +0000 (20:28 +0200)]
Various fixes for bugs valgrind found.

14 years agoRemove a debug message.
Guus Sliepen [Sat, 3 Jul 2010 18:28:14 +0000 (20:28 +0200)]
Remove a debug message.

14 years agoShow music credits during start of a level and when showing the map.
Guus Sliepen [Sat, 3 Jul 2010 16:29:40 +0000 (18:29 +0200)]
Show music credits during start of a level and when showing the map.

The title, album and artist are shown briefly in the lower right corner of the
screen 5 seconds after a level has been started, along with an icon
representing the license under which the level music is available. The same
information is also shown when the level map is viewed.

14 years agoDo not load music when we do not need to show a cutscene.
Guus Sliepen [Sat, 3 Jul 2010 16:29:22 +0000 (18:29 +0200)]
Do not load music when we do not need to show a cutscene.

14 years agoAdd Creative Commons logos.
Guus Sliepen [Sat, 3 Jul 2010 13:48:21 +0000 (15:48 +0200)]
Add Creative Commons logos.

14 years agoReplace music filenames with generic filenames.
Guus Sliepen [Sat, 3 Jul 2010 13:15:19 +0000 (15:15 +0200)]
Replace music filenames with generic filenames.

14 years agoAllow the game to run without sounds.
Guus Sliepen [Fri, 2 Jul 2010 16:31:58 +0000 (18:31 +0200)]
Allow the game to run without sounds.

Reapplication of commit d290ae9a9b526551f399580c294289be128a1039.

14 years agoUse UNIX line endings everywhere.
Guus Sliepen [Mon, 28 Jun 2010 22:09:44 +0000 (00:09 +0200)]
Use UNIX line endings everywhere.

Reapplication of commit 927fcd8193a4d0c9365796f30f246bf519b2cce2.

14 years agoMake sure mapeditor can be linked.
Guus Sliepen [Mon, 28 Jun 2010 22:08:24 +0000 (00:08 +0200)]
Make sure mapeditor can be linked.

14 years agoEnsure the map editor can be compiled.
Guus Sliepen [Mon, 28 Jun 2010 22:05:43 +0000 (00:05 +0200)]
Ensure the map editor can be compiled.

Reapplication of commit c51320ee6a6c728224ee85a4d9fd6fe22044d48c.

14 years agoUse DEBUG instead of USEPAK to enable debugging code.
Guus Sliepen [Mon, 28 Jun 2010 22:03:15 +0000 (00:03 +0200)]
Use DEBUG instead of USEPAK to enable debugging code.

eapplication of commit bcd19efa602b9279399b17e7756b8212df0fa234.

14 years agoBuilding a pak file requires the pak utility to have been built.
Guus Sliepen [Mon, 28 Jun 2010 21:56:40 +0000 (23:56 +0200)]
Building a pak file requires the pak utility to have been built.

Reapplication of commit 6e7bfbcc9203c6ff974190cdbd5e2b7401734fed.

14 years agoDo not print a string into itself.
Guus Sliepen [Mon, 28 Jun 2010 21:55:25 +0000 (23:55 +0200)]
Do not print a string into itself.

14 years agoUse snprintf() and strncpy().
Guus Sliepen [Mon, 28 Jun 2010 21:41:06 +0000 (23:41 +0200)]
Use snprintf() and strncpy().

14 years agoUse %zd when printing result of strlen().
Guus Sliepen [Mon, 28 Jun 2010 21:11:28 +0000 (23:11 +0200)]
Use %zd when printing result of strlen().

14 years agoRemove automatically generated compiled message catalogs.
Guus Sliepen [Sat, 1 May 2010 10:57:52 +0000 (12:57 +0200)]
Remove automatically generated compiled message catalogs.

14 years ago1.17 Medal Support
Stephen Sweeney [Mon, 8 Mar 2010 08:31:49 +0000 (08:31 +0000)]
1.17 Medal Support

14 years ago1.17 Medal Support
Stephen Sweeney [Mon, 8 Mar 2010 08:29:27 +0000 (08:29 +0000)]
1.17 Medal Support

14 years agoUse UNIX line endings everywhere.
Guus Sliepen [Thu, 24 Dec 2009 10:21:24 +0000 (11:21 +0100)]
Use UNIX line endings everywhere.

14 years agoEnsure the map editor can be compiled.
Guus Sliepen [Wed, 23 Dec 2009 22:21:31 +0000 (23:21 +0100)]
Ensure the map editor can be compiled.

14 years agoUse DEBUG instead of USEPAK to enable debugging code.
Guus Sliepen [Wed, 23 Dec 2009 13:22:50 +0000 (14:22 +0100)]
Use DEBUG instead of USEPAK to enable debugging code.