supertux.git
10 years agoRemoved unneeded curl includes
Ingo Ruhnke [Wed, 20 Aug 2014 00:03:30 +0000 (02:03 +0200)]
Removed unneeded curl includes

10 years agoSome more AddonManager refactoring
Ingo Ruhnke [Tue, 19 Aug 2014 20:45:24 +0000 (22:45 +0200)]
Some more AddonManager refactoring

10 years agoFirst round of cleanup up the AddonManager a bit
Ingo Ruhnke [Mon, 18 Aug 2014 21:21:39 +0000 (23:21 +0200)]
First round of cleanup up the AddonManager a bit

10 years agoDisable glbinding debug option
Tobias Markus [Fri, 22 Aug 2014 20:47:57 +0000 (22:47 +0200)]
Disable glbinding debug option

10 years agoUpdate translation just for kidding Sydney
Benjamin Leduc [Thu, 21 Aug 2014 02:20:16 +0000 (02:20 +0000)]
Update translation just for kidding Sydney

10 years agoRemove link to happypenguin.org. Site has been discontinued
Tobias Markus [Wed, 20 Aug 2014 11:27:52 +0000 (13:27 +0200)]
Remove link to happypenguin.org. Site has been discontinued

10 years agoFixed mixup in the config reading that caused keyboard to reset, also use reference...
Ingo Ruhnke [Wed, 20 Aug 2014 01:47:40 +0000 (03:47 +0200)]
Fixed mixup in the config reading that caused keyboard to reset, also use reference instead of pointer in JoystickConfig

10 years agoUpdate keys for cheat menu and console only when items are enabled. Fixes #1062.
Wolfgang Becker [Tue, 19 Aug 2014 17:42:37 +0000 (19:42 +0200)]
Update keys for cheat menu and console only when items are enabled. Fixes #1062.

10 years agoOptional glbinding as OpenGL binding
Willy Scheibel [Tue, 19 Aug 2014 14:08:39 +0000 (16:08 +0200)]
Optional glbinding as OpenGL binding

10 years agohelp menu translation per line
Benjamin Leduc [Tue, 19 Aug 2014 14:08:12 +0000 (14:08 +0000)]
help menu translation per line

10 years agoMerge branch 'feature/developer-mode'
Ingo Ruhnke [Tue, 19 Aug 2014 00:46:40 +0000 (02:46 +0200)]
Merge branch 'feature/developer-mode'

10 years agoRemoved some remaining empty 'void Menu::check_menu()' calls
Ingo Ruhnke [Tue, 19 Aug 2014 00:44:20 +0000 (02:44 +0200)]
Removed some remaining empty 'void Menu::check_menu()' calls

10 years agoAdded switch to turn off developer mode to the OptionMenu
Ingo Ruhnke [Tue, 19 Aug 2014 00:35:12 +0000 (02:35 +0200)]
Added switch to turn off developer mode to the OptionMenu

10 years agoAdded cheat menu keyboard and joystick bindings, only visible in developer mode
Ingo Ruhnke [Mon, 18 Aug 2014 22:18:29 +0000 (00:18 +0200)]
Added cheat menu keyboard and joystick bindings, only visible in developer mode

10 years agoAdded --developer option, also Ctrl-F2, which enabled cheats
Ingo Ruhnke [Mon, 18 Aug 2014 22:08:48 +0000 (00:08 +0200)]
Added --developer option, also Ctrl-F2, which enabled cheats

10 years agoFixed mixup between Win32's "supertux2" and Linux/MacOSX ".supertux2" directory name
Ingo Ruhnke [Tue, 19 Aug 2014 00:16:52 +0000 (02:16 +0200)]
Fixed mixup between Win32's "supertux2" and Linux/MacOSX ".supertux2" directory name

10 years agoallow localization of apple cmd keys
Benjamin Leduc [Mon, 18 Aug 2014 22:44:56 +0000 (22:44 +0000)]
allow localization of apple cmd keys

10 years agoRemoved useless Makefile
Ingo Ruhnke [Mon, 18 Aug 2014 21:35:51 +0000 (23:35 +0200)]
Removed useless Makefile

10 years agoSmall improvement to PhysfsSubsystem debug output
Ingo Ruhnke [Mon, 18 Aug 2014 19:05:46 +0000 (21:05 +0200)]
Small improvement to PhysfsSubsystem debug output

