ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,322 Commits 9 Branches 28 Tags
71f8766cb1a9ae2d0d884dc2a102599eb456e089
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
hiker 9fa93d74d5 Fixed linux compilation. 2014-07-23 22:11:37 +10:00
hiker c322c507da Fix shader error (vlj, please check). 2014-07-22 13:28:12 +10:00
hiker ed349914fb Fix linux compilation. 2014-07-16 21:24:32 +10:00
hiker a39efe7b3f Fixed incorrect fix for linux compilation done by me: 
Shader::getInstance<Shader>()->Program
does not compile on some gnu compiler, proper way is:
  Shader::template getInstance<Shader>()->Program
Thanks to auria!
 2014-07-16 16:38:41 +10:00
hiker d0784f3fcd Fix #1407 (huge rank number in FTL HUD). 2014-07-16 16:28:32 +10:00
hiker e79c637a11 Try to use an even newer repo, since the previous one is only supported till ... end of this week ;) 2014-07-16 10:18:07 +10:00
hiker cfed9fc44e Try to use saucy repo for the opengl updates. Fingers crossed. 2014-07-16 10:01:24 +10:00
hiker ec1b0ab9fc Merge branch 'konstin-m_random_gp' 2014-07-16 08:19:24 +10:00
hiker a8b2ad4f0a Merge remote-tracking branch 'origin/master' into konstin-m_random_gp 2014-07-16 08:12:16 +10:00
hiker 649848cac2 Mostly cosmetic changes (renamed variables, added comments). Changed 
'random' constructor of GrandPrixData into a function so that there
is no need to create a new GPData objects and then copy it.
 2014-07-16 08:11:09 +10:00
hiker 3684d22ef8 Try to fix linux compilation. 2014-07-15 16:09:57 +10:00
hiker f24e53538c Merge branch 'master' into konstin-m_random_gp 
Conflicts:
	src/states_screens/dialogs/gp_info_dialog.cpp
 2014-07-15 11:07:44 +10:00
hiker a9d3ef0b78 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-07-15 09:13:00 +10:00
hiker ccb8d0e973 Fix crash: a reference to a string in a widget was used after the 
widget was deleted.
 2014-07-15 09:10:54 +10:00
hiker ab57903f9f Try to convert m_gp from a GPData pointer to a GP object, compiles, but 
crashes.
 2014-07-14 23:08:46 +10:00
hiker f24a000f78 Merge branch 'm_random_gp' of https://github.com/konstin/stk-code into konstin-m_random_gp 2014-07-14 14:54:59 +10:00
hiker a65959da42 Replaced upright constraint with simpler code that keeps the kart 
in mid air aligned to the gravity. This will also enable jumps in
section where the gravity is not in the default direction.
 2014-07-08 16:52:09 +10:00
hiker de7ceb0c2d Quick fix to avoid crash at end of race, full fix to follow later ;) 2014-07-07 23:31:43 +10:00
hiker 09a9863a72 Merge branch 'konstin-a' 2014-07-07 17:01:48 +10:00
hiker 5611f1544d Fixed VS compilation. 2014-07-07 16:54:25 +10:00
hiker cab0b2d833 Fixed compiler warning. 2014-07-07 16:53:42 +10:00
hiker c222bbcb1c Merge branch 'a' of https://github.com/konstin/stk-code into konstin-a 2014-07-07 16:15:34 +10:00
hiker b69c92198e Merge branch 'master' of github.com:supertuxkart/stk-code 2014-07-04 08:51:07 +10:00
hiker 235800a119 Merge branch 'properties' 2014-07-04 08:46:05 +10:00
hiker 26fd76b904 Fixed warnings and unnecessary divisions. 2014-07-04 08:45:12 +10:00
hiker 736c7264b9 Merge branch 'properties' of https://github.com/solistice/stk-code into properties 2014-07-04 08:34:48 +10:00
hiker 80d09825bb Fix (potential) problem with exponential spring response (which is 
not used atm).
 2014-07-03 16:53:12 +10:00
hiker 2b6e1b8432 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-07-01 09:51:56 +10:00
hiker 621539849a Removed unused code. 2014-06-30 16:45:00 +10:00
hiker be76aae256 Interpolate the normal for the gravity to allow smoother changes of 
gravity - though it does not improve the bumpiness on twisted road section.
 2014-06-29 22:53:35 +10:00
hiker 9e44c5980a Fixed --track command line option. 2014-06-27 15:39:33 +10:00
hiker 5eb447d3e6 Adjust graphical offset by rotation to fix graphical position not exactly 
the same as physicsl position when kart drives on wall.
 2014-06-26 16:55:33 +10:00
