supertux.git
9 years agoPrefixing squirrel output with [SQUIRREL]
Tobias Markus [Sat, 11 Oct 2014 22:08:50 +0000 (00:08 +0200)]
Prefixing squirrel output with [SQUIRREL]

9 years agoPlayed a bit around with the brush tool
Ingo Ruhnke [Fri, 10 Oct 2014 09:18:06 +0000 (11:18 +0200)]
Played a bit around with the brush tool

9 years agoAdded halloween3, just empty placeholder
Ingo Ruhnke [Thu, 9 Oct 2014 14:39:30 +0000 (16:39 +0200)]
Added halloween3, just empty placeholder

9 years agoAdded gravestone graphics
Ingo Ruhnke [Thu, 9 Oct 2014 14:35:53 +0000 (16:35 +0200)]
Added gravestone graphics

9 years agoSome more work on Halloween1
Ingo Ruhnke [Thu, 9 Oct 2014 11:21:46 +0000 (13:21 +0200)]
Some more work on Halloween1

9 years agoStarted shaping up Halloween2
Ingo Ruhnke [Wed, 8 Oct 2014 17:08:24 +0000 (19:08 +0200)]
Started shaping up Halloween2

9 years agoAdded another halloween level
Ingo Ruhnke [Wed, 8 Oct 2014 14:29:15 +0000 (16:29 +0200)]
Added another halloween level

9 years agoAdded torches to halloween1
Ingo Ruhnke [Wed, 8 Oct 2014 14:29:03 +0000 (16:29 +0200)]
Added torches to halloween1

9 years agoFixed compiler warning
Ingo Ruhnke [Wed, 8 Oct 2014 14:28:45 +0000 (16:28 +0200)]
Fixed compiler warning

9 years agoAdded torch code
Ingo Ruhnke [Wed, 8 Oct 2014 14:28:38 +0000 (16:28 +0200)]
Added torch code

9 years agoAdded torch graphics
Ingo Ruhnke [Wed, 8 Oct 2014 14:28:25 +0000 (16:28 +0200)]
Added torch graphics

9 years agoCleaned up Halloween backgrounds and expanded them to proper size (i.e. 1280x800)
Ingo Ruhnke [Wed, 8 Oct 2014 10:57:20 +0000 (12:57 +0200)]
Cleaned up Halloween backgrounds and expanded them to proper size (i.e. 1280x800)

9 years agoSplit Halloween exit into foreground and background layer
Ingo Ruhnke [Wed, 8 Oct 2014 09:52:00 +0000 (11:52 +0200)]
Split Halloween exit into foreground and background layer

9 years agoAdded roads to Halloween worldmap
Ingo Ruhnke [Tue, 7 Oct 2014 15:31:38 +0000 (17:31 +0200)]
Added roads to Halloween worldmap

9 years agoAdded water splash, darkwater and vignette to halloween worldmap
Ingo Ruhnke [Tue, 7 Oct 2014 13:22:59 +0000 (15:22 +0200)]
Added water splash, darkwater and vignette to halloween worldmap

9 years agoTurned home and scarecrow into decal, added trees, copied water tiles from ice-world
Ingo Ruhnke [Tue, 7 Oct 2014 11:18:13 +0000 (13:18 +0200)]
Turned home and scarecrow into decal, added trees, copied water tiles from ice-world

9 years agoReplaced Halloween worldmap grass texture with a better looking one, resized pumpkin...
Ingo Ruhnke [Tue, 7 Oct 2014 10:01:41 +0000 (12:01 +0200)]
Replaced Halloween worldmap grass texture with a better looking one, resized pumpkin-home and scarecrow by 2x

9 years agoAdded Halloween worldmap properly into the game
Ingo Ruhnke [Tue, 7 Oct 2014 08:48:56 +0000 (10:48 +0200)]
Added Halloween worldmap properly into the game

9 years agoRemoved Kirby badguy code, use simple sprite replacement in the level instead
Ingo Ruhnke [Tue, 7 Oct 2014 08:48:21 +0000 (10:48 +0200)]
Removed Kirby badguy code, use simple sprite replacement in the level instead