10 years agoAdded --datadir/--userdir command line arguments and SUPERTUX2_DATA_DIR environment...
Ingo Ruhnke [Mon, 18 Aug 2014 19:01:35 +0000 (21:01 +0200)]
Added --datadir/--userdir command line arguments and SUPERTUX2_DATA_DIR environment variable (probably redundant)

10 years agoCleaned up Physfs/filesystem initialisation
Ingo Ruhnke [Mon, 18 Aug 2014 09:35:44 +0000 (11:35 +0200)]
Cleaned up Physfs/filesystem initialisation

10 years agoAdded FileSystem::exists(), FileSystem::is_directory() and FileSystem::mkdir()
Ingo Ruhnke [Mon, 18 Aug 2014 09:33:04 +0000 (11:33 +0200)]
Added FileSystem::exists(), FileSystem::is_directory() and FileSystem::mkdir()

10 years agoMinor cleanup
Ingo Ruhnke [Mon, 18 Aug 2014 09:32:06 +0000 (11:32 +0200)]
Minor cleanup

10 years agoRemoved binreloc support, SDL2 provides that functionality now with SDL_GetBasePath()
Ingo Ruhnke [Mon, 18 Aug 2014 08:36:00 +0000 (10:36 +0200)]
Removed binreloc support, SDL2 provides that functionality now with SDL_GetBasePath()

10 years agoRemoved dependency between CommandLineArguments and Physfs
Ingo Ruhnke [Mon, 18 Aug 2014 08:10:14 +0000 (10:10 +0200)]
Removed dependency between CommandLineArguments and Physfs

10 years agoRemoved some old .svn related stuff from CMakeLists
Ingo Ruhnke [Mon, 18 Aug 2014 08:09:27 +0000 (10:09 +0200)]
Removed some old .svn related stuff from CMakeLists

10 years agoFixed AddonManager load/save of disabled addon files
Ingo Ruhnke [Mon, 18 Aug 2014 03:23:16 +0000 (05:23 +0200)]
Fixed AddonManager load/save of disabled addon files

10 years agoSeparate JoystickConfig out into a separate class that can be stored in the global...
Ingo Ruhnke [Mon, 18 Aug 2014 02:50:10 +0000 (04:50 +0200)]
Separate JoystickConfig out into a separate class that can be stored in the global Config object

This should fix joystick/keyboard load/save support which broke in one of the last few commits

10 years agoSeparate KeyboardConfig out into a separate class that can be stored in the global...
Ingo Ruhnke [Mon, 18 Aug 2014 02:08:08 +0000 (04:08 +0200)]
Separate KeyboardConfig out into a separate class that can be stored in the global Config object

10 years agoAdded m_ prefixes to TextureManager
Ingo Ruhnke [Mon, 18 Aug 2014 01:24:39 +0000 (03:24 +0200)]
Added m_ prefixes to TextureManager

10 years agoFixed initialisation order issue in GLVideoSystem
Ingo Ruhnke [Mon, 18 Aug 2014 00:47:43 +0000 (02:47 +0200)]
Fixed initialisation order issue in GLVideoSystem

10 years agoTurned AddonManager into a Currenton
Ingo Ruhnke [Sun, 17 Aug 2014 21:52:12 +0000 (23:52 +0200)]
Turned AddonManager into a Currenton

There is currently a bit of a dependency problem between InputManager,
AddonManager and Config reading that prevents reading of config on
startup.

10 years agoMerge branch 'feature/init-cleanup'
Ingo Ruhnke [Sun, 17 Aug 2014 20:34:44 +0000 (22:34 +0200)]
Merge branch 'feature/init-cleanup'

10 years agoAdded Scripting class to bundle up all the Squirrel init code
Ingo Ruhnke [Sun, 17 Aug 2014 19:51:26 +0000 (21:51 +0200)]
Added Scripting class to bundle up all the Squirrel init code

10 years agoUse more RAII in initialisation code
Ingo Ruhnke [Sun, 17 Aug 2014 19:27:57 +0000 (21:27 +0200)]
Use more RAII in initialisation code

10 years agoMoved global dictionary into gettext.cpp, no need to have it in globals.cpp
Ingo Ruhnke [Sun, 17 Aug 2014 19:12:22 +0000 (21:12 +0200)]
Moved global dictionary into gettext.cpp, no need to have it in globals.cpp

