ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,483 Commits 9 Branches 28 Tags 433 MiB
2a1623d8ca
Commit Graph

8055 Commits

Author SHA1 Message Date
hiker
03b1994041 Merge branch 'master' of https://github.com/konstin/stk-code into konstin-master 2014-03-18 16:22:59 +11:00
hiker
0f4fb50fd6 Merge branch 'master' of https://github.com/KroArtem/stk-code into KroArtem-master 2014-03-18 16:15:14 +11:00
hiker
cd7e9ff8a9 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-18 10:47:53 +11:00
hiker
3d5fbaa92f Merge branch 'master' of https://github.com/gupascal/stk-code into gupascal-master 
Fixed some merging issues.
Conflicts:
	data/achievements.xml
	src/achievements/achievement_info.hpp
 2014-03-18 10:44:11 +11:00
Marianne Gagnon
3d6fd8e792 Add patch to mention firing back in tutorial 2014-03-17 18:52:36 -04:00
Csaba Molnar
249635f01a onLapEnd() fix 2014-03-17 22:30:17 +01:00
Csaba Molnar
60f1d8ae20 Achievement reset-after-lap beta 2014-03-17 22:07:55 +01:00
sudip1401
72920ab0ab Poweruplover achievement 2014-03-18 02:20:51 +05:30
hiker
e9367dd1c9 Fixed potential crash if RelationInfo should not exist, which I saw 
once while a decline was in progress), started some minor refactoring.
 2014-03-18 07:48:52 +11:00
sudip1401
89d7663112 Poweruplover achievement 2014-03-18 02:04:01 +05:30
KroArtem
4dec9c3fc5 having fun reverting changes 2014-03-17 23:56:49 +04:00
konstin
de50ea46e8 Allow karts to specifie a different sound effect for their engine; closes #1234 2014-03-17 17:01:34 +01:00
Guillaume P
45ab7e6907 Clean up some minor coding style issues 2014-03-17 08:21:49 +01:00
Guillaume P
3f35a48dda Now IA don't fire a cake if the kart is driving too slow. Also correct some comments. 2014-03-17 08:14:35 +01:00
Guillaume P
b4fe033331 Revert "Now IA don't fire a cake if the kart is driving too slow. Also correct some comments." 
This reverts commit 9030291340.
 2014-03-17 08:10:21 +01:00
KroArtem
66c5d4a645 removed unused functions 2014-03-16 15:28:46 +04:00
KroArtem
d4e90f83f2 revert unique_ptr back to auto_ptr 2014-03-15 23:30:15 +04:00
Vincent Lejeune
ce12ebe9ce Bring back minimap. 2014-03-15 20:05:04 +01:00
auriamg
847ceca671 Merge pull request #1243 from mcsab/master 
Skidding achievement
 2014-03-15 15:01:41 -04:00
Csaba Molnar
c175f2450e Tab fix 2014-03-15 19:58:25 +01:00
Marianne Gagnon
037688b020 Fix terminal warning flood, and improve error detection. Thanks to vlj for help 2014-03-15 14:39:27 -04:00
Csaba Molnar
bc3850ebdb Wrong include corrected (\ -> /). 
Drift counting fixed.
 2014-03-15 19:18:03 +01:00
Vincent Lejeune
1b4863d7aa Add asserts before binding vao and fix 0 glow vao 2014-03-15 18:59:22 +01:00
Marianne Gagnon
0425cf2ef4 Implement color variation in particle system 2014-03-15 13:35:51 -04:00
Guillaume P
5af377da07 Fix a build issue for Travis CI. 2014-03-15 15:58:17 +01:00
KroArtem
a3a851b300 Merge remote-tracking branch 'upstream/master' 2014-03-15 18:30:17 +04:00
Guillaume P
8a34be1ab3 Add a new Gold Driver achievement. 2014-03-15 15:12:28 +01:00
Guillaume P
9030291340 Now IA don't fire a cake if the kart is driving too slow. Also correct some comments. 2014-03-15 10:52:01 +01:00
hiker
de820054b6 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-15 11:55:28 +11:00
hiker
3f738b60d5 Fixed crash in UserInfoDialog if an invalid response is received (friend id 
is not contained in the response --> profile not found --> crash. Now
the friend id is stored in the request itself, and not needed in the response
from the server). Moved RejectFriendRequest into UserInfoDialog.
 2014-03-15 11:54:04 +11:00
Csaba Molnar
385f108b16 Skidding achievement 2014-03-15 00:38:16 +01:00
Marianne Gagnon
3fb98fe85f Work around crash in render code. Vlj, please review this, this is likely not the proper fix 2014-03-14 19:35:35 -04:00
hiker
aa169d0191 Moved AcceptFriendRequest into UserInfoDialog. 2014-03-15 10:27:13 +11:00
hiker
f76536ca31 Moved FriendRequest into corresponding GUI object. 2014-03-15 10:13:44 +11:00
hiker
e63ad2754d Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-15 09:48:14 +11:00
hiker
e77287d3ce Moved signup request from CurrentUser to register screen. 2014-03-15 09:34:23 +11:00
KroArtem
ccd6019f48 Merge remote-tracking branch 'upstream/master' 2014-03-15 01:15:48 +04:00
Vincent Lejeune
cb344520ef Merge branch 'BatchedDrawCalls' 2014-03-14 16:57:18 +01:00
Vincent Lejeune
0c5d5ce96e IBL: Fix sampling ignoring cubemap rotation 2014-03-14 16:51:07 +01:00
Vincent Lejeune
740c251808 Use Instancing for lights. 2014-03-14 16:51:06 +01:00
Vincent Lejeune
6cad7339e3 Factorize texture binding. 2014-03-14 16:51:05 +01:00
Vincent Lejeune
cf2035ca0a Batch draw calls 2014-03-14 16:51:05 +01:00
hiker
c0a70830c2 Moved ServerCreationRequest from CurrentUser into the server creation screen. 2014-03-14 22:18:02 +11:00
hiker
6afc12c866 Moved recovery request into recovery dialog. Fixed recovery dialog to 
work now (except the URL sent from the server is still wrong).
 2014-03-14 16:44:58 +11:00