9 years agoFixing falling layer for most of the cases
Tobias Markus [Mon, 6 Oct 2014 23:39:23 +0000 (01:39 +0200)]
Fixing falling layer for most of the cases

9 years agoBugfix (use private variable instead of class member)
Tobias Markus [Mon, 6 Oct 2014 22:21:50 +0000 (00:21 +0200)]
Bugfix (use private variable instead of class member)

9 years agoMore robust way of calculating the falling layer
Tobias Markus [Mon, 6 Oct 2014 22:19:25 +0000 (00:19 +0200)]
More robust way of calculating the falling layer

9 years agoAdded Halloween worldmap
Ingo Ruhnke [Sun, 5 Oct 2014 16:58:47 +0000 (18:58 +0200)]
Added Halloween worldmap

9 years agoAdded Fatbat sprite
Ingo Ruhnke [Sun, 5 Oct 2014 09:44:30 +0000 (11:44 +0200)]
Added Fatbat sprite

9 years agoAdded death sprite for Kirby
Ingo Ruhnke [Sat, 4 Oct 2014 15:37:21 +0000 (17:37 +0200)]
Added death sprite for Kirby

9 years agoAdded Kirby badguy
Ingo Ruhnke [Sat, 4 Oct 2014 15:14:46 +0000 (17:14 +0200)]
Added Kirby badguy

9 years agoAdded some more Halloween tiles
Ingo Ruhnke [Sat, 4 Oct 2014 13:35:00 +0000 (15:35 +0200)]
Added some more Halloween tiles

9 years agoMoved "Wrote screenshot..." message from log_debug to log_info
Ingo Ruhnke [Sat, 4 Oct 2014 13:34:06 +0000 (15:34 +0200)]
Moved "Wrote screenshot..." message from log_debug to log_info

9 years agoSome more Halloween tweaks
Ingo Ruhnke [Thu, 2 Oct 2014 15:34:23 +0000 (17:34 +0200)]
Some more Halloween tweaks

9 years agoAdded Halloween decal and fog
Ingo Ruhnke [Thu, 2 Oct 2014 14:38:51 +0000 (16:38 +0200)]
Added Halloween decal and fog

9 years agoAdded some tiles variation for halloween, darkened border around halloween tiles
Ingo Ruhnke [Thu, 2 Oct 2014 13:41:39 +0000 (15:41 +0200)]
Added some tiles variation for halloween, darkened border around halloween tiles

9 years agoSwitched from 64x64 back to 32x32 tiling, looks a little worse, but is easier to...
Ingo Ruhnke [Thu, 2 Oct 2014 10:47:44 +0000 (12:47 +0200)]
Switched from 64x64 back to 32x32 tiling, looks a little worse, but is easier to deal with in the editor

9 years ago.travis.yml: add fast_finish to matrix, use -j $(nproc) for make
Max Teufel [Wed, 1 Oct 2014 18:59:18 +0000 (20:59 +0200)]
.travis.yml: add fast_finish to matrix, use -j $(nproc) for make
Closes #5

9 years agoMerge branch 'feature/smart-ptr'
Ingo Ruhnke [Wed, 1 Oct 2014 16:43:48 +0000 (18:43 +0200)]
Merge branch 'feature/smart-ptr'

9 years agoRemoved obsolete comment
Ingo Ruhnke [Mon, 1 Sep 2014 23:18:17 +0000 (01:18 +0200)]
Removed obsolete comment

9 years agoReplaced ::iterator stuff with auto
Ingo Ruhnke [Mon, 1 Sep 2014 23:09:40 +0000 (01:09 +0200)]
Replaced ::iterator stuff with auto

9 years agoReplaced Ref and RefCounter with std::shared_ptr<>
Ingo Ruhnke [Mon, 1 Sep 2014 19:37:16 +0000 (21:37 +0200)]
Replaced Ref and RefCounter with std::shared_ptr<>