10 years agoSplit of the line buffer from Console into ConsoleBuffer class
Ingo Ruhnke [Sun, 17 Aug 2014 19:11:41 +0000 (21:11 +0200)]
Split of the line buffer from Console into ConsoleBuffer class

This fixes an issue where the Console got destructed and it's graphics
free'd after the VideoSystem was already gone, thus crash on game
exit.

10 years agoAdded m_ prefixes to Console
Ingo Ruhnke [Sun, 17 Aug 2014 18:38:27 +0000 (20:38 +0200)]
Added m_ prefixes to Console

10 years agoTurned a lot of other global objects into Currentons
Ingo Ruhnke [Sun, 17 Aug 2014 18:20:35 +0000 (20:20 +0200)]
Turned a lot of other global objects into Currentons

10 years agoMade Console into a Currenton
Ingo Ruhnke [Sun, 17 Aug 2014 17:05:07 +0000 (19:05 +0200)]
Made Console into a Currenton

10 years agoCleaned up VideoSystem initalisation
Ingo Ruhnke [Sun, 17 Aug 2014 04:35:40 +0000 (06:35 +0200)]
Cleaned up VideoSystem initalisation

This will make SuperTux crash at exit at the moment, as deinit gets
out of order in Main::run()

10 years agoScale credits background image to whole screen size
Tobias Markus [Sun, 17 Aug 2014 15:11:24 +0000 (17:11 +0200)]
Scale credits background image to whole screen size

10 years agoMade code -Wshadow clean, missed a bunch of issues in the last commit
Ingo Ruhnke [Sun, 17 Aug 2014 04:23:28 +0000 (06:23 +0200)]
Made code -Wshadow clean, missed a bunch of issues in the last commit

10 years agoMade code -Wshadow clean
Ingo Ruhnke [Sun, 17 Aug 2014 03:06:11 +0000 (05:06 +0200)]
Made code -Wshadow clean

10 years agoAdded some m_ prefixes to member variables in GLRenderer and related classes
Ingo Ruhnke [Sun, 17 Aug 2014 02:47:26 +0000 (04:47 +0200)]
Added some m_ prefixes to member variables in GLRenderer and related classes

10 years agoAdded some m_ prefixes to member variables in SDLRenderer and related classes
Ingo Ruhnke [Sun, 17 Aug 2014 02:33:06 +0000 (04:33 +0200)]
Added some m_ prefixes to member variables in SDLRenderer and related classes

10 years agoAdded Renderer::start_draw()/end_draw() to fix scale issue issue SDLRenderer/SDLLightmap
Ingo Ruhnke [Sun, 17 Aug 2014 02:18:53 +0000 (04:18 +0200)]
Added Renderer::start_draw()/end_draw() to fix scale issue issue SDLRenderer/SDLLightmap

10 years agoMoved Block code to block.cpp, was in the wrong file, i.e. bonus_block.cpp
Ingo Ruhnke [Sun, 17 Aug 2014 01:46:23 +0000 (03:46 +0200)]
Moved Block code to block.cpp, was in the wrong file, i.e. bonus_block.cpp

10 years agoMade conversion Vector -> Sizef explicit, just to be on the safe side
Ingo Ruhnke [Sun, 17 Aug 2014 01:45:44 +0000 (03:45 +0200)]
Made conversion Vector -> Sizef explicit, just to be on the safe side

10 years agoRemoved some superfluous Vector() calls, source object is already a Vector
Ingo Ruhnke [Sun, 17 Aug 2014 01:45:15 +0000 (03:45 +0200)]
Removed some superfluous Vector() calls, source object is already a Vector

10 years agoFixed incorrect size in Sprite::draw_part()
Ingo Ruhnke [Sun, 17 Aug 2014 01:44:24 +0000 (03:44 +0200)]
Fixed incorrect size in Sprite::draw_part()

This caused breaking blocks look weird

10 years agoRender SDL lightmaps at lower resolutions, as specified by LIGHTMAP_DIV
Ingo Ruhnke [Sun, 17 Aug 2014 01:09:35 +0000 (03:09 +0200)]
Render SDL lightmaps at lower resolutions, as specified by LIGHTMAP_DIV