hiker 76cf9ed141 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-26 16:52:15 +10:00
hiker e3939fdc7c Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-26 16:22:19 +10:00
hiker 6905812425 Fixed typo in warning message. 2014-06-25 09:31:10 +10:00
hiker 01a3a446bb Adjust the text width computation to take the left/right border of 
the achievement background into account.
 2014-06-23 17:24:07 +10:00
hiker 299816ac6f Fixed sort order of achievements- and friend-messages. 2014-06-23 16:40:30 +10:00
hiker 6231e618d8 Added new message system to show achievements in race (and not as a 
dialog later). Work in progress ... it doesn't look particulary nice yet ;)
 2014-06-23 09:13:44 +10:00
hiker 8004e9d42c Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-23 09:05:22 +10:00
hiker afdfa15134 Merge remote-tracking branch 'origin/master' 2014-06-23 08:17:34 +10:00
hiker 49fad934cd Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-21 09:35:45 +10:00
hiker 78864c5df0 Removed unused variables. 2014-06-20 15:44:59 +10:00
hiker eaded3bf46 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-20 11:04:15 +10:00
hiker 82d8cbf875 Fixed display or kart name in top left corner (caused by calling 
add on the label widget twice).
 2014-06-20 11:00:43 +10:00
hiker 45ac7d5e03 Fixed compiler warnings. 2014-06-19 15:01:11 +02:00
hiker 6dd4c6f803 Use the new stkaddons feeature to allow more than one achievements to 
be sent at a time. This means only one server request when local
achievements are synched to the online account.
 2014-06-16 23:22:27 +10:00
hiker fa2913c937 Try to force an automatic rerun of cmake by a dummy modification of this file. 2014-06-16 22:09:25 +10:00
hiker a50177c96a Removed messages.?pp files (and used the strings directly where they 
are needed).
 2014-06-16 22:05:50 +10:00
hiker f1c8fcc6d4 Fix 1366. 2014-06-15 22:14:50 +10:00
hiker e1a750672f Fix #1364. 2014-06-15 22:01:52 +10:00
hiker 6425befc5e Synchronise achievements from a local account to an online account. 2014-06-13 23:27:52 +10:00
hiker 364c7434f6 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-13 09:09:36 +10:00
hiker d36ff8b6db Call reset function of RaceGUIBase, which fixes #1363 (missing thunderbird). 2014-06-13 09:07:52 +10:00
hiker ed978cc6e7 Merge branch 'Flakebi-master' 2014-06-12 22:27:28 +10:00
hiker 8228a5bc15 Merge branch 'master' of https://github.com/Flakebi/stk-code into Flakebi-master 2014-06-12 22:09:49 +10:00
hiker 025d7fa114 Tweaked position of font somewhat. Fixed missing rank display 
when kart is standing still.
 2014-06-12 22:00:00 +10:00
hiker d72decfa65 Fixed using the last used track when specifying -N. 2014-06-12 16:54:09 +10:00
hiker 1dc63849c9 Use a sigmar as big digit font and display time and 
lap using this font (temporarily till we agree on a font).
 2014-06-12 09:27:45 +10:00
hiker 9ae8446fae Added -c CHARLIST option which will only export the characters 
specified in the character list. Fixed auto-selection of export
used characters only.
 2014-06-12 08:11:51 +10:00
hiker 97a23e83cb Merge branch 'big_digit' 2014-06-11 09:22:57 +10:00
hiker 28737270d9 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-11 09:19:41 +10:00
hiker 89d8a19dab Fixed shader compilation errors. 2014-06-11 09:11:07 +10:00
hiker a5c7b295be Don't add the index offset for Asian fonts if no pot files are given. 2014-06-11 08:18:35 +10:00
hiker e55d976aa2 Added simple animation when the player rank changes. 2014-06-10 16:58:43 +10:00
hiker 77400211ca Added some tests to avoid NAN values (which I have seen once). 2014-06-10 09:19:02 +10:00
hiker 02b0cfd069 Use big digit font to display the kart rank inside of the speedometer. 2014-06-09 22:38:19 +10:00
hiker 508431b030 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-06 21:56:23 +10:00
hiker d0879cf075 Removed file that should never have been added in the first place ;) 2014-06-06 21:53:57 +10:00
hiker 3cd2b97202 Added missing operator-(Vec3, btVector3). Without this operator 
additional typecast where necessary on VS when computing
Vec3-btVector3.
 2014-06-06 09:36:12 +10:00