Rakesh Ranjan Nayak
9b50c9f8bd merged code with upstream master 2014-03-13 22:47:06 +05:30
Rakesh Ranjan Nayak
59e0e3c9be added an achievement banana lover 2014-03-13 22:33:20 +05:30
Rakesh Ranjan Nayak
8f55faeed3 added achievement banana lover 2014-03-13 22:28:52 +05:30
hiker
7e1a59fe99 Mark fulfilled achievements in blue. 2014-03-13 17:18:28 +11:00
hiker
cecb725228 Display correct results for achieved achievements. 2014-03-13 17:12:51 +11:00
hiker
a5f9d26f88 Fixed display of achievements when not logged in. 2014-03-13 08:31:06 +11:00
Guillaume P
955b27bf75 Add a Marathoner achievement. 2014-03-12 14:15:16 +01:00
hiker
4eb4ce1511 Bugfix: onRaceEnd was not called for achievements (resulting in 
achievements not being reset at end of a race).
 2014-03-12 22:40:43 +11:00
hiker
be9d7292f2 Replaced template function to simplify setting online request data with 
function (since template doesn't compile on linux without -std=gnu++0x or so).
 2014-03-11 17:13:37 +11:00
hiker
642797bdde Cosmetic changes to follow our coding style. Also fixed incorrect 
'waiting for friends' message while waiting for achievements.
 2014-03-11 17:03:07 +11:00
Guillaume P
16cff9097b Fix a compilation issue with VS10. 2014-03-09 10:10:34 +01:00
auriamg
112c46fa14 Merge pull request #1236 from divvy81/downstream 
Change of color player kart when any player quits
 2014-03-08 19:11:14 -05:00
Marianne Gagnon
56a8fe8fbe Some cleanup in particles. Make 'scale affector' behavior uniform between GPU particles and fallback irrlicht particles 2014-03-08 19:02:42 -05:00
Dk
b4d922512e 1195 Multiplayer Kart selection screen commit 22 2014-03-08 21:08:06 +05:30
hiker
796d43ebb2 For now avoid the use of the template, since it doesn't work on linux. 2014-03-08 12:24:44 +11:00
hiker
56b53cc3c0 Another try to fix linux compilation. 2014-03-08 11:49:18 +11:00
hiker
51f3a6d555 Added static template function to CurrentUser to create html requests, 
which will prefill the HTML request with the details of the current user.
So far used only in online_profile.
 2014-03-08 10:29:40 +11:00
hiker
809cb27d89 Fixed crash when clicking on empty achievement list. 2014-03-07 16:35:13 +11:00
hiker
f86646abb9 Fixed crash (when clicking on empty friend list). 2014-03-07 16:33:07 +11:00
hiker
3c1a7b1c7b Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-07 16:05:17 +11:00
hiker
c8749a3400 Fixed unnecessary include. 2014-03-07 16:04:59 +11:00
hiker
1ccac0db7c Fix #1232 (GP causes crash). 2014-03-07 16:04:10 +11:00
Marianne Gagnon
10caa7a2ec Post-merge tidying up 2014-03-06 19:19:39 -05:00
auriamg
780201b1ad Merge pull request #1226 from konstin/master 
Solving Issue 1180 - Load addon GPs from local folder
 2014-03-06 19:12:29 -05:00
hiker
58c325e6c3 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-07 11:02:53 +11:00
hiker
7cb7651c07 Renamed Profile to OnlineProfile to better distinguish the various profiles we use. 2014-03-07 11:02:07 +11:00
Vincent Lejeune
cbd7453f7b Do not crash if old shaders dont compile 2014-03-07 00:03:26 +01:00
hiker
d19b5a2732 Fxed support for searching for data and assets based on the executable location. 2014-03-07 07:53:35 +11:00
konstin
f7953f4f12 Adding debug messages for 1180 2014-03-06 20:30:52 +01:00
Dk
52e910a438 1195 Multiplayer kart selection commit 21 2014-03-06 23:39:33 +05:30
Dk
7c8a32a10e 1195 MUltiplayer kart selection cmmit 21 2014-03-06 23:31:34 +05:30
konstin
9ddd5a2d5c reducing the pull request to it's content 2014-03-06 11:58:09 +01:00
konstin
baa56f3254 Merge remote-tracking branch 'upstream/master' 2014-03-06 11:45:19 +01:00
konstin
b561f440ba 1180 Loading Grand Prix's from locale directory 2014-03-06 11:30:51 +01:00
hiker
0208dbaf8a Fixed #38, fixed #1230 (which is a duplicate). 2014-03-06 17:11:22 +11:00
hiker
58a5928b17 Fixed #1228 (crash when no default player is set and -N, -R, ... is used). 2014-03-06 17:06:41 +11:00
auriamg
605e4c6dff Merge pull request #1218 from divvy81/downstream 
1195 Multiplayer kart selection
 2014-03-05 18:04:03 -05:00
hiker
b0018d4e5f Removed unnecessary variable. 2014-03-06 08:49:30 +11:00
hiker
352863a763 Handled case that friends are not in cache when looking at the friend list 
(which can happen when you look at friends of friends, your own friends
are persistent).
 2014-03-06 08:21:54 +11:00
hiker
ebc2299150 Added more comments, code style cleanup only. 2014-03-06 08:04:43 +11:00
hiker
6450c569ac Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-06 07:44:18 +11:00
hiker
b80e9217f5 Fix camera tilting (some debug left-over broke it). 2014-03-06 07:43:51 +11:00
Dk
796c8b823a 1195 Multiplayer karts selection screen commit 20 2014-03-06 00:18:12 +05:30
Dk
7d87d79d20 1195 Multiplayer Kart Selection commit 19 2014-03-05 23:22:41 +05:30
Dk
c5d23f7154 1195 Multiplayer kart selection commit 18 2014-03-05 23:02:23 +05:30
Dk
eddc512b16 1195 Multiplayer kar selection screen commit 17 2014-03-05 21:37:07 +05:30
Dk
b5feb9740a 1195 Multiplayer kart selection commit 16 2014-03-05 21:08:17 +05:30
Dk
0e17d39f1a 1195 Multiplayer kart selection commit 15 2014-03-05 20:47:05 +05:30
Dk
1dab0daeb5 1995 Multiplayer kart selection screen commit 14 2014-03-05 20:16:48 +05:30
konstin
c09a3172f1 Solving Issue 1180 - Load addon GPs from local folder 2014-03-05 12:11:20 +01:00
hiker
eba8fd1e45 Remove passwords and tokens from Log:: output. 2014-03-05 10:34:28 +11:00
Vincent Lejeune
8600d3bc61 IBL: Spheremap now reflects skybox 2014-03-04 23:37:45 +01:00
Vincent Lejeune
391053e368 IBL: Implement IBL 2014-03-04 23:28:24 +01:00
hiker
02fa3ceed0 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-05 08:42:39 +11:00
Vincent Lejeune
718c1cacb0 Improved caustics effect. 2014-03-04 22:30:33 +01:00
hiker
586641120c Fixed crash in online user search (triggered when pressing ESC while the 
search is being executed).
 2014-03-05 08:21:19 +11:00
Vincent Lejeune
8f127be9de Fix caustic shader not picking caustic.png 2014-03-04 22:08:34 +01:00
Vincent Lejeune
ada5928aa2 Forgot a hunk 2014-03-04 18:47:10 +01:00
Vincent Lejeune
c93c921028 STKMesh: Support caustic material. 2014-03-04 18:42:33 +01:00
Vincent Lejeune
ada19f828c Fix black glowing objects. 2014-03-04 17:52:23 +01:00
hiker
f549b729df Remove camera tilting in flying mode. 2014-03-04 16:56:03 +11:00
hiker
3e478265bc Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-04 14:12:11 +11:00
Marianne Gagnon
a063d23b37 Fix intro cutscene 2014-03-03 18:57:10 -05:00
Vincent Lejeune
e1d879a1f2 STKMesh: Improve displace effect. 2014-03-03 23:59:12 +01:00
Vincent Lejeune
4ac634bb11 Fix motion blur edge. 2014-03-03 23:58:37 +01:00
hiker
46304e7f28 Removed m_fake_search, resorted functions to be in a more logical order, 
added comments.
 2014-03-04 08:15:46 +11:00
Dk
72346ee101 1195 Multiplayer kart select commit 13 2014-03-04 00:16:35 +05:30
Dk
99a19ee739 multiplayer kart selection commit 12 2014-03-03 23:53:15 +05:30
Dk
14467e320b 1195 Multiplayer kart selection screen 2014-03-03 23:32:43 +05:30
samuncle
7393fa0603 Add an attenuation based on depth 2014-03-03 16:38:26 +01:00
hiker
7592200a44 Added more comments. 2014-03-03 21:55:46 +11:00
hiker
4fd6d29462 Removed debug code. 2014-03-03 16:37:54 +11:00
hiker
c1afacfc38 Added support for limited resizing of the online profile cache 
if too many search results are found. Print warning (instead of
assert) to console if search results should be missing (because of
cache eviction).
 2014-03-03 16:32:05 +11:00
hiker
7cdc064640 Fixed replay using the --ghost command line option. 2014-03-03 13:14:56 +11:00
hiker
f1ecf999b2 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-03 10:03:02 +11:00
hiker
38bdca2038 Fixed typo. 2014-03-03 09:17:45 +11:00
hiker
0ec7542175 Added more comments. 2014-03-01 17:16:23 +11:00
hiker
e79a46ef38 Fixed crash when --track or --kart is used and no default player exists. 
Also only print an error message if --track or --kart do not work (e.g.
the track/kart is not unlocked, or no default player exists) instead of
aborting STK.
 2014-03-01 17:14:56 +11:00
Marianne Gagnon
d954fc6c72 Better fix for player info dialog 2014-02-28 19:54:18 -05:00
hiker
937533dbdb Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-01 11:35:46 +11:00
hiker
d1e02a6870 Removed commented out code. 2014-03-01 11:34:48 +11:00
hiker
9f6d6949f6 Merge branch 'master' of https://github.com/dimitrijejankov/stk-code into dim 2014-03-01 11:31:32 +11:00
Dimitrije Jankov
c8cba7df07 Fixes the player_info_dialog not loading... 2014-03-01 01:11:25 +01:00
Marianne Gagnon
093ac337d1 Fix GP info dialog 2014-02-28 18:28:42 -05:00
hiker
7e9682bde6 Merge branch 'master' of https://github.com/dimitrijejankov/stk-code into dim 2014-03-01 09:47:59 +11:00
Dk
84cc9dd972 1195 Multiplayer kart selection 2014-03-01 00:01:32 +05:30
Vincent Lejeune
168780a3ac Clean some code. 2014-02-28 17:56:45 +01:00
Vincent Lejeune
af862cb6c5 #version autoadded to shaders and turn some v120 2014-02-28 17:29:05 +01:00
Dimitrije Jankov
a354648497 Fix for 
Author: hikerstk

Atm the user config.xml file is in UTF (since previously it stored the
name of players which requires special characters). The player
information is now stored in a separate file, so the config.xml can be
written as ascii now (avoiding problems some people have that they can't
see or edit the file)
 2014-02-28 15:32:38 +01:00
hiker
1903aee114 Changed lower and upper bound (at lower speed less speed should be 
lost), capped speed fraction. Tweaked parachutes parameters somewhat.
 2014-02-28 23:57:49 +11:00
Dk
15faf7dbee 1195-Multiplayer kart selection 2014-02-28 16:51:27 +05:30
Bart Cools
c131312b33 Implemented the possibility to give yourself "negative" attachments (parachutes, anvils, bombs) to be able to playtest more efficiently 2014-02-28 11:10:35 +01:00
Bart Cools
89a336ff9a Tweaked the logic of parachutes to be more modifiable. There now is an upper bound percentage and lower bound percentage which will be applied if you are driving faster and slower respectively. Also added those values in stk_config.xml to make playtesting easier (ticket #1135) 2014-02-28 11:10:25 +01:00
Dimitrije Jankov
9fc0d5be77 This fixes the issues my patch has caused... 
1) if I start without existing user config files, it crashes (current
player is NULL)
2) the m_remember_me variable is not used
3) if I understand the code correctly, it sets the current player to a
guest player to indicate that there is no current player atm (which is
then used to start the login window). If this correct, then it would be
better to indicate this by setting the current player to NULL. Reason is
that this way we can easily detect incorrect usage elsewhere (since we
will get a crash, instead of storing data in the guest player, and we
will only later detect that something was not saved as expected).
 2014-02-28 10:23:09 +01:00