10 years agoDecode letters from argv as UTF-8 in tools/font-generator.py
Ingo Ruhnke [Sun, 17 Aug 2014 00:14:57 +0000 (02:14 +0200)]
Decode letters from argv as UTF-8 in tools/font-generator.py

10 years agoMoved all duplicated drawing code from GLLightmap and GLRenderer into new GLPainter...
Ingo Ruhnke [Sat, 16 Aug 2014 20:43:40 +0000 (22:43 +0200)]
Moved all duplicated drawing code from GLLightmap and GLRenderer into new GLPainter class

10 years agoFixed hitboxes/hotspot for WorldMap Tux
Ingo Ruhnke [Sat, 16 Aug 2014 20:41:32 +0000 (22:41 +0200)]
Fixed hitboxes/hotspot for WorldMap Tux

10 years agoMerge branch 'feature/surface-scaling'
Ingo Ruhnke [Sat, 16 Aug 2014 19:56:08 +0000 (21:56 +0200)]
Merge branch 'feature/surface-scaling'

10 years agoReenabled TitleScreen border, looks a bit terrible in 1280x720, as it was designed...
Ingo Ruhnke [Sat, 16 Aug 2014 19:55:21 +0000 (21:55 +0200)]
Reenabled TitleScreen border, looks a bit terrible in 1280x720, as it was designed for 800x600

10 years agoChanged DrawingContext::draw_surface_part() to handle srcrect/dstrect, instead of...
Ingo Ruhnke [Sat, 16 Aug 2014 19:54:16 +0000 (21:54 +0200)]
Changed DrawingContext::draw_surface_part() to handle srcrect/dstrect, instead of just srcrect/dstpos, this allows surface scaling

10 years agoFixed code that broke due to changes to Rectf and Sizef
Ingo Ruhnke [Sat, 16 Aug 2014 19:52:34 +0000 (21:52 +0200)]
Fixed code that broke due to changes to Rectf and Sizef

10 years agoReturn size as Sizef instead of Vector in Rectf
Ingo Ruhnke [Sat, 16 Aug 2014 19:49:32 +0000 (21:49 +0200)]
Return size as Sizef instead of Vector in Rectf

10 years agoAdded conversion from and to Vector to Sizef
Ingo Ruhnke [Sat, 16 Aug 2014 19:49:12 +0000 (21:49 +0200)]
Added conversion from and to Vector to Sizef

10 years agoImproved markdown syntax so it's more readable on command line, fixes #1057
Ingo Ruhnke [Sat, 16 Aug 2014 19:47:14 +0000 (21:47 +0200)]
Improved markdown syntax so it's more readable on command line, fixes #1057

10 years agoMerge branch 'master' of https://code.google.com/p/supertux
Benjamin Leduc [Sat, 16 Aug 2014 03:01:20 +0000 (03:01 +0000)]
Merge branch 'master' of https://code.google.com/p/supertux

10 years agorestore mandarine specific symbols
Benjamin Leduc [Sat, 16 Aug 2014 02:59:57 +0000 (02:59 +0000)]
restore mandarine specific symbols

10 years agoPrevent menu calls while another menu is active
Ingo Ruhnke [Sat, 16 Aug 2014 01:12:22 +0000 (03:12 +0200)]
Prevent menu calls while another menu is active

10 years agoAdded WorldmapCheatMenu (grow/fire/snow/etc., mark levels as solved)
Ingo Ruhnke [Fri, 15 Aug 2014 20:44:50 +0000 (22:44 +0200)]
Added WorldmapCheatMenu (grow/fire/snow/etc., mark levels as solved)

10 years agoRemoved assert(active_item < int(items.size())); as that is no longer save to call...
Ingo Ruhnke [Fri, 15 Aug 2014 09:03:21 +0000 (11:03 +0200)]
Removed assert(active_item < int(items.size())); as that is no longer save to call due to Menu being potentially deleted at that point

10 years agoRemoved old Menu::check_menu() and replaced it with Menu::menu_action()
Ingo Ruhnke [Fri, 15 Aug 2014 08:17:37 +0000 (10:17 +0200)]
Removed old Menu::check_menu() and replaced it with Menu::menu_action()