9 years agoAdded experimental Halloween tiles and backgrounds
Ingo Ruhnke [Wed, 1 Oct 2014 16:39:18 +0000 (18:39 +0200)]
Added experimental Halloween tiles and backgrounds

9 years agoFixed return type foobar in the curl progress callback
Ingo Ruhnke [Mon, 29 Sep 2014 14:25:16 +0000 (16:25 +0200)]
Fixed return type foobar in the curl progress callback

9 years agomissing file
Benjamin Leduc [Sat, 27 Sep 2014 11:48:02 +0000 (11:48 +0000)]
missing file

9 years agoaddition of appdata
Benjamin Leduc [Fri, 26 Sep 2014 21:01:16 +0000 (21:01 +0000)]
addition of appdata

9 years agoTranslation updates
Benjamin Leduc [Thu, 25 Sep 2014 21:08:24 +0000 (21:08 +0000)]
Translation updates

9 years agoUsing un-optimized version of liane.
Tobias Markus [Wed, 17 Sep 2014 20:35:57 +0000 (22:35 +0200)]
Using un-optimized version of liane.
Optimized version had background issues.

9 years agoFix grammar mistake in README.md
Tobias Markus [Wed, 17 Sep 2014 09:41:20 +0000 (11:41 +0200)]
Fix grammar mistake in README.md
[ci skip]

9 years agoUpdate CMake requirement to latest version
Tobias Markus [Mon, 15 Sep 2014 11:59:17 +0000 (13:59 +0200)]
Update CMake requirement to latest version

9 years agoAll environment variables in one line
Tobias Markus [Sun, 14 Sep 2014 15:11:09 +0000 (17:11 +0200)]
All environment variables in one line

9 years agoUsing variables for version numbers in travis.yml
Tobias Markus [Sun, 14 Sep 2014 15:05:06 +0000 (17:05 +0200)]
Using variables for version numbers in travis.yml

9 years agoReset angle before starting kill animation
Tobias Markus [Sat, 13 Sep 2014 09:37:17 +0000 (11:37 +0200)]
Reset angle before starting kill animation

9 years agoUsing j5 for all make statements
Tobias Markus [Wed, 10 Sep 2014 05:43:36 +0000 (07:43 +0200)]
Using j5 for all make statements

9 years ago-j4 for all dependencies
Tobias Markus [Tue, 9 Sep 2014 17:14:42 +0000 (19:14 +0200)]
-j4 for all dependencies

9 years agoRemoving IRC notifications and enabling email notifications to supertux-commit@lists...
Tobias Markus [Mon, 8 Sep 2014 11:54:12 +0000 (13:54 +0200)]
Removing IRC notifications and enabling email notifications to supertux-commit@lists.lethargik.org

9 years agoFixing notifications in travis.yml
Tobias Markus [Mon, 8 Sep 2014 05:50:32 +0000 (07:50 +0200)]
Fixing notifications in travis.yml

9 years agoRemoving branches from travis.yml
Tobias Markus [Sun, 7 Sep 2014 22:39:59 +0000 (00:39 +0200)]
Removing branches from travis.yml

9 years agoAdding build status to README.md
Tobias Markus [Sun, 7 Sep 2014 22:34:14 +0000 (00:34 +0200)]
Adding build status to README.md

9 years agoAdding working .travis.yml file
Tobias Markus [Sun, 7 Sep 2014 22:23:34 +0000 (00:23 +0200)]
Adding working .travis.yml file

9 years agoUpdate requirement about SDL_image to SDL2_image
Tobias Markus [Thu, 4 Sep 2014 08:33:35 +0000 (10:33 +0200)]
Update requirement about SDL_image to SDL2_image

9 years agoUpdate requirement about SDL to SDL2
Tobias Markus [Thu, 4 Sep 2014 08:32:17 +0000 (10:32 +0200)]
Update requirement about SDL to SDL2

