supertux.git
10 years agoMoved TitleScreen::get_level_name() into GameManager, not a great place either, but...
Ingo Ruhnke [Mon, 11 Aug 2014 03:08:50 +0000 (05:08 +0200)]
Moved TitleScreen::get_level_name() into GameManager, not a great place either, but a little better

10 years agoFurther filename untangling in World class
Ingo Ruhnke [Sun, 10 Aug 2014 21:54:23 +0000 (23:54 +0200)]
Further filename untangling in World class

10 years agoAdded FileSystem::join("dir", "file") -> "dir/file"
Ingo Ruhnke [Sun, 10 Aug 2014 21:52:16 +0000 (23:52 +0200)]
Added FileSystem::join("dir", "file") -> "dir/file"

10 years agoCleaned up the file handling in World, Worlds are now loaded by directory name instea...
Ingo Ruhnke [Sun, 10 Aug 2014 21:43:52 +0000 (23:43 +0200)]
Cleaned up the file handling in World, Worlds are now loaded by directory name instead of ".../info" filename

10 years agoMoved savegame name generation into World class and made it automatic, moved folder...
Ingo Ruhnke [Sun, 10 Aug 2014 21:25:05 +0000 (23:25 +0200)]
Moved savegame name generation into World class and made it automatic, moved folder creation into World::save_state()

10 years agoOnly clear Currenton pointer when the object is the one holding it
Ingo Ruhnke [Sun, 10 Aug 2014 21:23:18 +0000 (23:23 +0200)]
Only clear Currenton pointer when the object is the one holding it

10 years agoMinor cleanup in World, replaced global scripting::global_vm with local variable vm
Ingo Ruhnke [Sun, 10 Aug 2014 20:59:23 +0000 (22:59 +0200)]
Minor cleanup in World, replaced global scripting::global_vm with local variable vm

10 years agoMoved World loading into a factory method World::load()
Ingo Ruhnke [Sun, 10 Aug 2014 20:52:49 +0000 (22:52 +0200)]
Moved World loading into a factory method World::load()

10 years agoAdded some m_ prefixes and made variables private in World
Ingo Ruhnke [Sun, 10 Aug 2014 20:31:55 +0000 (22:31 +0200)]
Added some m_ prefixes and made variables private in World

10 years agoDisabled -Wabi in CMakeLists.txt
Ingo Ruhnke [Sun, 10 Aug 2014 19:35:48 +0000 (21:35 +0200)]
Disabled -Wabi in CMakeLists.txt

10 years agoCleaned up the World class a bit
Ingo Ruhnke [Sun, 10 Aug 2014 16:31:27 +0000 (18:31 +0200)]
Cleaned up the World class a bit

10 years agoMerge branch 'feature/argparse'
Ingo Ruhnke [Mon, 11 Aug 2014 22:20:46 +0000 (00:20 +0200)]
Merge branch 'feature/argparse'

10 years agoAdded --debug and --verbose command line arguments
Ingo Ruhnke [Mon, 11 Aug 2014 22:12:46 +0000 (00:12 +0200)]
Added --debug and --verbose command line arguments

10 years agoFixed compiler warnings due to new loglevel aware log macro
Ingo Ruhnke [Mon, 11 Aug 2014 21:53:48 +0000 (23:53 +0200)]
Fixed compiler warnings due to new loglevel aware log macro

10 years agoAdded support for different log levels
Ingo Ruhnke [Mon, 11 Aug 2014 21:53:14 +0000 (23:53 +0200)]
Added support for different log levels

10 years agoAdded another note about comments to CODINGSTYLE
Ingo Ruhnke [Mon, 11 Aug 2014 21:41:04 +0000 (23:41 +0200)]
Added another note about comments to CODINGSTYLE

10 years agoMoved argument parsing into CommandLineArguments
Ingo Ruhnke [Mon, 11 Aug 2014 21:34:45 +0000 (23:34 +0200)]
Moved argument parsing into CommandLineArguments

10 years agoRemoved unused function prototype
Ingo Ruhnke [Mon, 11 Aug 2014 21:21:06 +0000 (23:21 +0200)]
Removed unused function prototype