hiker
14d6e6ae7e Added missing initialisation of m_is_default. 2014-02-28 19:01:40 +11:00
Dimitrije Jankov
d0f93d3b98 Fixed the skiping of the lobby screen :) 2014-02-28 02:36:53 +01:00
Dimitrije Jankov
2ef991e9e7 Removed the m_default_player from the user_config.hpp because the 
default user is loaded from the players.xml file
 2014-02-28 00:38:35 +01:00
hiker
0ddeb3b434 More documentation, and usage of typedef instead of std::vector<...>. 2014-02-28 09:19:10 +11:00
hiker
bef02c116c Bugfix: addPersistent/addToCache would call Profile::merge(), which 
deletes the original profile --> the profile accessed after this call
was invalid.
 2014-02-28 08:51:02 +11:00
hiker
76787599d9 Moved some class declarations into functions. Added comments. 2014-02-28 08:48:07 +11:00
hiker
db0c75b988 Make sure that the used bit of a profile is always set when updating 
the cache bits (even though it probably doesn't matter, but that's
hard to understand, this way is cleaner).
 2014-02-28 08:12:03 +11:00
hiker
efdb78f012 Added comments, sorted some functions so that all cache functions 
are next to each other etc. No actual code change.
 2014-02-27 16:55:32 +11:00