9 years agoFixed format string warning in clang
Ingo Ruhnke [Sun, 31 Aug 2014 19:41:23 +0000 (21:41 +0200)]
Fixed format string warning in clang

9 years agoTranslation updates
Benjamin Leduc [Sun, 31 Aug 2014 08:59:47 +0000 (08:59 +0000)]
Translation updates

9 years agoFixed numerous issues that caused errors in clang
Ingo Ruhnke [Sun, 31 Aug 2014 06:12:18 +0000 (08:12 +0200)]
Fixed numerous issues that caused errors in clang

9 years agoReplaced boost::shared_ptr<> with std::shared_ptr<>
Ingo Ruhnke [Sun, 31 Aug 2014 05:42:49 +0000 (07:42 +0200)]
Replaced boost::shared_ptr<> with std::shared_ptr<>

9 years agoDisabled -Wlogical-op, as that fails on clang
Ingo Ruhnke [Sun, 31 Aug 2014 05:34:21 +0000 (07:34 +0200)]
Disabled -Wlogical-op, as that fails on clang

9 years agoSilenced two compiler warnings
Ingo Ruhnke [Sun, 31 Aug 2014 05:13:13 +0000 (07:13 +0200)]
Silenced two compiler warnings

9 years agoConverted tile from grayscale to RGB due to compatibility issues with Flexlay
Ingo Ruhnke [Sat, 30 Aug 2014 18:37:52 +0000 (20:37 +0200)]
Converted tile from grayscale to RGB due to compatibility issues with Flexlay

9 years agoChanged default window size from 800x600 to 1280x800
Ingo Ruhnke [Sat, 30 Aug 2014 17:39:31 +0000 (19:39 +0200)]
Changed default window size from 800x600 to 1280x800

9 years agoDon't clear the keymap when loading from file so that the default config is preserved
Ingo Ruhnke [Fri, 29 Aug 2014 21:04:10 +0000 (23:04 +0200)]
Don't clear the keymap when loading from file so that the default config is preserved

9 years agoFixed resize handling of lightmaps, they are now recreated on resize()
Ingo Ruhnke [Fri, 29 Aug 2014 06:28:38 +0000 (08:28 +0200)]
Fixed resize handling of lightmaps, they are now recreated on resize()

9 years agoFixed SDLLightmap::get_light()
Ingo Ruhnke [Fri, 29 Aug 2014 05:57:07 +0000 (07:57 +0200)]
Fixed SDLLightmap::get_light()

Coordinates were upside down and brought the resolution in line with
OpenGL.

9 years agoAdded missing <array> include to addon/downloader.cpp
Ingo Ruhnke [Thu, 28 Aug 2014 00:57:50 +0000 (02:57 +0200)]
Added missing <array> include to addon/downloader.cpp

9 years agoRemoved made public variables private in JoystickManager and KeyboardManager
Ingo Ruhnke [Thu, 28 Aug 2014 00:56:59 +0000 (02:56 +0200)]
Removed made public variables private in JoystickManager and KeyboardManager

9 years agoSwitched from CURLOPT_XFERINFOFUNCTION back to CURLOPT_PROGRESSFUNCTION, since some...
Ingo Ruhnke [Wed, 27 Aug 2014 21:26:25 +0000 (23:26 +0200)]
Switched from CURLOPT_XFERINFOFUNCTION back to CURLOPT_PROGRESSFUNCTION, since some old cURL versions don't support the former

9 years agoRemoved some obsolete stuff from supertux/globals.hpp
Ingo Ruhnke [Wed, 27 Aug 2014 21:17:25 +0000 (23:17 +0200)]
Removed some obsolete stuff from supertux/globals.hpp

9 years agoDeleted TODO and merged it into http://supertux.lethargik.org/wiki/TODO-List
Ingo Ruhnke [Wed, 27 Aug 2014 20:31:22 +0000 (22:31 +0200)]
Deleted TODO and merged it into supertux.lethargik.org/wiki/TODO-List