10 years agoUpdated email address, grumbel@gmx.de -> grumbel@gmail.com
Ingo Ruhnke [Mon, 11 Aug 2014 20:05:45 +0000 (22:05 +0200)]
Updated email address, grumbel@gmx.de -> grumbel@gmail.com

10 years agoAdded missing include to trigger/door.cpp, fixes 0000866
Ingo Ruhnke [Mon, 11 Aug 2014 06:05:56 +0000 (08:05 +0200)]
Added missing include to trigger/door.cpp, fixes 0000866

10 years agoReduced texture from 1024x1024 to 128x128, no need to have it that big
Ingo Ruhnke [Mon, 11 Aug 2014 05:03:07 +0000 (07:03 +0200)]
Reduced texture from 1024x1024 to 128x128, no need to have it that big

10 years agoCODINGSTYLE: avoid spaces at the end of lines
Ingo Ruhnke [Sun, 10 Aug 2014 21:26:17 +0000 (23:26 +0200)]
CODINGSTYLE: avoid spaces at the end of lines

10 years agoAdded rule to name variables m_*/g_*/s_* to CODINGSTYLE, should make naming conflicts...
Ingo Ruhnke [Sun, 10 Aug 2014 17:55:51 +0000 (19:55 +0200)]
Added rule to name variables m_*/g_*/s_* to CODINGSTYLE, should make naming conflicts less likely and make -Wshadow more useful

10 years agoMade WARNING build option usable again
Ingo Ruhnke [Sun, 10 Aug 2014 17:46:54 +0000 (19:46 +0200)]
Made WARNING build option usable again

* disabled compiler warning that currently make the build fail
* made warnings specific to the supertux2 target
* split of .c code into separate target, as gcc doesn't like C++ warning flags for C files
* fixed a few -Weffc++ issues in the code

10 years agoMerge branch 'feature/menu-cleanup'
Ingo Ruhnke [Sun, 10 Aug 2014 04:09:32 +0000 (06:09 +0200)]
Merge branch 'feature/menu-cleanup'

10 years agoClear menu stack when changing languages to force recreation of menus with the correc...
Ingo Ruhnke [Sun, 10 Aug 2014 03:56:41 +0000 (05:56 +0200)]
Clear menu stack when changing languages to force recreation of menus with the correct language

10 years agoDisplay number of solved levels in ContribMenu, kind of ugly patch, save system needs...
Ingo Ruhnke [Sun, 10 Aug 2014 03:43:09 +0000 (05:43 +0200)]
Display number of solved levels in ContribMenu, kind of ugly patch, save system needs a refactor

10 years agoHighlight the currently active profile in ProfileMenu
Ingo Ruhnke [Sun, 10 Aug 2014 01:29:44 +0000 (03:29 +0200)]
Highlight the currently active profile in ProfileMenu

10 years agoLoad and save current profile to config file
Ingo Ruhnke [Sun, 10 Aug 2014 01:29:28 +0000 (03:29 +0200)]
Load and save current profile to config file

10 years agoRemoved unimplemented "Profiles on Startup"
Ingo Ruhnke [Sun, 10 Aug 2014 01:29:06 +0000 (03:29 +0200)]
Removed unimplemented "Profiles on Startup"

10 years agoFixed issue with MainMenu stack on top of the WorldmapMenu, might be worth to make...
Ingo Ruhnke [Sun, 10 Aug 2014 00:44:52 +0000 (02:44 +0200)]
Fixed issue with MainMenu stack on top of the WorldmapMenu, might be worth to make MenuManager private to the Screen

10 years agoImplemented Menu::on_window_resize()
Ingo Ruhnke [Sun, 10 Aug 2014 00:35:23 +0000 (02:35 +0200)]
Implemented Menu::on_window_resize()

10 years agoRenamed MenuManager::recalc_pos() -> MenuManager::on_window_resize() and Menu::update...
Ingo Ruhnke [Sun, 10 Aug 2014 00:12:20 +0000 (02:12 +0200)]
Renamed MenuManager::recalc_pos() -> MenuManager::on_window_resize() and Menu::update() -> Menu::process_input()