hiker
a686c43dd8 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-27 15:36:51 +11:00
hiker
42b72cc2a8 Added comments, minor code changes only. 2014-02-27 15:29:30 +11:00
Vincent Lejeune
108e82afc2 Fix Sara's moving textures. 2014-02-27 01:49:03 +01:00
Vincent Lejeune
9941b18d7f Rework moving textures support. 2014-02-27 01:22:34 +01:00
hiker
d734d310ab Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-27 09:36:11 +11:00
Vincent Lejeune
7532ea1768 Skybox: Do some cleaning. 2014-02-26 22:28:06 +01:00
Vincent Lejeune
61ea376ff2 Use cubemap for skyboxes 2014-02-26 19:08:24 +01:00
hiker
1c6d63acc7 Added separate create() function for ProfileManager, and some cosmetic changes. 2014-02-26 16:34:46 +11:00
hiker
4d6b110e56 Removed unnecessary #include of user_config.hpp in other hpp files 
(to reduce the amount of recompilation when user_config.hpp is changed).
 2014-02-26 12:52:16 +11:00
hiker
04fe9b6329 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-26 12:07:51 +11:00
Marianne Gagnon
2a8476305d Fix uninitialized variable 2014-02-25 20:06:02 -05:00
hiker
96a0c599d1 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-26 11:55:38 +11:00
Marianne Gagnon
196cbdee09 Fix bogus error level 2014-02-25 19:14:51 -05:00
Vincent Lejeune
c4a38b413f Remove cullface disable in ref tested texture. 2014-02-26 00:43:29 +01:00
hiker
36c9c4d6c3 Fix the display of achievement progress: avoid that a value can be 
larger than the goal value (otherwise after racing one track 12 times
the progress for Christoffel would should 12/10).
 2014-02-26 10:36:02 +11:00