9 years agoAdded -Wnon-virtual-dtor and -Wcast-qual warning flags
Ingo Ruhnke [Wed, 27 Aug 2014 19:56:26 +0000 (21:56 +0200)]
Added -Wnon-virtual-dtor and -Wcast-qual warning flags

9 years agoUpdated the TODO a bit
Ingo Ruhnke [Wed, 27 Aug 2014 19:53:43 +0000 (21:53 +0200)]
Updated the TODO a bit

9 years agoOnly refresh menu items that have been created in the JoystickMenu to avoid crash
Ingo Ruhnke [Wed, 27 Aug 2014 08:24:55 +0000 (10:24 +0200)]
Only refresh menu items that have been created in the JoystickMenu to avoid crash

9 years agoFixed Controller enum to string conversion
Ingo Ruhnke [Wed, 27 Aug 2014 08:24:28 +0000 (10:24 +0200)]
Fixed Controller enum to string conversion

9 years agoMade Menu::get_item_by_id(int id) error message sligthly more useful
Ingo Ruhnke [Wed, 27 Aug 2014 08:23:58 +0000 (10:23 +0200)]
Made Menu::get_item_by_id(int id) error message sligthly more useful

9 years agoSplit Controller::PAUSE_MENU into ESCAPE and START, as they need to act different...
Ingo Ruhnke [Wed, 27 Aug 2014 08:12:05 +0000 (10:12 +0200)]
Split Controller::PAUSE_MENU into ESCAPE and START, as they need to act different in some contexts

9 years agoAdded default and cancel button to the Dialog
Ingo Ruhnke [Wed, 27 Aug 2014 07:37:56 +0000 (09:37 +0200)]
Added default and cancel button to the Dialog

9 years agoMerge branch 'feature/download-non-blocking'
Ingo Ruhnke [Tue, 26 Aug 2014 22:58:42 +0000 (00:58 +0200)]
Merge branch 'feature/download-non-blocking'

9 years agoMoved abort() and update() calls into TransferStatus, also fixed abort() handling...
Ingo Ruhnke [Tue, 26 Aug 2014 22:56:32 +0000 (00:56 +0200)]
Moved abort() and update() calls into TransferStatus, also fixed abort() handling, then-callbacks are now called

9 years agoChanged error handling in TransferStatus, then-callbacks are now always called and...
Ingo Ruhnke [Tue, 26 Aug 2014 22:50:48 +0000 (00:50 +0200)]
Changed error handling in TransferStatus, then-callbacks are now always called and have a 'success' flag

9 years agoA first try at error handling in the Downloader
Ingo Ruhnke [Tue, 26 Aug 2014 20:30:22 +0000 (22:30 +0200)]
A first try at error handling in the Downloader

This isn't fully working, as skipping the .then() callbacks skips over
important cleanup and leads to failure further down the line.

9 years agoSave and parse repository index when AddonManager loads
Ingo Ruhnke [Tue, 26 Aug 2014 20:29:08 +0000 (22:29 +0200)]
Save and parse repository index when AddonManager loads

Meaning the user doesn't have to redownload it each time he starts the
game.

9 years agoWait for an explicit "Close" by the user instead of closing the DownloadDialog automa...
Ingo Ruhnke [Tue, 26 Aug 2014 20:00:33 +0000 (22:00 +0200)]
Wait for an explicit "Close" by the user instead of closing the DownloadDialog automatically

Downloads are most of the time rather fast, having the window just pop
up and go away feels a bit irritating.

9 years agoRenamed AddonDialog to DownloadDialog, as it isn't AddonManager specific any more
Ingo Ruhnke [Tue, 26 Aug 2014 19:51:34 +0000 (21:51 +0200)]
Renamed AddonDialog to DownloadDialog, as it isn't AddonManager specific any more

9 years agoRemoved AddonManager::InstallRequest, the data can be hold in the lambda capture...
Ingo Ruhnke [Tue, 26 Aug 2014 19:48:48 +0000 (21:48 +0200)]
Removed AddonManager::InstallRequest, the data can be hold in the lambda capture instead