10 years agoImplemented MenuManager::refresh() so that joystick/keyboard_manager have something...
Ingo Ruhnke [Sat, 9 Aug 2014 19:57:51 +0000 (21:57 +0200)]
Implemented MenuManager::refresh() so that joystick/keyboard_manager have something to call when key bindings change

10 years agoOnly show language and profile options in main menu, not when using the options in...
Ingo Ruhnke [Sat, 9 Aug 2014 19:46:32 +0000 (21:46 +0200)]
Only show language and profile options in main menu, not when using the options in game

10 years agoReimplemented menu transition effects
Ingo Ruhnke [Sat, 9 Aug 2014 19:39:06 +0000 (21:39 +0200)]
Reimplemented menu transition effects

10 years agoFurther cleanup in the MenuManager
Ingo Ruhnke [Sat, 9 Aug 2014 05:53:39 +0000 (07:53 +0200)]
Further cleanup in the MenuManager

10 years agoRemoved some disabled code
Ingo Ruhnke [Sat, 9 Aug 2014 05:52:58 +0000 (07:52 +0200)]
Removed some disabled code

10 years agoAdded GameManager class to keep track of the World objects, should fix the crashing...
Ingo Ruhnke [Sat, 9 Aug 2014 04:51:47 +0000 (06:51 +0200)]
Added GameManager class to keep track of the World objects, should fix the crashing, menu transition effect still missing

10 years agoCleaned up MenuManager some more, some ownership issues remain, so things will crash...
Ingo Ruhnke [Sat, 9 Aug 2014 02:56:31 +0000 (04:56 +0200)]
Cleaned up MenuManager some more, some ownership issues remain, so things will crash right now

10 years agoSimplifying the Menu API a bit
Ingo Ruhnke [Fri, 8 Aug 2014 22:07:38 +0000 (00:07 +0200)]
Simplifying the Menu API a bit

10 years agoMinor cleanup
Ingo Ruhnke [Fri, 8 Aug 2014 21:53:42 +0000 (23:53 +0200)]
Minor cleanup

10 years agoSwitched from passing pointers around to using numeric MenuIds and a factory class
Ingo Ruhnke [Fri, 8 Aug 2014 19:20:27 +0000 (21:20 +0200)]
Switched from passing pointers around to using numeric MenuIds and a factory class

10 years agoAdded MenuManager::draw()
Ingo Ruhnke [Fri, 8 Aug 2014 18:18:31 +0000 (20:18 +0200)]
Added MenuManager::draw()

10 years agoCleaned up some function names in MenuManager
Ingo Ruhnke [Fri, 8 Aug 2014 18:14:53 +0000 (20:14 +0200)]
Cleaned up some function names in MenuManager

10 years agoUse std::unique_ptr<> in ContribMenu
Ingo Ruhnke [Fri, 8 Aug 2014 19:32:52 +0000 (21:32 +0200)]
Use std::unique_ptr<> in ContribMenu

10 years agoMerge branch 'feature/menu-cleanup'
Ingo Ruhnke [Fri, 8 Aug 2014 04:56:05 +0000 (06:56 +0200)]
Merge branch 'feature/menu-cleanup'

10 years agoFixed crash when exiting menu and recalc_pos/all_menus
Ingo Ruhnke [Fri, 8 Aug 2014 04:16:52 +0000 (06:16 +0200)]
Fixed crash when exiting menu and recalc_pos/all_menus

10 years agoMinor code cleanup
Ingo Ruhnke [Fri, 8 Aug 2014 04:05:08 +0000 (06:05 +0200)]
Minor code cleanup

10 years agoUse std::unique_ptr<> in ScreenManager
Ingo Ruhnke [Fri, 8 Aug 2014 02:56:16 +0000 (04:56 +0200)]
Use std::unique_ptr<> in ScreenManager

