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
Ingo Ruhnke [Wed, 6 Aug 2014 02:30:26 +0000 (04:30 +0200)]
Init game controller on startup
Ingo Ruhnke [Wed, 6 Aug 2014 02:29:41 +0000 (04:29 +0200)]
Moved joystick specific code from JoystickKeyboardController into JoystickManager class
Ingo Ruhnke [Wed, 6 Aug 2014 02:33:14 +0000 (04:33 +0200)]
Minor CODINGSTYLE update: auto_ptr -> unique_ptr
Ingo Ruhnke [Wed, 6 Aug 2014 02:32:29 +0000 (04:32 +0200)]
Added missing <vector> include
Ingo Ruhnke [Tue, 5 Aug 2014 00:40:15 +0000 (02:40 +0200)]
Minor cleanup
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
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
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
Ingo Ruhnke [Mon, 4 Aug 2014 02:28:25 +0000 (04:28 +0200)]
Added support for desktop-fullscreen mode
Mathnerd314 [Mon, 4 Aug 2014 02:23:40 +0000 (04:23 +0200)]
Fix C++0x flags for clang
Ingo Ruhnke [Mon, 4 Aug 2014 01:31:21 +0000 (03:31 +0200)]
Merge branch 'feature/c++11'
Mathnerd314 [Sun, 3 Aug 2014 23:05:16 +0000 (01:05 +0200)]
Move Mtn_Pass to world2 since it uses moving platforms
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.
Mathnerd314 [Sun, 3 Aug 2014 22:27:16 +0000 (00:27 +0200)]
More cave level tweaks
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
Mathnerd314 [Sun, 3 Aug 2014 20:30:22 +0000 (22:30 +0200)]
Fix tile in the wrong layer
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.
Mathnerd314 [Sun, 3 Aug 2014 19:20:10 +0000 (21:20 +0200)]
Fix egg sprite
Ingo Ruhnke [Sun, 3 Aug 2014 17:46:20 +0000 (19:46 +0200)]
Fixed some std::unique_ptr<> issues
Ingo Ruhnke [Sun, 3 Aug 2014 17:30:06 +0000 (19:30 +0200)]
Updated source and include directories for tinygettext in CMakeLists.txt
Ingo Ruhnke [Sun, 3 Aug 2014 17:29:45 +0000 (19:29 +0200)]
Updated to version
79b7bde of tinygettext
Ingo Ruhnke [Sun, 3 Aug 2014 17:05:09 +0000 (19:05 +0200)]
Replaced std::auto_ptr<> with std::unique_ptr<>
Ingo Ruhnke [Sun, 3 Aug 2014 16:29:46 +0000 (18:29 +0200)]
Enabled C++11 support
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()
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
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
Ingo Ruhnke [Sun, 3 Aug 2014 18:26:31 +0000 (20:26 +0200)]
Removed accidental supertux2 from LINK_LIBRARIES()
Ingo Ruhnke [Sun, 3 Aug 2014 18:26:09 +0000 (20:26 +0200)]
Changed deprecated -%pure_parser to +%pure-parser in parser.yy
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)
Ingo Ruhnke [Sun, 3 Aug 2014 04:49:40 +0000 (06:49 +0200)]
Merge branch 'master' of https://code.google.com/p/supertux
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
Ingo Ruhnke [Sun, 3 Aug 2014 04:01:38 +0000 (06:01 +0200)]
Rolled file back to version from master, due to improper merge
Ingo Ruhnke [Sun, 3 Aug 2014 04:00:20 +0000 (06:00 +0200)]
Fixed compiler warnings
Ingo Ruhnke [Sun, 3 Aug 2014 04:00:02 +0000 (06:00 +0200)]
Replaced old SDL1 surface flags with 0
Ingo Ruhnke [Sun, 3 Aug 2014 03:44:02 +0000 (05:44 +0200)]
Merge branch 'feature/sdl2'
Conflicts:
.gitignore
WHATSNEW.txt
data/fonts/zh-white-big.stf
data/fonts/zh-white.stf
data/images/engine/fonts/zh/shadow.png
data/images/engine/fonts/zh/white.png
data/images/powerups/egg/egg.sprite
data/images/tiles.strf
data/levels/bonus1/az.po
data/levels/bonus1/ne.po
data/levels/bonus1/sv.po
data/levels/bonus2/az.po
data/levels/bonus2/pt_BR.po
data/levels/incubator/az.po
data/levels/incubator/de.po
data/levels/incubator/nn.po
data/levels/incubator/pt_BR.po
data/levels/incubator/ru.po
data/levels/incubator/sv.po
data/levels/incubator/worldmap.stwm
data/levels/world1/ar.po
data/levels/world1/az.po
data/levels/world1/be.po
data/levels/world1/ca.po
data/levels/world1/cmn.po
data/levels/world1/cs.po
data/levels/world1/da.po
data/levels/world1/de.po
data/levels/world1/el.po
data/levels/world1/eo.po
data/levels/world1/es.po
data/levels/world1/et.po
data/levels/world1/fi.po
data/levels/world1/fr.po
data/levels/world1/hi_IN.po
data/levels/world1/hr.po
data/levels/world1/hu.po
data/levels/world1/it.po
data/levels/world1/ja.po
data/levels/world1/lt.po
data/levels/world1/nb.po
data/levels/world1/ne.po
data/levels/world1/nl.po
data/levels/world1/nn.po
data/levels/world1/pl.po
data/levels/world1/pt.po
data/levels/world1/pt_BR.po
data/levels/world1/ro.po
data/levels/world1/ru.po
data/levels/world1/sl.po
data/levels/world1/sv.po
data/levels/world1/tr.po
data/levels/world1/uk.po
data/levels/world1/uz.po
data/levels/world1/vi.po
data/levels/world1/zh_CN.po
data/levels/world1/zh_TW.po
data/levels/world2/az.po
data/levels/world2/cs.po
data/levels/world2/de.po
data/levels/world2/hu.po
data/levels/world2/nn.po
data/levels/world2/pt_BR.po
data/levels/world2/sv.po
data/locale/ar.po
data/locale/az.po
data/locale/be.po
data/locale/ca.po
data/locale/cmn.po
data/locale/cs.po
data/locale/da.po
data/locale/de.po
data/locale/el.po
data/locale/eo.po
data/locale/es.po
data/locale/et.po
data/locale/fi.po
data/locale/fr.po
data/locale/hi_IN.po
data/locale/hr.po
data/locale/hu.po
data/locale/it.po
data/locale/ja.po
data/locale/lt.po
data/locale/nb.po
data/locale/ne.po
data/locale/nl.po
data/locale/nn.po
data/locale/pl.po
data/locale/pt.po
data/locale/pt_BR.po
data/locale/ro.po
data/locale/ru.po
data/locale/sl.po
data/locale/sv.po
data/locale/tr.po
data/locale/uk.po
data/locale/uz.po
data/locale/vi.po
data/locale/zh_CN.po
data/locale/zh_TW.po
external/squirrel/squirrel/sqdebug.cpp
src/object/bonus_block.cpp
src/object/explosion.cpp
src/object/player.cpp
src/supertux/game_session.cpp
src/supertux/level.cpp
src/supertux/main.cpp
src/supertux/resources.cpp
src/video/sdl/sdl_renderer.cpp
src/worldmap/worldmap.cpp
Ingo Ruhnke [Sun, 3 Aug 2014 03:01:18 +0000 (05:01 +0200)]
Moved some aspect ratio calculations into video/util.cpp
Ingo Ruhnke [Fri, 1 Aug 2014 19:01:22 +0000 (21:01 +0200)]
Reimplemented magnification and aspect ratio handling
Tobias Markus [Fri, 1 Aug 2014 21:39:13 +0000 (23:39 +0200)]
Only rotate egg when its actually moving (velocity <> 0)
Ingo Ruhnke [Fri, 1 Aug 2014 18:02:14 +0000 (20:02 +0200)]
Fixed surfaces not getting properly converted to textures in OpenGL (i.e. wrong colors on worldmap)
Ingo Ruhnke [Fri, 1 Aug 2014 17:32:30 +0000 (19:32 +0200)]
Reverted
91c1517 and reinserted the old mouse cursor code
With SDL_RenderSetLogicalSize() gone the old mouse code works again
and it doesn't glitch the mouse pointer on magnification changes as
the new code does.
Ingo Ruhnke [Fri, 1 Aug 2014 17:25:17 +0000 (19:25 +0200)]
Replaced SDL_RenderSetLogicalSize(), removed PHYSICAL_SCREEN_WIDTH/HEIGHT, improved mouse handling when using magnification
Ingo Ruhnke [Fri, 1 Aug 2014 16:57:09 +0000 (18:57 +0200)]
Removed foobar from Renderer::to_logical(), it's no longer needed
Ingo Ruhnke [Fri, 1 Aug 2014 16:26:40 +0000 (18:26 +0200)]
Removed platform specific path magic and use SDL_GetBasePath() instead (untested)
Ingo Ruhnke [Fri, 1 Aug 2014 02:14:41 +0000 (04:14 +0200)]
Added fullscreen switching to SDLRenderer
Ingo Ruhnke [Fri, 1 Aug 2014 02:14:32 +0000 (04:14 +0200)]
Minor cleanup
Ingo Ruhnke [Fri, 1 Aug 2014 02:07:02 +0000 (04:07 +0200)]
Use better filtering for scaling in SDL
Ingo Ruhnke [Fri, 1 Aug 2014 01:48:24 +0000 (03:48 +0200)]
Clear the screen to avoid garbage in unreachable areas after we reset the coordinate system
Ingo Ruhnke [Fri, 1 Aug 2014 01:43:48 +0000 (03:43 +0200)]
Pass mouse coordinates to mouse pointer manually instead of SDL_GetMouseState(), see bug #2442 in SDL2
Ingo Ruhnke [Thu, 31 Jul 2014 21:51:14 +0000 (23:51 +0200)]
Cleaned up coordinate translation a little, SDL mouse handling is still broken and SDL_RenderGetViewport() doesn't seem to return proper values
Ingo Ruhnke [Thu, 31 Jul 2014 20:17:16 +0000 (22:17 +0200)]
Implemented window scaling in SDLRenderer, mouse input however breaks when scaling
Ingo Ruhnke [Thu, 31 Jul 2014 19:43:44 +0000 (21:43 +0200)]
Use SCREEN_WIDTH/HEIGHT instead of SDL_RendererGetViewport(), as logical coordinates might be different then physical
Ingo Ruhnke [Thu, 31 Jul 2014 19:27:38 +0000 (21:27 +0200)]
Implemented support for different blend modes in SDL
Ingo Ruhnke [Thu, 31 Jul 2014 19:12:03 +0000 (21:12 +0200)]
Implemented sprite rotations for SDLRenderer
Ingo Ruhnke [Thu, 31 Jul 2014 19:03:59 +0000 (21:03 +0200)]
Merged drawing code from SDLLightmap and SDLRenderer into helper class SDLPainter
Ingo Ruhnke [Thu, 31 Jul 2014 06:26:21 +0000 (08:26 +0200)]
Removed pointless check for screen mode change, as we are creating the window for the first and only time at that point
Ingo Ruhnke [Thu, 31 Jul 2014 06:21:23 +0000 (08:21 +0200)]
Implemented desktop_size discovery in GLRenderer
Ingo Ruhnke [Thu, 31 Jul 2014 05:58:04 +0000 (07:58 +0200)]
Fixed typo that made mouse clicks not function properly
Ingo Ruhnke [Thu, 31 Jul 2014 05:01:43 +0000 (07:01 +0200)]
Implemented fullscreen mode selection, OpenGL only for the moment
Ingo Ruhnke [Thu, 31 Jul 2014 04:25:58 +0000 (06:25 +0200)]
Reenabled vsync and some other OpenGL attributes
Ingo Ruhnke [Thu, 31 Jul 2014 04:02:55 +0000 (06:02 +0200)]
Fixed window resize in OpenGL and added window resize to SDL renderer
Ingo Ruhnke [Thu, 31 Jul 2014 03:23:41 +0000 (05:23 +0200)]
Fixed window title and icon, removed Renderer and Lightmap creation from DrawingContext and moved it to top-level init code
Ingo Ruhnke [Thu, 31 Jul 2014 03:21:32 +0000 (05:21 +0200)]
Implemented Texture color modification
Ingo Ruhnke [Thu, 31 Jul 2014 02:38:50 +0000 (04:38 +0200)]
Implemented SDLLightmap::get_light(), haven't tested it
Ingo Ruhnke [Thu, 31 Jul 2014 02:37:42 +0000 (04:37 +0200)]
Added PHYSICAL_SCREEN_WIDTH global variable, little ugly, but should do for now, still needs to be updated properly on window resize
Ingo Ruhnke [Thu, 31 Jul 2014 01:02:19 +0000 (03:02 +0200)]
Implemented basic lightmap rendering, still a bit of an incomplete hack job, drawing code should be merged with SDLRenderer
Ingo Ruhnke [Wed, 30 Jul 2014 20:11:37 +0000 (22:11 +0200)]
Print some debug info for the created SDL_Renderer
Ingo Ruhnke [Wed, 30 Jul 2014 18:55:31 +0000 (20:55 +0200)]
Removed unused GUI classes Button and ButtonGroup
Ingo Ruhnke [Wed, 30 Jul 2014 18:43:16 +0000 (20:43 +0200)]
Fixed text input in console, console itself doesn't handle unicode correctly, so weird stuff happens when pressing umlauts
Ingo Ruhnke [Wed, 30 Jul 2014 18:32:30 +0000 (20:32 +0200)]
Fixed crash when enabling console
Ingo Ruhnke [Wed, 30 Jul 2014 18:25:46 +0000 (20:25 +0200)]
Hooked up window resize event (not yet implemented in Renderer)
Ingo Ruhnke [Wed, 30 Jul 2014 18:20:51 +0000 (20:20 +0200)]
Implemented set_gamma()
Ingo Ruhnke [Wed, 30 Jul 2014 17:58:17 +0000 (19:58 +0200)]
Use fullscreen and resolution config in SDLRenderer
Ingo Ruhnke [Wed, 30 Jul 2014 17:57:56 +0000 (19:57 +0200)]
Removed OLD_SDL1 software rendering code from SDL_Renderer
Ingo Ruhnke [Wed, 30 Jul 2014 17:48:00 +0000 (19:48 +0200)]
Removed lots of OLD_SDL1 software rendering code from SDLTexture
Ingo Ruhnke [Wed, 30 Jul 2014 17:44:43 +0000 (19:44 +0200)]
Removed some OLD_SDL1 code
Ingo Ruhnke [Wed, 30 Jul 2014 17:38:33 +0000 (19:38 +0200)]
Fixed black borders in GL renderer
Ingo Ruhnke [Wed, 30 Jul 2014 17:37:52 +0000 (19:37 +0200)]
Removed unused SDL_Surface* screen; from GLLightmap
Ingo Ruhnke [Wed, 30 Jul 2014 16:58:52 +0000 (18:58 +0200)]
Fixed radius calculation for rounded rectangles
Ingo Ruhnke [Wed, 30 Jul 2014 16:57:03 +0000 (18:57 +0200)]
Fixed OpenGL renderer, starts now up and game seems playable
Ingo Ruhnke [Wed, 30 Jul 2014 16:43:17 +0000 (18:43 +0200)]
Implemented support for rounded rectangles
Ingo Ruhnke [Wed, 30 Jul 2014 06:02:57 +0000 (08:02 +0200)]
Implemented SDLRenderer::do_take_screenshot()
Ingo Ruhnke [Wed, 30 Jul 2014 05:52:57 +0000 (07:52 +0200)]
Implemented horizontal flipping in SDLRenderer
Ingo Ruhnke [Wed, 30 Jul 2014 05:31:13 +0000 (07:31 +0200)]
Implemented SDLRenderer::draw_inverse_ellipse()
Ingo Ruhnke [Wed, 30 Jul 2014 04:12:35 +0000 (06:12 +0200)]
More .gitignore
Ingo Ruhnke [Wed, 30 Jul 2014 04:12:13 +0000 (06:12 +0200)]
Implemented basic rendering operations, game is now playable again, rounded rectangles and other details still missing or broken
Ingo Ruhnke [Wed, 30 Jul 2014 04:09:47 +0000 (06:09 +0200)]
Removed unused "void Renderer::draw_text(const DrawingRequest& request);"
Ingo Ruhnke [Wed, 30 Jul 2014 03:11:25 +0000 (05:11 +0200)]
Added -Wno-unused-parameter to disable annoying compiler warning
Ingo Ruhnke [Wed, 30 Jul 2014 03:10:28 +0000 (05:10 +0200)]
Disabled some more code, game now starts up and plays music, no graphics yet, just a black screen
Ingo Ruhnke [Wed, 30 Jul 2014 01:28:59 +0000 (03:28 +0200)]
Made code compile, not work, with SDL2, old code that needs work is disabled and marked with "#ifdef OLD_SDL1"
Ingo Ruhnke [Wed, 30 Jul 2014 01:11:37 +0000 (03:11 +0200)]
AdAdded check for SDL2 to CMake
Ingo Ruhnke [Wed, 30 Jul 2014 01:11:21 +0000 (03:11 +0200)]
Fixed SDL2 include, should just be SDL.h
Ingo Ruhnke [Wed, 30 Jul 2014 01:09:45 +0000 (03:09 +0200)]
Purged SDL2 source code from the sourcetree, it's not needed
LMH [Thu, 24 Jul 2014 00:40:45 +0000 (14:40 -1000)]
Invincibility stars sparkle when close to Tux
LMH [Fri, 18 Jul 2014 21:32:25 +0000 (11:32 -1000)]
Added Bonus Island III
Populated with levels submitted to the bugtracker and previously part of the 'Mantis Valley' addon. In addition, several levels were moved from 'Incubator Island' as well. Criteria for moving from 'Incubator Island' were either the use of relatively steep slopes since slope mechanics still need work, and use of crystal tileset which still suffers from major tiling issues.
LMH [Fri, 18 Jul 2014 06:35:09 +0000 (20:35 -1000)]
Reduced the value of SWITCH_DELAY for magic blocks to prevent lanterns (and Tux) from prematurely passing through them while in free-fall
LMH [Fri, 18 Jul 2014 06:29:05 +0000 (20:29 -1000)]
Fixed a counting bug when using butt-jump on a multi-hit bonus block
LMH [Thu, 26 Jun 2014 00:13:54 +0000 (14:13 -1000)]
Frozen badguys can be killed with butt-jump
LMH [Wed, 25 Jun 2014 23:57:27 +0000 (13:57 -1000)]
Auto-run levels are automatically marked as solved.
This prevents players from being forced back into an auto-run level if they should abort without finishing. Resolves apparent problem in issue #28.
LMH [Sat, 14 Jun 2014 22:08:35 +0000 (12:08 -1000)]
Powerup: Iceflower improvements
Generalized code for changing frozen badguy sprite to iced, and added a default behavior for freezable badguys without iced graphics. Frozen badguys no longer unfreeze on touch. Added ice vulnerability to forest badguys.
Note: there are some mild bugs as a result of this change, which should be fixed in subsequent improvements to make Iceflower a more viable powerup.