9 years agoUse a chain of callbacks instead of a single one in TransferStatusPtr
Ingo Ruhnke [Tue, 26 Aug 2014 19:44:58 +0000 (21:44 +0200)]
Use a chain of callbacks instead of a single one in TransferStatusPtr

This allows reusing it in AddonManager and not bothering with creating
it's own, but basically empty InstallStatus.

9 years agoImplemented non-blocking download for the repository index list
Ingo Ruhnke [Tue, 26 Aug 2014 10:55:14 +0000 (12:55 +0200)]
Implemented non-blocking download for the repository index list

9 years agoHandle all numeric characters as fixed width, even in variable spaced fonts
Ingo Ruhnke [Tue, 26 Aug 2014 10:54:08 +0000 (12:54 +0200)]
Handle all numeric characters as fixed width, even in variable spaced fonts

This reduces jitter when numeric values change, such as in the
download status dialog.

9 years agoAdded ugly workaround for Console crash at startup
Ingo Ruhnke [Tue, 26 Aug 2014 10:44:17 +0000 (12:44 +0200)]
Added ugly workaround for Console crash at startup

This is an ugly workaround for a crash at startup. Console::current()
becomes valid before the Console constructor is finished and loading
Surfaces and Fonts wants to write text to the Console, with Fonts that
aren't yet loaded, thus crashing

9 years agoMade AddonDialog output some prettier text, installation of Addons now seem to work
Ingo Ruhnke [Tue, 26 Aug 2014 07:07:52 +0000 (09:07 +0200)]
Made AddonDialog output some prettier text, installation of Addons now seem to work

Error handling is still largely missing for failed downloads and such

9 years agoAdded then-callback to AddonManager and use the then-callback of Downloader
Ingo Ruhnke [Tue, 26 Aug 2014 07:06:41 +0000 (09:06 +0200)]
Added then-callback to AddonManager and use the then-callback of Downloader

9 years agoAdded file writing and then-callback to Downloader
Ingo Ruhnke [Tue, 26 Aug 2014 07:05:30 +0000 (09:05 +0200)]
Added file writing and then-callback to Downloader

9 years agoImplemented delayed destruction of Dialog in MenuManager to avoid "delete this" type...
Ingo Ruhnke [Tue, 26 Aug 2014 07:03:24 +0000 (09:03 +0200)]
Implemented delayed destruction of Dialog in MenuManager to avoid "delete this" type problems

9 years agoRemoved AddonMenu sorting code, since Addons are order dependend they should never...
Ingo Ruhnke [Tue, 26 Aug 2014 06:35:30 +0000 (08:35 +0200)]
Removed AddonMenu sorting code, since Addons are order dependend they should never be sorted

Meaning a skin pack with new graphics might shadow graphic files in
another skin pack. Adding a manual way to reorder addons via Peek_Up/Down keys
might be a good idea.

9 years agoHooked up progress reporting into the AddonDialog, non-blocking downloads are working now
Ingo Ruhnke [Tue, 26 Aug 2014 05:33:15 +0000 (07:33 +0200)]
Hooked up progress reporting into the AddonDialog, non-blocking downloads are working now

Code still misses proper Addon install once the Download is completed

9 years agoReplaced fancy C++11 lambda with old style static function wrap in Downloader
Ingo Ruhnke [Tue, 26 Aug 2014 05:24:44 +0000 (07:24 +0200)]
Replaced fancy C++11 lambda with old style static function wrap in Downloader

The C++11 lambda would work, but the lambda has to be cast to a
C-style function pointer first, cURL however doesn't provide function
pointer definitions for quick and easy casting and since it takes
arguments as va_arg it crashes and burns when passing in a raw lambda.
Old style _wrap is simply easier then casting to the proper function type.

9 years agoAdded AddonDialog and connected it into the whole non-blocking update stuff
Ingo Ruhnke [Tue, 26 Aug 2014 04:59:30 +0000 (06:59 +0200)]
Added AddonDialog and connected it into the whole non-blocking update stuff