Marianne Gagnon
e1830b4e8a Replace printf with log 2014-02-25 18:31:43 -05:00
hiker
0b33474f2f For now disable shader by default, to avoid people not being able to 
run stk at all (#1212).
 2014-02-26 10:24:09 +11:00
Vincent Lejeune
6e6667a2ea Check minor gl version 2014-02-26 00:00:50 +01:00
hiker
4139d145cf Create a default user config file if no user config file exists. 
This is for now useful for crash problems (e.g. to disable shaders).
 2014-02-26 09:41:38 +11:00
hiker
ac2619007f Fixed translation. 2014-02-26 09:16:40 +11:00
hiker
c6288af326 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-26 08:40:51 +11:00
hiker
b17d2ca0e2 Started to add support for offline achievement viewings (still not 
fully working).
 2014-02-26 08:19:24 +11:00
hiker
7644a5960f Fixed bug (instance variables were access after the object was deleted); 
addded code to show the achievement screen.
 2014-02-26 08:17:49 +11:00
Vincent Lejeune
65c0750525 Clean some unneeded code and fix ssao viz. 2014-02-25 19:01:35 +01:00
hiker
f8a462a39f Added support for different types of achievement checking: besides 
'all-at-least' (all keys must be >= the corresponding goal value) now also
'one-at-least' (at least one key is >= a constant goal value) is supported.
Implemented 'Arch Enemy' achievement: hit the same kart at least 5 times
in one race.
 2014-02-25 17:20:24 +11:00
hiker
2cb1f1fc78 Let only hits from the current player trigger an achievement. 2014-02-24 23:25:56 +11:00
hiker
99fe4388d4 Added an enum to reference the achievements by a name instead of 
an integer number.
 2014-02-24 17:14:42 +11:00
Marianne Gagnon
6eaa1e6db8 Fix crash in tracks without skybox 2014-02-23 19:35:30 -05:00
hiker
71f61f71c6 Fixed compilation errors - no idea why VS compiled it ok previously :( 2014-02-24 08:26:51 +11:00
hiker
4f266639aa Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-24 08:22:55 +11:00
hiker
5fc300d7bb Removed Single and MapAchievent (and Singe/MapAchievementInfo), instead 
using the generic key-value mapping Map* has provided for everything.
Changed format of achievements.xml to be more compact.
 2014-02-24 08:21:15 +11:00
Vincent Lejeune
2d1acf5353 Godray: improve the effect and its stability. 2014-02-23 20:16:03 +01:00
Vincent Lejeune
04fc4c3be7 Reenable Godray (on all track atm) 2014-02-23 20:02:15 +01:00
Vincent Lejeune
778cdcf3ce Godray/Godfade now declared in new pipeline. 2014-02-23 18:59:24 +01:00
KroArtem
30977b7913 Merge remote-tracking branch 'upstream/master' 2014-02-23 19:41:00 +04:00
Vincent Lejeune
a00abffb01 MotionBlur: Use direct GL calls. 2014-02-23 00:13:22 +01:00
Vincent Lejeune
58ef59dcd9 Split stkmesh into mesh and actual scene node 2014-02-22 23:31:27 +01:00
hiker
b4099b5354 Made the story mode xml file format more compact by saving only the 
highest level at which a challenge was solved (lower levels will
automatically be marked as solved).
 2014-02-22 11:44:21 +11:00
KroArtem
08fcb42e7b Merge remote-tracking branch 'upstream/master' 2014-02-21 20:59:41 +04:00
hiker
90343ff276 Fixed missing initialisation of m_reset_after_race, and added 
error message in case of missing achievement data.
 2014-02-21 23:39:14 +11:00
hiker
b214799a35 Some refactoring in he Achievement classes, code style cleanup. 2014-02-21 22:15:36 +11:00
hiker
8307e0d8a3 Fixed memory leak. 2014-02-21 16:54:52 +11:00
hiker
1921dbdacd Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-21 13:38:55 +11:00
Vincent Lejeune
1325fa7940 Fix UI clipping. 2014-02-20 18:43:51 +01:00
Vincent Lejeune
8ba0fcb8e0 STKMesh: Transparent texture can move now. 2014-02-20 18:31:00 +01:00
hiker
8f36220b61 Renamed AchievementsSlot to AchievementsStatus. 2014-02-20 23:03:25 +11:00
hiker
700953f295 Removed unnecessary save function. 2014-02-20 22:37:27 +11:00
hiker
a3a5d5fc3b Moved achievements data into PlayerProfile (and data is saved in players.xml 
now instead of in a separate achievements.xml file).
 2014-02-20 22:04:03 +11:00
Vincent Lejeune
40c4155bd2 STKMesh: Support for (non ref) moving texture 2014-02-20 00:01:02 +01:00
hiker
55665e21a3 Removed some compiler warnings. 2014-02-20 08:55:35 +11:00
hiker
b0b9712fb9 Removed friend relation between StoryModeStatus and UnlockManager. 2014-02-20 08:44:57 +11:00
samuncle
e3f85ba41b Tweak the cam tilt 2014-02-17 23:47:07 +01:00
hiker
fb1c73718a Try to remove shaking of camera somewhat. 2014-02-18 08:51:03 +11:00
hiker
23301d822a Experimentally adjust camera up vector depending on kart roll, which means 
the camera will now follow the gravity changes.
 2014-02-18 08:18:33 +11:00
hiker
a34d47d72a Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-18 07:53:30 +11:00
hiker
8cd1e2e491 Renamed the node name in the player.xml file to better describe what 
it is, removed unused variable.
 2014-02-18 07:38:44 +11:00
Vincent Lejeune
e5a174d85b Add compatibility keyword on and remove some unused shaders 2014-02-17 15:34:57 +01:00
hiker
94da45238c Renamed GameSlot to StoryModeStatus to better describe its function. 2014-02-17 23:16:53 +11:00
hiker
f2e6126f8d Renamed Challenge to ChallengeStatus (to better describe what 
this class is doing).
 2014-02-17 22:20:23 +11:00
hiker
2b4729a145 Renamed player.?pp to player_profile.?pp (to follow our style 
guide); removed unnecessary #includes.
 2014-02-17 20:10:29 +11:00
hiker
6685966616 Fixed flying. 2014-02-17 17:00:11 +11:00
Marianne Gagnon
148ab7deb3 Improve profiler to CSV export 2014-02-16 19:05:30 -05:00
hiker
753e5199b9 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-17 10:58:11 +11:00
hiker
c84264a44e Fixed linux compilation bug. 2014-02-17 10:57:40 +11:00
Marianne Gagnon
8763b95603 Merge branch 'master' of https://github.com/supertuxkart/stk-code 
Conflicts:
	src/utils/profiler.cpp
 2014-02-16 18:11:17 -05:00
Marianne Gagnon
1e8c2ff523 Use plain ofstream to write profiler CSV 2014-02-16 18:10:29 -05:00
Marianne Gagnon
289505d909 Add missing profiler 2014-02-16 17:42:06 -05:00
hiker
7a1670bc8a Merge branch 'master' of github.com:supertuxkart/stk-code into new_login 
Conflicts:
	src/utils/profiler.cpp
 2014-02-17 09:41:55 +11:00
hiker
8cccc72b9a Fixed merge from upstream. 2014-02-17 07:48:18 +11:00
hiker
10db4d6c2c Removed unused variable. 2014-02-17 07:47:01 +11:00
hiker
7b993cd210 Fixed VS compilation. 2014-02-16 21:31:41 +11:00
hiker
c2b4f42c93 Merge remote-tracking branch 'upstream/master' into new_login 2014-02-16 15:11:50 +11:00
KroArtem
12a9b92af0 replace auto_ptr by unique_ptr as auto_ptr is deprecated 2014-02-16 00:32:40 +04:00
Vincent Lejeune
d5d57bbae0 Shadows: Softer edge and smoother cascade transitions 2014-02-15 20:45:47 +01:00
Marianne Gagnon
fd8496ffba Fix linux/gcc compilation 2014-02-13 18:57:51 -05:00
Marianne Gagnon
8227e1c092 Add first rudimentary way to dump profiler measurements to CSV. More work to do! 2014-02-12 21:06:12 -05:00
auriamg
0e722b30a3 Merge pull request #41 from sachith500/bug1118 
Bugfix for 1118
 2014-02-12 18:33:50 -05:00
Vincent Lejeune
57079cbff5 Shaders: Declare penumbraH/V and shadowgen 2014-02-12 23:32:18 +01:00
Vincent Lejeune
3d3333905d Some factorization. 2014-02-12 22:41:32 +01:00
Vincent Lejeune
3d61056b81 Revert "STKMesh: Force readonly materials." 
This reverts commit 8c5a5b9b20.
 2014-02-12 18:46:28 +01:00
Vincent Lejeune
8c5a5b9b20 STKMesh: Force readonly materials. 
We never changed materials on the fly but better safe than sorry.
 2014-02-12 18:31:21 +01:00
Vincent Lejeune
bff2208947 Remove rain effect. 
Rain enabled map crashes with non glsl codepath, and having a particle
effect handled separatly from others effect made it unmaintainable.
Rain must be implemented using gfx file with eventually a custom
property.
 2014-02-12 17:51:18 +01:00
Vincent Lejeune
0cf6e4266a Graphics: Clean some dead code. 
Still leave some shadow related code as comment, I will need later to
port cand's work on penumbra shadow.
 2014-02-12 17:51:17 +01:00
Sachith Hasaranga Seneviratne
56656b581d Bugfix for 1118 
Hide countdown as soon as race ends to prevent the drawGlobalTimer() method in race_gui from checking for failed challenges.

https://sourceforge.net/apps/trac/supertuxkart/ticket/1118

Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com>
 2014-02-12 22:04:21 +05:30
Vincent Lejeune
70f89a8bce Shadow: Use 4 cascades. 
Now that we use GS and textures array it's easier to add a cascade.
4 is still not optimal but I'd like to avoid cascade count inflation as
much as possible ; 4 x 1024x1024 has the bandwidth requirement of the
single 2048x2048 shadowmaps we previously had.
 2014-02-11 21:49:46 +01:00
Vincent Lejeune
934d1f10b8 Shadow: Use Geometry Shader for better perfs. 
The 3 cascades are now rendered in a single pass, using 2D array texture and
a GS to do the dispatch ("layered rendering").
It's possible to use instancing instead but it requires the AMD_vertex_shader_layer
extension which is oddly part of opengl 4.2.
 2014-02-11 21:07:44 +01:00
hiker
07a5d90aa0 Merge remote-tracking branch 'upstream/master' into new_login 2014-02-11 22:36:13 +11:00
hiker
ff585e4c73 Automatically compute active challenges when changing the current player. 2014-02-11 22:35:23 +11:00
hiker
7bba1ae478 Fixed saving first-time use of the story mode. 2014-02-11 22:28:41 +11:00
auriamg
b060b7651a Merge pull request #37 from KroArtem/master 
Fix coverity issues (memleaks, copy-paste error)
 2014-02-10 19:23:45 -05:00
hiker
7b45db42e7 Removed debug print. 2014-02-11 10:13:23 +11:00
hiker
2fe21fc3b2 Added operator<<(const bool&), to get proper true/false written 
instead of 0/1 - but it doesn't work yet :(
 2014-02-11 09:52:46 +11:00
hiker
83bc8c83e6 Fixed empty user config.xml files. 2014-02-11 08:54:44 +11:00
hiker
810c536d43 Fixed various minor bugs. 2014-02-11 08:12:10 +11:00
hiker
0228b82ef4 Fixed incomplete merge. 2014-02-11 07:41:35 +11:00
Vincent Lejeune
da6e6daeaa Create a BO with texture_2d_array for shadows. 2014-02-10 19:01:24 +01:00
Vincent Lejeune
515bcbc750 Shadow: very crude csm support 2014-02-10 15:42:17 +01:00
Vincent Lejeune
ad2dcff431 Revert "Fixed running on hd3000 (8192 was too big for my system, not sure" 
This reverts commit 748dcf1e15.
 2014-02-10 15:39:52 +01:00
hiker
8fc76729f9 Merge remote-tracking branch 'upstream/master' into new_login 2014-02-10 21:37:40 +11:00
hiker
8b7754cd4f Merge remote-tracking branch 'upstream/master' into new_login 
Conflicts:
	src/challenges/game_slot.cpp
	src/states_screens/kart_selection.cpp
	src/tracks/track.cpp
 2014-02-10 21:37:04 +11:00
hiker
748dcf1e15 Fixed running on hd3000 (8192 was too big for my system, not sure 
what values should be used best, I used the previous code here).
 2014-02-10 21:35:13 +11:00
hiker
230e1789f2 Made sorting of players descending (instead of using > in operator<), 
removed kart and unique id from game slot, replaced some forgotten calls to
unlock_manager with calls to PlayerManager.
 2014-02-10 17:00:16 +11:00
hiker
16521fce5a Removed loading and saving of challenge.xml file. 2014-02-10 15:28:13 +11:00
Vincent Lejeune
4fd130b2ac Shadow: Grass now cast shadows. 2014-02-09 23:24:01 +01:00
hiker
8d1591b260 Removed all references to current user/slot from unlock manager. 2014-02-10 08:57:16 +11:00
Vincent Lejeune
18896ff95e Shadow: Support for alpha tested meshes. 2014-02-09 22:56:50 +01:00
hiker
5acf3e1681 Various compilation fixes, some cosmetic changes. 2014-02-10 08:41:54 +11:00
Vincent Lejeune
1c510881a7 Shadow: Fix broken specular with shadows enabled. 2014-02-09 21:16:16 +01:00
Vincent Lejeune
5d5ac34648 Shadow: soften edge a little 2014-02-09 20:03:54 +01:00
Vincent Lejeune
f0ef8e9913 Shadow: reenable shadows 
It's just plain basic shadowmaps, a lot of tweak is still necessary but
it gives a way to see how light values are affected in some places.
(cave in chocolate for instance)
 2014-02-09 19:20:55 +01:00
KroArtem
dfe267e9ec Merge remote-tracking branch 'upstream/master' 2014-02-09 17:23:47 +04:00
KroArtem
33ea1a6ef5 fix coverity issues 2014-02-09 17:04:15 +04:00
hiker
97be85777d Started to move current player info from unlock manager into 
player_manager.
 2014-02-09 23:22:45 +11:00
KroArtem
452af6f423 fix typo 2014-02-09 02:16:14 +04:00
KroArtem
cdeab373c3 add assert in case ftell fails 2014-02-09 02:04:22 +04:00
KroArtem
49d14e5046 copy-paste error 2014-02-09 01:50:02 +04:00
KroArtem
c4fd2eda08 fixing some memleaks 2014-02-09 01:36:32 +04:00
Vincent Lejeune
ab05cb45b8 Shaders: Remove some unused shaders. 2014-02-08 18:19:16 +01:00
auriamg
3fdae349b2 Merge pull request #36 from KroArtem/master 
Clean src/modes and src/karts from old logging code
 2014-02-07 18:36:54 -05:00
KroArtem
1861c6533a small fix: mismatching allocation/deallocation 2014-02-08 01:21:39 +04:00
KroArtem
fde38a35af clean src/addons 2014-02-07 16:45:38 +04:00
KroArtem
591e421b10 clean src/io 2014-02-07 16:23:46 +04:00
KroArtem
746c1ddf5d clean src/items 2014-02-07 15:38:20 +04:00
KroArtem
c0b13b01ff clean src/modes from printf/cout/cerr 2014-02-07 02:17:49 +04:00
hiker
3fee08d743 Merge branch 'new_login' of github.com:hiker/stk-code into new_login 2014-02-06 23:09:49 +11:00
hiker
045bfeaf13 Removed m_all_players from UserConfigParams (though there are stil 
bugs in the new code).
 2014-02-06 23:08:55 +11:00
hiker
dd860f46f9 Fixed linux compilation. 2014-02-06 15:56:41 +11:00
hiker
78b73aa3c8 Added new player manager, and started to replace the saved data 
from user_config with player manager.
 2014-02-06 14:43:47 +11:00
KroArtem
a61ee58a39 clean src/karts from cout, printf and cerr 2014-02-06 01:26:30 +04:00
Vincent Lejeune
62964430a6 Unset AF when not requested 
AF was never unset thus making it enabled everywhere even when there was
a 1:1 fragment/texel mapping.
This makes a significant performance boost when AF is enabled.
 2014-02-05 15:07:18 +01:00
hiker
62d46b7ec0 Renamed XMLWriter to UTFWriter (which is the correcter name). 2014-02-05 08:22:38 +11:00
KroArtem
ca4bfa525e revert changes in race_manager.hpp 2014-02-04 04:38:52 +04:00
KroArtem
ddbc2299b7 Merge remote-tracking branch 'upstream/master' 2014-02-04 03:50:08 +04:00
KroArtem
a7b2490be6 cppcheck fixes 2014-02-04 03:43:44 +04:00
KroArtem
2772fafcf0 cppcheck fixes, use logging in kart_selection.cpp 2014-02-04 02:53:50 +04:00
Vincent Lejeune
19c9cd217f Reenable Anisotropic Filtering 2014-02-03 20:30:40 +01:00
Vincent Lejeune
1d6df18b0a Remove 2 extras printf in shaders.cpp 2014-02-03 20:15:20 +01:00
Vincent Lejeune
8a341dc800 Add a transparent fog aware shader 2014-02-03 20:04:01 +01:00
Vincent Lejeune
6e93178d68 Fog: Do not use camposition in the shader. 2014-02-03 20:04:00 +01:00
Deve
57b38b4371 Partially fixed #1067. 
beforeAddingWidget() wasn't accounting for the extra space required for the random track.
This was causing the ribbon widget in soccer mode to get drawn incorrectly.

I also changed it in easter egg and tracks screen.

Thanks to sachith500.
 2014-02-03 19:29:27 +01:00
Deve
35941194bb If challenges in overworld are GPs, they now indicate so. Thanks to sachith500. 2014-02-03 18:25:36 +01:00
KroArtem
e0a6ec717e cppcheck: unused functions 2014-02-03 00:53:18 +04:00
Vincent Lejeune
477dc093e3 GPUParticle: Use .hpp extension and reformat files now that I discovered how to force VS to emit space instead of indent. 2014-02-02 21:13:03 +01:00
Vincent Lejeune
deb6883a67 Graphics: try to fix some coverity reported issues. 2014-02-02 21:05:57 +01:00
Vincent Lejeune
9595884354 Fix linux build 2014-02-02 20:52:18 +01:00
Vincent Lejeune
541edc76a0 Shaders:Clean some dead code 2014-02-02 20:41:39 +01:00
Vincent Lejeune
cd43ee3c9d Lightprepass: Remove now useless lightblend shader. 2014-02-02 20:18:05 +01:00
gl3nn
06b7ba09f5 Bool to string fix for challenges. String to bool applied for 
achievements.
 2014-02-02 15:50:10 +01:00
Deve
9b2b6c1c78 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-02-02 10:54:40 +01:00
Deve
57d0975c50 Avoid some code duplication. Thanks to sachith500. 2014-02-02 10:53:33 +01:00
Marianne Gagnon
b726ff79b1 Fix bug found by coverity scan. Hopefully I didn't break anything 2014-02-01 18:36:29 -05:00
auriamg
aa324f31e6 Merge pull request #25 from KroArtem/master 
more coverity fixes, get rid of printf in device_manager.cpp
 2014-02-01 15:20:43 -08:00
Deve
1aa4be85f3 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-02-01 12:25:56 +01:00
Deve
091a7c7c5d Add sachith500 patch which allow to display message when doors are closed in overworld. 
I sightly modified it - currently less changes are needed in the exporter.
 2014-02-01 12:24:50 +01:00
samuncle
c9a54b99d9 Use the small font to display FPS in order to reduce the size of the debug view 2014-02-01 04:15:26 +01:00
KroArtem
8f69e0b043 fix compilation 2014-02-01 04:21:55 +04:00
KroArtem
8a731691fd more coverity fixes, get rid of printf 2014-02-01 03:54:34 +04:00
hiker
31063f6ae5 Removed unnecessary \n. 2014-01-31 15:45:53 +11:00
hiker
ade89ba89a Merge branch 'master' of https://github.com/KroArtem/stk-code into kroartem 2014-01-31 15:39:53 +11:00
hiker
5e8c8f2715 Fixed linux compilation. 2014-01-31 11:31:26 +11:00
Marianne Gagnon
a38a3b1b9a Try to fix compilation 2014-01-30 19:14:19 -05:00
hiker
9ef4885db6 Merge branch 'gravity_from_normal' 2014-01-31 08:36:28 +11:00
hiker
fe04a73849 Disable upright constraint when having changed gravity. 2014-01-30 17:19:57 +11:00
hiker
9db2d405ef Removed hardcoded 'up' direction for the raycast for terrain detection. 2014-01-30 17:08:39 +11:00
hiker
8313bcb0d2 Trigger rescue only when the kart is not on gravity terrain. 2014-01-30 12:29:05 +11:00
hiker
c80a78dcf2 Made some pointers const. 2014-01-30 12:27:12 +11:00
Marianne Gagnon
8156b8a66b Rewrite bizarre code in a way that makes more sense 2014-01-29 19:45:56 -05:00
Marianne Gagnon
87f5fd988e Don't use raw char*, use std::string instead. Fixes leaks. 2014-01-29 19:39:38 -05:00
Marianne Gagnon
3e253be31e Misc code improvements 2014-01-29 19:20:57 -05:00
Marianne Gagnon
b7e7808500 Fix failed override attempt 2014-01-29 19:08:17 -05:00
KroArtem
b80548a46e fix some coverity issues 2014-01-30 03:19:41 +04:00
Sachith Hasaranga Seneviratne
0811d13d18 addons_screen minor fix 
2 weeks = 14 days not 12

Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com>
 2014-01-29 23:27:04 +05:30
hiker
199b747ef0 Fixed some compiler warnings. 2014-01-29 22:04:18 +11:00
hiker
e775d8eb98 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-01-29 15:14:42 +11:00
hiker
2479000137 Minor cleanup: renamed resetAllKarts back to unloadAllKarts (to avoid 
confusion since resetAllKarts in world is called before a race),
and removed unused function.
 2014-01-29 15:09:28 +11:00
Vincent Lejeune
e93cfd8b8e Also factorize particles related state changes. 2014-01-29 02:18:19 +01:00
Vincent Lejeune
a9258500b8 Factorize displace and glow state changes. 2014-01-29 02:08:52 +01:00
Vincent Lejeune
4c7ba19642 This shouldnt be there 2014-01-29 01:57:56 +01:00
Vincent Lejeune
5ae0d2f4dc Factorize solid state changes. 2014-01-29 01:57:55 +01:00
Vincent Lejeune
c6e466fdcc Factorise transparent state changes. 2014-01-29 01:57:55 +01:00
Vincent Lejeune
57808f0815 Disable water, bgnodes and textbillboards. 2014-01-29 01:57:34 +01:00
Vincent Lejeune
8b46454859 Add an assertion 2014-01-29 01:35:43 +01:00
Vincent Lejeune
1fa0a9e9cc Display unhandled materials in debug mode 2014-01-29 01:35:43 +01:00
Vincent Lejeune
c994ed720d Fix a typo 2014-01-29 01:33:07 +01:00
Vincent Lejeune
e9d995504d Fix normal maps 2014-01-29 01:21:53 +01:00
auriamg
35405e43b8 Merge pull request #15 from sachith500/master 
Ticket #1149 - clarify story mode for players.
 2014-01-28 15:01:48 -08:00
Vincent Lejeune
098303dced GPUParticles: Use transparent_effect pass 2014-01-28 21:40:53 +01:00
Vincent Lejeune
5be8dbedab Increase buffer size in displayfps 2014-01-28 21:35:12 +01:00
Vincent Lejeune
fd968a0acf OGL32CTX: Factorize UI shaders 
This should fix UI disappearing after resolution change.
 2014-01-28 21:26:16 +01:00
Vincent Lejeune
9955aa6970 STKMeshes: Support for transparent_add_color mat 2014-01-28 20:12:56 +01:00
Vincent Lejeune
143e3a355d Display rendered objects count instead of ktris. 
Things go well untill we have more than 200 objects on my system, no
matter how big they are.
 2014-01-28 20:05:16 +01:00
Sachith Hasaranga Seneviratne
e50c902bf2 Ticket #1149 
Message in story mode now additionally points players to the minimap.

Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com>
 2014-01-28 21:51:46 +05:30
hiker
9192557cd4 Merge branch 'resoCrashFix' of https://github.com/KristofDM/stk-code into KristofDM-resoCrashFix 2014-01-28 22:00:32 +11:00
hiker
1709ccc36d Started to set the gravity for selected material based on the 
normal of the triangle where the kart is on.
 2014-01-28 21:42:23 +11:00
Marianne Gagnon
f1f8900c5d Add a couple profiler markers 2014-01-27 18:59:53 -05:00
Vincent Lejeune
f50e6f817d Use another normal encoding method from a crytek slide. 2014-01-27 23:29:46 +01:00
Vincent Lejeune
d642bc1489 Lightprepass: Only store normals in rtt 
Use a more economical rtt format.
 2014-01-27 21:47:25 +01:00
Vincent Lejeune
0bbba17e5e STKBillboard: Fix a typo 2014-01-27 20:33:56 +01:00
Vincent Lejeune
22ccf3bab3 GPUParticle: Use depthbuffer 2014-01-27 20:33:21 +01:00
Vincent Lejeune
dbcf60003b SunLight: Use DepthBuffer 2014-01-27 20:25:45 +01:00
Vincent Lejeune
ecac127dd6 Fog: Use depthbuffer. 2014-01-27 20:25:19 +01:00
Vincent Lejeune
bc57d246e7 Fog: Factorize setUnifors() 2014-01-27 20:25:07 +01:00
Vincent Lejeune
0b531b20f7 SSAO: Use depth buffer. 2014-01-27 20:24:57 +01:00
Vincent Lejeune
5515f51f65 SSAO: Factorize setUniforms() 2014-01-27 20:24:47 +01:00