10 years agoMoved menu code frome GameSession and Worldmap into the proper Menu::check_menu(...
Ingo Ruhnke [Fri, 8 Aug 2014 02:02:52 +0000 (04:02 +0200)]
Moved menu code frome GameSession and Worldmap into the proper Menu::check_menu() calls

10 years agoTurned MenuStorage into a proper class
Ingo Ruhnke [Fri, 8 Aug 2014 01:20:03 +0000 (03:20 +0200)]
Turned MenuStorage into a proper class

10 years agoTurned MenuManager into a proper class instead of just a collection of static functio...
Ingo Ruhnke [Fri, 8 Aug 2014 00:50:01 +0000 (02:50 +0200)]
Turned MenuManager into a proper class instead of just a collection of static functions, added std::unique_ptr<> to Menu

10 years agoRemoved some unused code from Console
Ingo Ruhnke [Fri, 8 Aug 2014 00:05:44 +0000 (02:05 +0200)]
Removed some unused code from Console

10 years agoMerge button and stick input gracefully in GameControllerManager
Ingo Ruhnke [Thu, 7 Aug 2014 02:10:07 +0000 (04:10 +0200)]
Merge button and stick input gracefully in GameControllerManager

10 years agoFixed missing SDL_WINDOW_RESIZABLE flag in GLRenderer
Ingo Ruhnke [Thu, 7 Aug 2014 00:19:49 +0000 (02:19 +0200)]
Fixed missing SDL_WINDOW_RESIZABLE flag in GLRenderer

10 years agoMerge branch 'feature/gamecontroller'
Ingo Ruhnke [Wed, 6 Aug 2014 21:36:05 +0000 (23:36 +0200)]
Merge branch 'feature/gamecontroller'

10 years agoAdded option to disable gamecontroller use and fall back to old joystick code
Ingo Ruhnke [Wed, 6 Aug 2014 21:22:51 +0000 (23:22 +0200)]
Added option to disable gamecontroller use and fall back to old joystick code

10 years agoRenamed JoystickKeyboardController to InputManager
Ingo Ruhnke [Wed, 6 Aug 2014 19:23:28 +0000 (21:23 +0200)]
Renamed JoystickKeyboardController to InputManager

10 years agoKeycode values changed between SDL1 and SDL2, so reset controls to default if old...
Ingo Ruhnke [Wed, 6 Aug 2014 19:07:48 +0000 (21:07 +0200)]
Keycode values changed between SDL1 and SDL2, so reset controls to default if old SDL1 values are found

10 years agoBetter fix. Keeping values intact
Tobias Markus [Wed, 6 Aug 2014 12:32:45 +0000 (14:32 +0200)]
Better fix. Keeping values intact

10 years agoFix for wrong lightmap size in fullscreen
Tobias Markus [Wed, 6 Aug 2014 12:26:28 +0000 (14:26 +0200)]
Fix for wrong lightmap size in fullscreen

10 years agoMoved keyboard code into KeyboardManager class
Ingo Ruhnke [Wed, 6 Aug 2014 07:34:49 +0000 (09:34 +0200)]
Moved keyboard code into KeyboardManager class

10 years agoAdded MENU_BACK button (i.e. B on Xbox360 controller)
Ingo Ruhnke [Wed, 6 Aug 2014 04:37:29 +0000 (06:37 +0200)]
Added MENU_BACK button (i.e. B on Xbox360 controller)

10 years agoRemoved obsolete keycode range check
Ingo Ruhnke [Wed, 6 Aug 2014 03:46:11 +0000 (05:46 +0200)]
Removed obsolete keycode range check

10 years agoImplemented basic support for SDL GameController
Ingo Ruhnke [Wed, 6 Aug 2014 03:39:15 +0000 (05:39 +0200)]
Implemented basic support for SDL GameController

10 years agoRemoved some old event eating code, as randomly discarding events is a bad idea with...
Ingo Ruhnke [Wed, 6 Aug 2014 02:31:22 +0000 (04:31 +0200)]
Removed some old event eating code, as randomly discarding events is a bad idea with hotplug in place

10 years agoInit game controller on startup
Ingo Ruhnke [Wed, 6 Aug 2014 02:30:26 +0000 (04:30 +0200)]
Init game controller on startup

10 years agoMoved joystick specific code from JoystickKeyboardController into JoystickManager...
Ingo Ruhnke [Wed, 6 Aug 2014 02:29:41 +0000 (04:29 +0200)]
Moved joystick specific code from JoystickKeyboardController into JoystickManager class

10 years agoMinor CODINGSTYLE update: auto_ptr -> unique_ptr
Ingo Ruhnke [Wed, 6 Aug 2014 02:33:14 +0000 (04:33 +0200)]
Minor CODINGSTYLE update: auto_ptr -> unique_ptr

10 years agoAdded missing <vector> include
Ingo Ruhnke [Wed, 6 Aug 2014 02:32:29 +0000 (04:32 +0200)]
Added missing <vector> include

10 years agoMinor cleanup
Ingo Ruhnke [Tue, 5 Aug 2014 00:40:15 +0000 (02:40 +0200)]
Minor cleanup

10 years agoSplitted the mouse cursor into three separate images to avoid blending artifacts
Ingo Ruhnke [Tue, 5 Aug 2014 00:15:04 +0000 (02:15 +0200)]
Splitted the mouse cursor into three separate images to avoid blending artifacts

10 years agoAdded 1px transparent border to most fonts, left a few out since glyph count doesn...
Ingo Ruhnke [Mon, 4 Aug 2014 19:14:41 +0000 (21:14 +0200)]
Added 1px transparent border to most fonts, left a few out since glyph count doesn't match image size

10 years agoAdded 1-pixel transparent border around glyphs to avoid GL blending artifacts when...
Ingo Ruhnke [Mon, 4 Aug 2014 19:02:04 +0000 (21:02 +0200)]
Added 1-pixel transparent border around glyphs to avoid GL blending artifacts when scaling along with a script for doing so

Only while.stf has been converted so far

10 years agoAdded support for desktop-fullscreen mode
Ingo Ruhnke [Mon, 4 Aug 2014 02:28:25 +0000 (04:28 +0200)]
Added support for desktop-fullscreen mode

10 years agoFix C++0x flags for clang
Mathnerd314 [Mon, 4 Aug 2014 02:23:40 +0000 (04:23 +0200)]
Fix C++0x flags for clang

10 years agoMerge branch 'feature/c++11'
Ingo Ruhnke [Mon, 4 Aug 2014 01:31:21 +0000 (03:31 +0200)]
Merge branch 'feature/c++11'

10 years agoMove Mtn_Pass to world2 since it uses moving platforms
Mathnerd314 [Sun, 3 Aug 2014 23:05:16 +0000 (01:05 +0200)]
Move Mtn_Pass to world2 since it uses moving platforms

10 years agoMake the coins secret again and also make it easier to get into the secret area.
Mathnerd314 [Sun, 3 Aug 2014 22:51:28 +0000 (00:51 +0200)]
Make the coins secret again and also make it easier to get into the secret area.

10 years agoMore cave level tweaks
Mathnerd314 [Sun, 3 Aug 2014 22:27:16 +0000 (00:27 +0200)]
More cave level tweaks

10 years agoTurn the ledge in Entrance to the Cave into a secret area because I spent way too...
Mathnerd314 [Sun, 3 Aug 2014 20:50:39 +0000 (22:50 +0200)]
Turn the ledge in Entrance to the Cave into a secret area because I spent way too long trying to jump into it.
Also raise the ceiling a bit so BigTux can get in too

10 years agoFix tile in the wrong layer
Mathnerd314 [Sun, 3 Aug 2014 20:30:22 +0000 (22:30 +0200)]
Fix tile in the wrong layer

10 years agoMove the invisible block in Via Nostalgica. Its current position reminds me too much...
Mathnerd314 [Sun, 3 Aug 2014 19:36:32 +0000 (21:36 +0200)]
Move the invisible block in Via Nostalgica. Its current position reminds me too much of https://youtube.com/watch?v=koMIQipNbeA#t=76

Quoting from the video: "And UP... What? Who put that there? **** <restart>"

Since it's level 3, we don't want to scare people away too quickly.

10 years agoFix egg sprite
Mathnerd314 [Sun, 3 Aug 2014 19:20:10 +0000 (21:20 +0200)]
Fix egg sprite

10 years agoFixed some std::unique_ptr<> issues
Ingo Ruhnke [Sun, 3 Aug 2014 17:46:20 +0000 (19:46 +0200)]
Fixed some std::unique_ptr<> issues

10 years agoUpdated source and include directories for tinygettext in CMakeLists.txt
Ingo Ruhnke [Sun, 3 Aug 2014 17:30:06 +0000 (19:30 +0200)]
Updated source and include directories for tinygettext in CMakeLists.txt

10 years agoUpdated to version 79b7bde of tinygettext
Ingo Ruhnke [Sun, 3 Aug 2014 17:29:45 +0000 (19:29 +0200)]
Updated to version 79b7bde of tinygettext

10 years agoReplaced std::auto_ptr<> with std::unique_ptr<>
Ingo Ruhnke [Sun, 3 Aug 2014 17:05:09 +0000 (19:05 +0200)]
Replaced std::auto_ptr<> with std::unique_ptr<>

10 years agoEnabled C++11 support
Ingo Ruhnke [Sun, 3 Aug 2014 16:29:46 +0000 (18:29 +0200)]
Enabled C++11 support

10 years agoUse TARGET_INCLUDE_DIRECTORIES instead of INCLUDE_DIRECTORIES for SDL2, fixed MARK_AS...
Ingo Ruhnke [Sun, 3 Aug 2014 18:42:33 +0000 (20:42 +0200)]
Use TARGET_INCLUDE_DIRECTORIES instead of INCLUDE_DIRECTORIES for SDL2, fixed MARK_AS_ADVANCED()

10 years agoMerge branch 'master' of https://code.google.com/p/supertux
Mathnerd314 [Sun, 3 Aug 2014 18:33:52 +0000 (20:33 +0200)]
Merge branch 'master' of https://code.google.com/p/supertux

Conflicts:
CMakeLists.txt

10 years agoMerge branch 'master' of https://code.google.com/p/supertux
Mathnerd314 [Sun, 3 Aug 2014 18:29:32 +0000 (20:29 +0200)]
Merge branch 'master' of https://code.google.com/p/supertux

Conflicts:
src/supertux/main.cpp

Modified CMakeLists.txt to actually build properly

10 years agoRemoved accidental supertux2 from LINK_LIBRARIES()
Ingo Ruhnke [Sun, 3 Aug 2014 18:26:31 +0000 (20:26 +0200)]
Removed accidental supertux2 from LINK_LIBRARIES()

10 years agoChanged deprecated -%pure_parser to +%pure-parser in parser.yy
Ingo Ruhnke [Sun, 3 Aug 2014 18:26:09 +0000 (20:26 +0200)]
Changed deprecated -%pure_parser to +%pure-parser in parser.yy

10 years agoFlesh out the intro scene some more.
Mathnerd314 [Sun, 3 Aug 2014 17:47:10 +0000 (19:47 +0200)]
Flesh out the intro scene some more.
* Tux actually does stuff during the music
* Dialogue

Also some misc. tweaks to silence GCC warnings (parser.cpp and main.cpp)

10 years agoMerge branch 'master' of https://code.google.com/p/supertux
Ingo Ruhnke [Sun, 3 Aug 2014 04:49:40 +0000 (06:49 +0200)]
Merge branch 'master' of https://code.google.com/p/supertux

10 years agoExit loop when font definition contains more characters then the image has data to...
Ingo Ruhnke [Sun, 3 Aug 2014 04:42:05 +0000 (06:42 +0200)]
Exit loop when font definition contains more characters then the image has data to avoid crash

10 years agoRolled file back to version from master, due to improper merge
Ingo Ruhnke [Sun, 3 Aug 2014 04:01:38 +0000 (06:01 +0200)]
Rolled file back to version from master, due to improper merge

10 years agoFixed compiler warnings
Ingo Ruhnke [Sun, 3 Aug 2014 04:00:20 +0000 (06:00 +0200)]
Fixed compiler warnings