Commit Graph
13968 Commits
Author SHA1 Message Date
Marianne Gagnon 35f55c19a1 Tweak jungle challenge to use Cocoa Temple and a slightly adjusted time 2014-12-01 18:42:46 -05:00
samuncle 3627719440 min max where inverted 2014-12-01 23:54:34 +01:00
Vincent Lejeune 7e2add8c53 Clean lensflare related file
A new method is used now.
2014-12-01 21:07:29 +01:00
Vincent Lejeune 4db0f8ebf6 Do not reorient shadow cam
It didnt really improve shadows resolution
2014-12-01 21:00:28 +01:00
Deve 24e850db79 Delete xx
I simply try to delete it directly on github ;)
2014-12-01 08:10:12 +01:00
hiker 006a7f95c9 Cherrypicked pull request #1743 (cppcheck performance fixes). 2014-12-01 15:14:27 +11:00
Vincent Lejeune 354dad7392 Fix an error when indirect instancing is not supported 2014-12-01 01:46:50 +01:00
Marianne Gagnon f31a458fb8 Disable compressed textures checkbox in options where unsupported 2014-11-30 18:44:43 -05:00
Vincent Lejeune 0aa6b9fcd1 Make sdsm optionnal
scene manager is not ready yet
2014-11-29 01:33:10 +01:00
Vincent Lejeune 7a92a4a8ef Disable texture compression on Intel 2014-11-29 01:27:54 +01:00
Marianne Gagnon 53bc15ad50 Merge remote-tracking branch 'origin/OSXFullscreen' 2014-11-28 18:50:51 -05:00
Marianne Gagnon 70da81bf4e Fix OpenGL 3.2 core profile use in fullscreen mode on OS X 2014-11-27 18:59:51 -05:00
hiker 63250237a4 Fixed linux compilation. 2014-11-27 23:27:27 +11:00
hiker 14145b4e2c Merge branch 'master' of github.com:supertuxkart/stk-code 2014-11-27 23:06:12 +11:00
hiker c1a84671c2 Merge branch 'master' of github.com:supertuxkart/stk-code
Conflicts:
	src/karts/kart_model.cpp
2014-11-27 22:52:08 +11:00
hiker 2ea0c0533a Merge branch 'master' of github.com:supertuxkart/stk-code 2014-11-27 22:40:46 +11:00
hiker 71994c692f Fixed replay mode. 2014-11-27 22:34:04 +11:00
hiker 020c129691 Specify the replay buffer size as time value (i.e. how many seconds),
not how many frames.
2014-11-27 16:15:53 +11:00
hiker 6e3c766749 Minor improvements to fix for #1713. 2014-11-27 15:36:56 +11:00
Vincent Lejeune bf98d296eb Fix #1734 2014-11-27 01:31:28 +01:00
Marianne Gagnon 12c54cb92b Revert old workaround, fix the original issue in a cleaner way 2014-11-26 19:30:09 -05:00
hiker ce1586532d Merge branch 'master' of github.com:supertuxkart/stk-code 2014-11-27 09:32:39 +11:00
hiker 4e00f691dc Added an assert to check if new was successful. 2014-11-27 09:17:08 +11:00
hiker 673a9f39c6 Merge branch 'Flakebi-fixes' 2014-11-27 00:07:00 +11:00
hiker d4ea2e8786 Merge branch 'fixes' of https://github.com/Flakebi/stk-code into Flakebi-fixes 2014-11-26 23:56:33 +11:00
hiker 7c7fb68e82 Try fixing #1713 (crash pessing ESC on login screen). 2014-11-26 23:40:50 +11:00
hiker 45b19997de Fixed compiler warning (double to float). 2014-11-26 22:27:35 +11:00
deve bf79df9e88 Fixed typo 2014-11-26 10:54:44 +01:00
Flakebi e4777d0c63 Prevent the max speed of the fps camera to be less than 0 2014-11-26 09:02:34 +01:00
Flakebi c4cdfc4a0e Merge branch 'upstream/master' into fixes
Conflicts:
	src/input/input_manager.cpp
	src/states_screens/kart_selection.cpp
2014-11-26 07:34:26 +01:00
deve cac87cce34 Fixed mingw compilation.
I don't know how it worked previously because MEMORYSTATUSEX was there rather longer time and it needs this definition.
2014-11-26 06:46:03 +01:00
Marianne Gagnon eda6f6c2f5 Merge branch 'master' into OSXFullscreen 2014-11-25 19:35:09 -05:00
hiker ea3a433147 Fix #1620 (Player's achievements can only be seen when logged in). 2014-11-25 17:12:47 +11:00
hiker 49474a5370 Fixed my "Better handle out-of-memory situations." ... to now actually work :P 2014-11-25 17:08:31 +11:00
hiker ebfbf5e2aa Updated pot file (just to check launchpad integration, no string freeze yet). 2014-11-25 15:05:51 +11:00
hiker 8ef2c63857 Merge branch 'tobbi-cppcheck' 2014-11-25 14:15:37 +11:00
hiker 6fbcd90226 Better handle out-of-memory situations. 2014-11-25 14:14:32 +11:00
hiker aac261d873 Use proper format (instead of casting unsigned to int). 2014-11-25 14:02:34 +11:00
hiker 63e5acdf2b The (float) cast is not necessary, and makes it harder to read. 2014-11-25 14:00:43 +11:00
hiker 51be8195bc Merge branch 'cppcheck' of https://github.com/tobbi/stk-code into tobbi-cppcheck 2014-11-25 13:58:59 +11:00
hiker af186b6926 Fixed compiler warnings. 2014-11-25 13:58:28 +11:00
Marianne Gagnon 346bae4d03 Fix LOD issues in multiplayer, fixes #1710 2014-11-24 19:08:20 -05:00
Marianne Gagnon cd7bc96d68 Fix invalid snow particles XML file that would cause assertion failures 2014-11-24 18:31:38 -05:00
samuncle 82b8548066 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-11-24 21:10:08 +01:00
Deve 220d3dbc9a Restore screenshot properties 2014-11-24 20:41:49 +01:00
samuncle 92801f2b74 Tweak the snow 2014-11-24 20:23:55 +01:00
Deve 54b311f6f7 Allow to set custom ratio for images from xml file.
It avoids crashes and memory leaks after changing resolution.
2014-11-24 19:31:46 +01:00
hiker 5fd1e30a75 Fixed crash when using --slipstream-debug, but colour change to indicate
slipstream states does not work yet.
2014-11-23 21:54:41 +11:00
hiker 9a02693d31 Fixed compiler warnings, renamed playerID to player_id (to follow
our style guide).
2014-11-23 21:13:49 +11:00
hiker 24b1a3af32 Fixed compiler warnings. 2014-11-23 21:13:12 +11:00