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

111 Commits

Author SHA1 Message Date
Vincent Lejeune
27cccd6102 Fix sources.cmake 2014-03-31 20:12:02 +02:00
Marianne Gagnon
d798398478 Merge branch 'Instancing' of https://github.com/supertuxkart/stk-code into Instancing 2014-03-23 18:55:51 -04:00
Marianne Gagnon
bb28e26eff Cleanup for instancing 2014-03-23 18:55:45 -04:00
Vincent Lejeune
5dd2d28134 Merge branch 'master' into Instancing 2014-03-23 19:20:23 +01:00
Marianne Gagnon
2f2547420d Apply Marc Coll's Grand Prix editor, thanks! There will be refinements to come for sure, but this is a very nice start 2014-03-20 21:13:05 -04:00
Vincent Lejeune
dd5997d277 Start working on instancing library node 2014-03-18 23:47:53 +01: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
58ef59dcd9 Split stkmesh into mesh and actual scene node 2014-02-22 23:31:27 +01:00
hiker
8f36220b61 Renamed AchievementsSlot to AchievementsStatus. 2014-02-20 23:03:25 +11: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
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
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
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
c77ffb1882 STKBillboard: Create new SceneNode wrapper. 2014-01-27 17:33:08 +01:00
Vincent Lejeune
9a5bf69ca8 STKMesh: Add an animated variant 
Not customised atm.
 2014-01-23 19:14:13 +01:00
hiker
1930c362d5 Updated source file list (forgot to update this when removing some files). 2014-01-22 08:05:47 +11:00
hiker
260f4f148d Reworked the login and register dialog to be a screen - still 
work in progress (and guest login does not work yet).
 2014-01-20 21:39:59 +11:00
hikerstk
428f74d859 Removed old network_http and related data structure. Its function 
is now either in the addons/news_manager, or in Online::RequestManager.
Also added leack check and copy-preventing to online/Request.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15034 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 05:21:48 +00:00
vincentlj
c3a4f7d8ce Use a custom stk mesh 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14997 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-10 21:30:17 +00:00
hikerstk
54e6396df6 Renamed HTTPManager to RequestManager, and split request 
into three files request, http_request and xml_request.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14978 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 04:57:58 +00:00
hikerstk
6ee751e3c3 Added new class to handle command line parameters, which 
simplifies parameter handling in main (e.g. it's not
necessary to list and ignore parameters in the 2nd
pass, when they were handled in the first pass).
Removed some command line options for which there
is a guy (e.g. --weather), or which are not really
useful (--list-karts). 

All parameters to options must now consistently be
specified using '=', e.g.: --log=1 and --kart=tux.

Also removed support for 'classic' camera (which was
not used anymore). Removed now unneccessary #include
in user_config.hpp, which made some #include changes
in other files necessary.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14939 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-06 12:23:16 +00:00
vincentlj
c18248220a OGL32CTX: Move an include outside of win32 #ifdef, and always define OGL32CTX for apple 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14905 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-04 17:32:42 +00:00
vincentlj
187abe584b GPUParticles: Reenable rain, windows build is fixed 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14815 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 22:02:12 +00:00
vincentlj
df2bd304ab GPUParticles: Put it in its own file 
Disable rain while doing ping-pong between os to get windows opengl callback

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14814 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 20:56:29 +00:00
funto66
39046749d2 Add a debug menu + option to reload shaders (memory leak, yeah, but it's just for debugging) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14674 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 00:09:35 +00:00
deveee
ec13bcf802 Merge branch 'hilnius' 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-05 17:28:55 +00:00
hikerstk
d41bbbaa2f Merged uni's branch with trunk. No guarantee that everything works ;) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14620 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-03 23:02:06 +00:00
hikerstk
bc2432bb57 Merged with trunk, final part. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14608 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 04:43:14 +00:00
auria
5899a26aad Merge cand's graphical improvements branch!! There are many known issues folks, so don't cry victory just now, this is just the beginning. Especially, shadows do not work correctly at this time 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-30 21:33:06 +00:00
funto66
3a659d45dd Add basic crash reporting functionality on Windows 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14586 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-29 22:33:11 +00:00
deveee
195daa8794 Avoid to run Easter Egg mode as Grand Prix. 
I added new files to avoid a mess.
Proposed for 0.8.1

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14504 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-20 18:29:10 +00:00
hilnius
c9cb74a9e5 fixing bugs, adding comments, structures and functions for the map vote system 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14122 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-21 18:18:50 +00:00
hilnius
0ce03186ee merging uni's branch and fixing compilation problems 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13690 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-15 10:12:54 +00:00
hilnius
262f70205c merging trunk and fixing compilation issues 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13689 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-15 10:05:34 +00:00
unitraxx
99e7b565bc Password changing done! (and some other small fixes) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13679 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-14 01:07:22 +00:00
unitraxx
503e261a36 A new tab/screen for account settings 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13676 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-13 23:02:56 +00:00
unitraxx
cbca9404e3 Big ass commit regarding achievement viewing of other people via their profile. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13658 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-10 20:41:57 +00:00
unitraxx
91e77a14c3 Lots of additions to achievements! core almost done. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13616 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-02 20:53:55 +00:00
unitraxx
e21ef8d40b Combined some file manager methods that had duplicated code into one getConfigFile method. Also fixed compile issues with the achievements stuff. (latter still WIP) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13615 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-01 21:11:15 +00:00
deveee
b5a3ac476e Added time.cpp to sources.cmake 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13607 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-30 18:46:20 +00:00
hikerstk
074ef2237d Fixed compilation errors (left over references to file that was 
removed).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-30 04:39:51 +00:00
unitraxx
ff877b60ca And you now get immediate notifications for new friend requests! (easily extendable for future personal message notifications) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13537 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-22 01:22:09 +00:00
unitraxx
f43c5c915f GUIEngine addition. Now a queue of dialog windows. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13514 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-19 18:08:51 +00:00
unitraxx
2428a5f3b0 CurrentUser is now linked to a profile. Thread safeness obsolete, so removed. User class deleted. Adapted hilnius' code to conform. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13504 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-18 22:59:23 +00:00
unitraxx
0f0caf5f35 Lots of changes. When you click a user name now (in friends-list or search result), you get a pop-up, where you can click to join and watch the profile. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13490 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-17 00:11:03 +00:00
unitraxx
c1e36b02de User searching! Very close to adding friends now ;) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13469 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-12 23:58:22 +00:00
unitraxx
d8734acbe6 Profile fetching implementation as cache 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13455 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-11 00:59:10 +00:00
unitraxx
b0ff13299c GUI work for profiles. A common inherited base screen for the different tabs. Friends screen added. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13434 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-07 15:03:33 +00:00