Benjamin Leduc [Fri, 15 Aug 2014 00:07:47 +0000 (00:07 +0000)]
Translations updates
Benjamin Leduc [Thu, 14 Aug 2014 23:49:48 +0000 (23:49 +0000)]
Translations updates
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)
Ingo Ruhnke [Thu, 14 Aug 2014 23:19:57 +0000 (01:19 +0200)]
Fixed compiler warning about missing return
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
Benjamin Leduc [Thu, 14 Aug 2014 22:51:30 +0000 (22:51 +0000)]
Improve of chiness taiwan and mandarin font
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)
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
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
Ingo Ruhnke [Thu, 14 Aug 2014 04:59:56 +0000 (06:59 +0200)]
Removed space from zh-white.stf letter list
Ingo Ruhnke [Thu, 14 Aug 2014 04:59:29 +0000 (06:59 +0200)]
Added lots of command line options to font-generator.py
Ingo Ruhnke [Thu, 14 Aug 2014 03:24:14 +0000 (05:24 +0200)]
Merge branch 'feature/savegame'
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
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
Ingo Ruhnke [Thu, 14 Aug 2014 02:57:29 +0000 (04:57 +0200)]
Replaced deprecated sq_createslot() with sq_newslot()
Ingo Ruhnke [Thu, 14 Aug 2014 02:57:07 +0000 (04:57 +0200)]
Removed useless comment
Ingo Ruhnke [Thu, 14 Aug 2014 02:32:34 +0000 (04:32 +0200)]
Hacked together basic support for Levelset saving
Ingo Ruhnke [Wed, 13 Aug 2014 21:35:20 +0000 (23:35 +0200)]
Renamed GameManager::start_game() to GameManager::start_worldmap()
Ingo Ruhnke [Wed, 13 Aug 2014 21:22:55 +0000 (23:22 +0200)]
Fixed state table creation issue on loading a savegame
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
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*
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"
Ingo Ruhnke [Wed, 13 Aug 2014 04:08:57 +0000 (06:08 +0200)]
Removed load/save functions from scripting interface
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
Ingo Ruhnke [Thu, 14 Aug 2014 00:43:26 +0000 (02:43 +0200)]
Fixed compiler warning in Squirrel
Ingo Ruhnke [Wed, 13 Aug 2014 17:18:38 +0000 (19:18 +0200)]
Fixed crash due to DrawingRequestData being cast to the wrong type
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.
Tobias Markus [Wed, 13 Aug 2014 15:08:44 +0000 (17:08 +0200)]
Fix persistent memory leak in GameSession::get_demo_random_seed()
Tobias Markus [Wed, 13 Aug 2014 13:18:56 +0000 (15:18 +0200)]
Correctly scale ice border / frame to screen size, fixes bug #620
Tobias Markus [Wed, 13 Aug 2014 12:29:13 +0000 (14:29 +0200)]
Fix for SDL double-reporting display modes
Tobias Markus [Wed, 13 Aug 2014 01:05:29 +0000 (03:05 +0200)]
Updating comment to replace svnversion with git
Ingo Ruhnke [Wed, 13 Aug 2014 00:45:28 +0000 (02:45 +0200)]
A few quick hacks to get the Squirrel debugger sqdbg to compile on Linux
Ingo Ruhnke [Tue, 12 Aug 2014 23:59:14 +0000 (01:59 +0200)]
Added primitive font generator
Tobias Markus [Tue, 12 Aug 2014 23:50:32 +0000 (01:50 +0200)]
Fixes to sq_setprintfunc due to Squirrel API changes
Tobias Markus [Tue, 12 Aug 2014 23:44:17 +0000 (01:44 +0200)]
Update to Squirrel 3.0.6
Ingo Ruhnke [Tue, 12 Aug 2014 23:20:00 +0000 (01:20 +0200)]
Fixed SDL gradient renderer not drawing anything if top and bottom colors are the same
Problem could be seen in "data/levels/world1/19 - Miyamoto Monument.stl"
Ingo Ruhnke [Tue, 12 Aug 2014 23:11:48 +0000 (01:11 +0200)]
Use std::unique_ptr<> throughout the audio system
Benjamin Leduc [Tue, 12 Aug 2014 22:53:05 +0000 (22:53 +0000)]
restore mandarine specific symbols
Tobias Markus [Tue, 12 Aug 2014 22:36:04 +0000 (00:36 +0200)]
Better fix for crash when selecting back
Tobias Markus [Tue, 12 Aug 2014 22:24:19 +0000 (00:24 +0200)]
Fixing a failing when there are no menu items
Tobias Markus [Tue, 12 Aug 2014 21:31:54 +0000 (23:31 +0200)]
Possibly fix problems with a git modification being stuck.
Ingo Ruhnke [Tue, 12 Aug 2014 21:14:54 +0000 (23:14 +0200)]
Removed trailing whitespace from all *.?pp files
Ingo Ruhnke [Tue, 12 Aug 2014 21:07:28 +0000 (23:07 +0200)]
Merge branch 'feature/memoryleaks'
Ingo Ruhnke [Tue, 12 Aug 2014 21:04:57 +0000 (23:04 +0200)]
Fixed memory leaks in TileManager
Ingo Ruhnke [Tue, 12 Aug 2014 20:50:45 +0000 (22:50 +0200)]
Delete dictionary_manager at the end of Main::run()
Ingo Ruhnke [Tue, 12 Aug 2014 20:35:27 +0000 (22:35 +0200)]
Fixed memory leak in ObjectFactory
Ingo Ruhnke [Tue, 12 Aug 2014 20:27:03 +0000 (22:27 +0200)]
Fixed memory leak in TextureManager, surfaces didn't get SDL_FreeSurface()'ed
Ingo Ruhnke [Tue, 12 Aug 2014 20:16:02 +0000 (22:16 +0200)]
Moved some declarations from drawing_requests.hpp to drawing_context.hpp to reduce include dependencies
Ingo Ruhnke [Tue, 12 Aug 2014 19:55:43 +0000 (21:55 +0200)]
Fixed memory leak in DrawingContext
DrawingContext was using placement-new to create objects, but not
manually calling the destructors on them, thus leaking memory when the
object in question itself allocated memory, i.e. std::strings in
TextRequest.
Ingo Ruhnke [Tue, 12 Aug 2014 20:42:10 +0000 (22:42 +0200)]
Added missing include to CommandLineArguments
Ingo Ruhnke [Tue, 12 Aug 2014 09:25:54 +0000 (11:25 +0200)]
Changed order of initialisation, so that tinygettext comes sooner, should allow translating --help messages, fixes #923
Ingo Ruhnke [Tue, 12 Aug 2014 08:49:54 +0000 (10:49 +0200)]
Added missing includes to Squirrel and SuperTux to make -DENABLE_SQDBG=ON compile, fixes #575
Ingo Ruhnke [Tue, 12 Aug 2014 08:38:36 +0000 (10:38 +0200)]
Merge branch 'feature/screenmanager'
Ingo Ruhnke [Tue, 12 Aug 2014 08:12:57 +0000 (10:12 +0200)]
Rewrote ScreenManager push/pop handling again, should now be able to handle multiple push/pops in a row more gracefully
Ingo Ruhnke [Tue, 12 Aug 2014 03:22:57 +0000 (05:22 +0200)]
Rewrote logic of ScreenManager to handle ScreenManager::quit() better and not have dangling current_screen pointers around
Ingo Ruhnke [Tue, 12 Aug 2014 02:22:06 +0000 (04:22 +0200)]
Minor cleanup in ScreenManager
Ingo Ruhnke [Tue, 12 Aug 2014 08:32:14 +0000 (10:32 +0200)]
Moved some joystick related messages into log_debug, added help message for manual joystick configuration
Ingo Ruhnke [Mon, 11 Aug 2014 22:46:45 +0000 (00:46 +0200)]
Turned DrawingEffect into a proper bitset, used to be a mix of enum/bitset before. Fixes #569
Ingo Ruhnke [Mon, 11 Aug 2014 22:39:02 +0000 (00:39 +0200)]
Gutted SDLSurfaceData, as it doesn't really need to do anything at the moment
Ingo Ruhnke [Mon, 11 Aug 2014 22:22:12 +0000 (00:22 +0200)]
Merge branch 'feature/savegame'
Ingo Ruhnke [Mon, 11 Aug 2014 03:10:07 +0000 (05:10 +0200)]
Moved some state handling code into WorldState, sort of, most of it still just goes into the global Squirrel VM
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
Ingo Ruhnke [Sun, 10 Aug 2014 21:54:23 +0000 (23:54 +0200)]
Further filename untangling in World class
Ingo Ruhnke [Sun, 10 Aug 2014 21:52:16 +0000 (23:52 +0200)]
Added FileSystem::join("dir", "file") -> "dir/file"
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
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()
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
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
Ingo Ruhnke [Sun, 10 Aug 2014 20:52:49 +0000 (22:52 +0200)]
Moved World loading into a factory method World::load()
Ingo Ruhnke [Sun, 10 Aug 2014 20:31:55 +0000 (22:31 +0200)]
Added some m_ prefixes and made variables private in World
Ingo Ruhnke [Sun, 10 Aug 2014 19:35:48 +0000 (21:35 +0200)]
Disabled -Wabi in CMakeLists.txt
Ingo Ruhnke [Sun, 10 Aug 2014 16:31:27 +0000 (18:31 +0200)]
Cleaned up the World class a bit
Ingo Ruhnke [Mon, 11 Aug 2014 22:20:46 +0000 (00:20 +0200)]
Merge branch 'feature/argparse'
Ingo Ruhnke [Mon, 11 Aug 2014 22:12:46 +0000 (00:12 +0200)]
Added --debug and --verbose command line arguments
Ingo Ruhnke [Mon, 11 Aug 2014 21:53:48 +0000 (23:53 +0200)]
Fixed compiler warnings due to new loglevel aware log macro
Ingo Ruhnke [Mon, 11 Aug 2014 21:53:14 +0000 (23:53 +0200)]
Added support for different log levels
Ingo Ruhnke [Mon, 11 Aug 2014 21:41:04 +0000 (23:41 +0200)]
Added another note about comments to CODINGSTYLE
Ingo Ruhnke [Mon, 11 Aug 2014 21:34:45 +0000 (23:34 +0200)]
Moved argument parsing into CommandLineArguments
Ingo Ruhnke [Mon, 11 Aug 2014 21:21:06 +0000 (23:21 +0200)]
Removed unused function prototype
Ingo Ruhnke [Mon, 11 Aug 2014 20:05:45 +0000 (22:05 +0200)]
Updated email address, grumbel@gmx.de -> grumbel@gmail.com
Ingo Ruhnke [Mon, 11 Aug 2014 06:05:56 +0000 (08:05 +0200)]
Added missing include to trigger/door.cpp, fixes
0000866
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
Ingo Ruhnke [Sun, 10 Aug 2014 21:26:17 +0000 (23:26 +0200)]
CODINGSTYLE: avoid spaces at the end of lines
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
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
Ingo Ruhnke [Sun, 10 Aug 2014 04:09:32 +0000 (06:09 +0200)]
Merge branch 'feature/menu-cleanup'
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
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
Ingo Ruhnke [Sun, 10 Aug 2014 01:29:44 +0000 (03:29 +0200)]
Highlight the currently active profile in ProfileMenu
Ingo Ruhnke [Sun, 10 Aug 2014 01:29:28 +0000 (03:29 +0200)]
Load and save current profile to config file
Ingo Ruhnke [Sun, 10 Aug 2014 01:29:06 +0000 (03:29 +0200)]
Removed unimplemented "Profiles on Startup"
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
Ingo Ruhnke [Sun, 10 Aug 2014 00:35:23 +0000 (02:35 +0200)]
Implemented Menu::on_window_resize()
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()
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
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
Ingo Ruhnke [Sat, 9 Aug 2014 19:39:06 +0000 (21:39 +0200)]
Reimplemented menu transition effects
Ingo Ruhnke [Sat, 9 Aug 2014 05:53:39 +0000 (07:53 +0200)]
Further cleanup in the MenuManager
Ingo Ruhnke [Sat, 9 Aug 2014 05:52:58 +0000 (07:52 +0200)]
Removed some disabled code
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