10 years agoClear menu stack on MenuManager::set_menu() to avoid accidentally stacking menus
Ingo Ruhnke [Fri, 15 Aug 2014 08:07:26 +0000 (10:07 +0200)]
Clear menu stack on MenuManager::set_menu() to avoid accidentally stacking menus

10 years agoAdded simple cheat menu to grow/fire/ice/shrink/... Tux
Ingo Ruhnke [Fri, 15 Aug 2014 07:43:41 +0000 (09:43 +0200)]
Added simple cheat menu to grow/fire/ice/shrink/... Tux

10 years agoTranslations updates
Benjamin Leduc [Fri, 15 Aug 2014 00:07:47 +0000 (00:07 +0000)]
Translations updates

10 years agoTranslations updates
Benjamin Leduc [Thu, 14 Aug 2014 23:49:48 +0000 (23:49 +0000)]
Translations updates

10 years agoReintroduced load_worldmap(), load_level() and save_state(), as some addon levels...
Ingo Ruhnke [Thu, 14 Aug 2014 23:20:38 +0000 (01:20 +0200)]
Reintroduced load_worldmap(), load_level() and save_state(), as some addon levels are using them (untested)

10 years agoFixed compiler warning about missing return
Ingo Ruhnke [Thu, 14 Aug 2014 23:19:57 +0000 (01:19 +0200)]
Fixed compiler warning about missing return

10 years agoMerge branch 'master' of https://code.google.com/p/supertux
Benjamin Leduc [Thu, 14 Aug 2014 22:53:51 +0000 (22:53 +0000)]
Merge branch 'master' of https://code.google.com/p/supertux
Well
I work in same time than others :p

10 years agoImprove of chiness taiwan and mandarin font
Benjamin Leduc [Thu, 14 Aug 2014 22:51:30 +0000 (22:51 +0000)]
Improve of chiness taiwan and mandarin font

10 years agoRemove SDL 1.3 from TODO list (done with update to SDL 2.0)
Tobias Markus [Thu, 14 Aug 2014 22:04:54 +0000 (00:04 +0200)]
Remove SDL 1.3 from TODO list (done with update to SDL 2.0)

10 years agoRemoved unneeded code, sq_newslot() will override a given slot, a separate sq_deletes...
Ingo Ruhnke [Thu, 14 Aug 2014 05:18:59 +0000 (07:18 +0200)]
Removed unneeded code, sq_newslot() will override a given slot, a separate sq_deleteslot() isn't needed

10 years agoGenerator some new chinese fonts, just normal sized ones for now
Ingo Ruhnke [Thu, 14 Aug 2014 05:01:05 +0000 (07:01 +0200)]
Generator some new chinese fonts, just normal sized ones for now

Created with:

tools/font-generator.py --columns 32 --font-size 16  --glyph-width 20 --glyph-height 20 --shadow -o data/images/engine/fonts/zh/shadow.png \
  --letters-from-file data/fonts/zh-letters

tools/font-generator.py --columns 32 --font-size 16  --glyph-width 20 --glyph-height 20 --outline -o data/images/engine/fonts/zh/white.png \
  --letters-from-file data/fonts/zh-letters

10 years agoRemoved space from zh-white.stf letter list
Ingo Ruhnke [Thu, 14 Aug 2014 04:59:56 +0000 (06:59 +0200)]
Removed space from zh-white.stf letter list

10 years agoAdded lots of command line options to font-generator.py
Ingo Ruhnke [Thu, 14 Aug 2014 04:59:29 +0000 (06:59 +0200)]
Added lots of command line options to font-generator.py

10 years agoMerge branch 'feature/savegame'
Ingo Ruhnke [Thu, 14 Aug 2014 03:24:14 +0000 (05:24 +0200)]
Merge branch 'feature/savegame'

10 years agoFill the savegame with all levels from a levelset on start, so the ContribMenu shows...
Ingo Ruhnke [Thu, 14 Aug 2014 03:19:46 +0000 (05:19 +0200)]
Fill the savegame with all levels from a levelset on start, so the ContribMenu shows the correct number

10 years agoRemoved erroneous sq_pop(), in Squirrel3 sq_deleteslot() does always pop the argument...
Ingo Ruhnke [Thu, 14 Aug 2014 03:04:42 +0000 (05:04 +0200)]
Removed erroneous sq_pop(), in Squirrel3 sq_deleteslot() does always pop the argument, even on failure