hiker d5d7f5bd92 Fixed logout of old player when switching to a new player. Fixed 
disabling the account name (to prevent people from changing their
online name).
 2014-06-06 08:05:25 +10:00
hiker b61e8e24db Disable online flag in register screen if user did not enable 
internet in the dialog. Removed unused function.
 2014-06-05 21:28:30 +10:00
hiker 48b9016384 Fixed compiler warnings. 2014-06-05 17:07:54 +10:00
hiker c2a3b3870d Fixed crash on windows (caused by a variable beeing a large negative 
value).Vlj, can you please have a look!
 2014-06-05 17:02:53 +10:00
hiker 46ca3a2679 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-05 10:14:19 +10:00
hiker b417a5c612 Fix deactivating entry field. 2014-06-05 10:12:26 +10:00
hiker 67c6e1b61e Merge branch 'Flakebi-master' 2014-06-05 09:52:43 +10:00
hiker 5619509ebb Prevent NANs/crash. 2014-06-05 08:59:24 +10:00
hiker e3513b10c6 Merge branch 'master' of https://github.com/Flakebi/stk-code into Flakebi-master 2014-06-05 08:23:47 +10:00
hiker 781820abef Fix the online name (to force people to use only one online name). 
This prevents people from passing achievements from one online
account to another (once two way synching is in place).
 2014-06-05 08:17:59 +10:00
hiker 8960b79181 Wait for request_manager to be ready to be deleted (i.e. current request 
have been properly aborted, and sign out done). Also shut down more of
STK after signaling the request manager to shut down, so that the user does
not notice the time for the sign out. Also added docs.
 2014-06-05 07:56:51 +10:00
hiker c579267e9a Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-05 07:51:46 +10:00
hiker 49a9ac54d5 Added a 'non-abortable' flag to the signout request. Re-enabled cancelling 
ongoing downloads to allow for a quicker exit of STK.
 2014-06-04 17:05:35 +10:00
hiker c62cc7fbaa Added CanBeDeleted class, which implements a timeout function. It is 
used to make sure that (in this case) the NewsManager thread does not
need the file manager anymore when stk exists (which can only happen
on very very quick exists, and slow downloads). This avoids a potential
crash that the NewsManager thread could access the file manager after
the file manager was deleted.
 2014-06-04 16:51:29 +10:00
hiker 8c7b586f45 Fix 'remember password' setting being not remembered. 2014-06-03 21:10:39 +10:00
hiker 24f8918061 Fixed assertion in GP editor. 2014-06-03 15:52:33 +10:00
hiker 71b79cc72f Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-03 13:50:52 +10:00
hiker 663287930f Sort karts by locked/unlocked state (and then alphabetically). 2014-06-03 13:50:28 +10:00
hiker 3d88bfa297 use isInGroup, and minor cosmetic changes. 2014-06-03 13:45:58 +10:00
hiker 9a366f8ee1 Simplified isInGroup test. 2014-06-03 13:42:41 +10:00
hiker 0d789c3bd2 Don't create icons for guests (which are never shown). 2014-06-02 17:07:57 +10:00
hiker eea9d6dbd8 Added FIXME and some comments so that we can look at this 
strange call again when more networking code is added.
 2014-06-02 16:30:53 +10:00
hiker 827286105e Fix #1347. 2014-06-02 15:54:23 +10:00
hiker 0358e55e2e Added 'back' button to user screen. 2014-06-02 08:21:36 +10:00
hiker c733378bf3 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-02 08:09:20 +10:00
hiker 5c959e07a2 Fixed multiplayer kart selection. Now guests are created on demand, 
and are not saved to the players.xml file anymore.
 2014-06-02 08:08:42 +10:00
hiker 5906cdb070 Merge branch 'NewRTTWidget' of github.com:supertuxkart/stk-code into NewRTTWidget 2014-05-31 10:45:55 +10:00
hiker e39f2164b5 Removed OnlineProfile from ActivePlayer, since it was not used at all. 2014-05-31 10:26:02 +10:00
hiker a0ee4d0bc5 Don't save guest players to the players.xml file. 2014-05-31 10:25:08 +10:00
hiker a907df37ad Save the last three stdout.log files (which is useful in diagnosing 
crashes caused by e.g. a problem in a previous run).
 2014-05-30 16:00:28 +10:00
hiker 8ea5110fd4 Fix crash caused by uninitialised variable. 2014-05-30 11:30:44 +10:00