10 years agoReplaced deprecated sq_createslot() with sq_newslot()
Ingo Ruhnke [Thu, 14 Aug 2014 02:57:29 +0000 (04:57 +0200)]
Replaced deprecated sq_createslot() with sq_newslot()

10 years agoRemoved useless comment
Ingo Ruhnke [Thu, 14 Aug 2014 02:57:07 +0000 (04:57 +0200)]
Removed useless comment

10 years agoHacked together basic support for Levelset saving
Ingo Ruhnke [Thu, 14 Aug 2014 02:32:34 +0000 (04:32 +0200)]
Hacked together basic support for Levelset saving

10 years agoRenamed GameManager::start_game() to GameManager::start_worldmap()
Ingo Ruhnke [Wed, 13 Aug 2014 21:35:20 +0000 (23:35 +0200)]
Renamed GameManager::start_game() to GameManager::start_worldmap()

10 years agoFixed state table creation issue on loading a savegame
Ingo Ruhnke [Wed, 13 Aug 2014 21:22:55 +0000 (23:22 +0200)]
Fixed state table creation issue on loading a savegame

10 years agoSome initial work on getting load/save working for Levelsets
Ingo Ruhnke [Wed, 13 Aug 2014 21:12:13 +0000 (23:12 +0200)]
Some initial work on getting load/save working for Levelsets

load() should work, save() not yet, as there is nobody updating the state after completing a level

10 years agoRenamed WorldState to Savegame and implemented basic load/save for Worldmaps and...
Ingo Ruhnke [Wed, 13 Aug 2014 19:50:47 +0000 (21:50 +0200)]
Renamed WorldState to Savegame and implemented basic load/save for Worldmaps and Levelsets

Levelsets themselves are still broken and don't display properly in the menu
Worlds without any savegame will be displayed with a *NEW*

10 years agoMoved Levelset into it's own class, pass WorldState around instead of PlayerState...
Ingo Ruhnke [Wed, 13 Aug 2014 05:26:41 +0000 (07:26 +0200)]
Moved Levelset into it's own class, pass WorldState around instead of PlayerState, removed .../world.nut support

Some code is currently disabled with "#ifdef GRUMBEL"

10 years agoRemoved load/save functions from scripting interface
Ingo Ruhnke [Wed, 13 Aug 2014 04:08:57 +0000 (06:08 +0200)]
Removed load/save functions from scripting interface

10 years agoRemoved "data/levels/world1/world.nut", as all the load/save it does should really...
Ingo Ruhnke [Wed, 13 Aug 2014 03:53:05 +0000 (05:53 +0200)]
Removed "data/levels/world1/world.nut", as all the load/save it does should really be on the C++ side

10 years agoFixed compiler warning in Squirrel
Ingo Ruhnke [Thu, 14 Aug 2014 00:43:26 +0000 (02:43 +0200)]
Fixed compiler warning in Squirrel

10 years agoFixed crash due to DrawingRequestData being cast to the wrong type
Ingo Ruhnke [Wed, 13 Aug 2014 17:18:38 +0000 (19:18 +0200)]
Fixed crash due to DrawingRequestData being cast to the wrong type

10 years agoRevert "Correctly scale ice border / frame to screen size, fixes bug #620"
Tobias Markus [Wed, 13 Aug 2014 16:32:05 +0000 (18:32 +0200)]
Revert "Correctly scale ice border / frame to screen size, fixes bug #620"

This reverts commit 3c0ed29ac3b6f8609f9735855cef14aa572d8a51.

Revert until problem with OpenGL renderer is fixed that distorts image.

10 years agoFix persistent memory leak in GameSession::get_demo_random_seed()
Tobias Markus [Wed, 13 Aug 2014 15:08:44 +0000 (17:08 +0200)]
Fix persistent memory leak in GameSession::get_demo_random_seed()

10 years agoCorrectly scale ice border / frame to screen size, fixes bug #620
Tobias Markus [Wed, 13 Aug 2014 13:18:56 +0000 (15:18 +0200)]
Correctly scale ice border / frame to screen size, fixes bug #620

10 years agoFix for SDL double-reporting display modes
Tobias Markus [Wed, 13 Aug 2014 12:29:13 +0000 (14:29 +0200)]
Fix for SDL double-reporting display modes