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

196 Commits

Author SHA1 Message Date
konstin
7cc83e1475 running whitespaces.py update 1 2014-03-29 11:33:43 +01:00
konstin
663fffdebb Revert "Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces" 
This reverts commit 65e2dcf2f0.
 2014-03-29 11:32:04 +01:00
konstin
65e2dcf2f0 Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces 2014-03-28 20:08:39 +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
hiker
d19b5a2732 Fxed support for searching for data and assets based on the executable location. 2014-03-07 07:53:35 +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
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
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
97be85777d Started to move current player info from unlock manager into 
player_manager.
 2014-02-09 23:22:45 +11:00
KroArtem
591e421b10 clean src/io 2014-02-07 16:23:46 +04:00
hiker
62d46b7ec0 Renamed XMLWriter to UTFWriter (which is the correcter name). 2014-02-05 08:22:38 +11:00
hiker
b9b2f9626e Support running stk from the cmake bin directory. 2014-01-21 08:59:55 +11:00
hiker
da7bad92e6 Don't return error code if a file to be removed does not exist. 
Improved error handling in addons.xml download.
 2014-01-16 15:29:47 +11:00
Joerg Henrichs
c622ba258c Made stk-assets the default name of the assets data directory. 2014-01-15 11:56:34 +11:00
hikerstk
ba1e6465ef Fixed #1146 - removing directories didn't work (listFiles() returns absolute 
paths (now??)).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14988 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 23:07:01 +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
auria
245910d3a7 Apply patch to improve paths on osx 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14869 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-01 16:43:03 +00:00
auria
6fb8188e07 Fix finding data files on OSX 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14856 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-31 19:22:05 +00:00
hikerstk
c450c97472 Allowed the music directory to be external. Renamed 
getMusicFile to searchMusic and getTextureFile to
searchTexture. Removed m_root_dir from file_manager.
Added convenience function getTexture to irr_driver
which takes an asset type, so now less code is needed
to load textures (though that's proably not used
everywhere yet).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-18 22:29:08 +00:00
hikerstk
73c498daf3 Start to support 'externa' data directories. Most directories 
from data can now be moved out (except music). STK prints
an overview of which directory is taken from where. More 
cleanups and improvements will come.
Also moved skins into a separate directory under data (from
data/skins), since it's likely that skins will be part
of a binary package (i.e. changes to skins not really
related to code), while gui files will more likely stay
with the code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-17 23:48:47 +00:00
hikerstk
0076bec269 Converted glow color back fro floating point to integers (upon artists requests). 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14691 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 20:02:43 +00:00
hikerstk
09dc33d07e Moved the glowing data from stk_config.xml to items.xml. 
Unfortunately I can't test (since the shaders don't work for me).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14683 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 12:24:26 +00:00
hikerstk
bced8cdb9f Merged with trunk, part 1 (due to previous failures I am splitting this 
patch).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 04:27:55 +00:00
unitraxx
d6f6383833 While one issue is fixed, another one popped up. Pretty late, I'll look at it tomorrow. (Feel free to have a look ;) ) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13632 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-05 02:41:08 +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
unitraxx
2711744ed8 merge with trunk 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13477 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-15 00:20:28 +00:00
hikerstk
3187937496 Simplified #includes, and changed order to follow our style guide. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13401 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-01 06:11:10 +00:00
hikerstk
5efa7c8ad2 Removed apparently unnecessary #include <io.h>, since 
it will actually include io.h from wiiuse, not the
internal one from VS (which results in some warnings
about RAD_TO_DEGREE already defined).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13399 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-01 06:02:44 +00:00
hilnius
ea2b52a663 merging hilnius's branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13394 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-31 18:03:11 +00:00
unitraxx
8656a12d12 Undoing last commit which was not what I wanted after all. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13391 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-30 22:05:06 +00:00
unitraxx
75e286932f An attempt to merge with hilnius' branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13390 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-30 21:39:27 +00:00
unitraxx
1d90f554e8 Merging with trunk, aesthetic changes, and added virtual keyword to the destructor of Track_object.hpp because of errors. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13376 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-28 17:27:06 +00:00
hikerstk
2d504379ca Removed reference to logging stderr (which is not done anymore). 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13348 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 07:13:36 +00:00
curaga
403e82c97b Fix compiler warning 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13238 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-15 13:15:47 +00:00
hilnius
9aa25a4e97 Modifications in protocols to use the http connector and xml to get information from the database. Correcting the --server option which wasn't working. Now launching supertuxkart --server will connect the user 'server':'serverpass' and start automatically a ServerLobbyRoomProtocol that listens to incoming peer connections. 
Improvement of logging. Some were fatal whereas they shouldn't.
Improvement of the protocol system. There were mutex permanent locking.
Protocols that do not use http are now non-blocking (except maybe one).
A user can 'quick join' the server by logging then pressing the 'quick play' button in the online panel.
Improvement of packet serialization/unserialization
Added a ping protocol to ping peers as long as they don't respond


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13112 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-07 19:49:51 +00:00
hilnius
2a0a9a3617 merging uni's and hilnius's branches in networking 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13077 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 17:24:20 +00:00
hilnius
613e97d0d6 breaking everything that was working. cannot even start a race now, need to rewrite the network manager and part of the race startup sequence 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13032 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-29 22:57:18 +00:00
unitraxx
7e36035228 [GSoC Uni_] Several improvements. No point in having a decent commit message, if it's for me only ;) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12967 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-24 19:20:16 +00:00
unitraxx
98274f59d5 Base for having users and connection with server. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12884 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-19 01:12:45 +00:00
curaga
57c3cbae3e Space cleanup pass on the headers 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12817 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-30 19:47:39 +00:00
curaga
b56bf4dc53 Remove trailing space, git doesn't like it 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12797 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-29 22:04:35 +00:00
hikerstk
e99e944f9b Fix #942. Thanks to hilnius. 
(note I modified the original patch, and had no opportunity to verify it
again on linux. If it doesn't work, blame me, not hilnius).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12713 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-30 07:17:02 +00:00
hikerstk
5776ae8b80 Log all important info to stdout.log on windows (part 
of #836: remove console on windows).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12689 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-23 00:28:11 +00:00
auria
634c46906e Apply patch by marius1309 to fix #939, thanks\! 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12688 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-22 23:48:23 +00:00
hikerstk
a693eb7eb5 Added reverse-sorting of addons (#916). Thanks to ingridmorstrad for the patch. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12673 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-18 22:44:18 +00:00
auria
bc1d1e7d31 First part of track object refactor 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-04 01:15:37 +00:00
hikerstk
ecfdae57f8 Yet another fix for addons :( Now installation of addons might 
work as well as deleting them.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12589 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-27 21:52:40 +00:00
hikerstk
b967e5a492 Fixed addons management (deleting), which I broke in r12581: Addons used 
their id as directory name (and since the id was changed to have addon_
as prefix, this didn't work anymore).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12587 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-27 21:01:05 +00:00
hikerstk
5e59de20fe Fixed missing '/', and clean up varies paths (all directories 
should end in '/').


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12536 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-01 05:33:36 +00:00
hikerstk
04bcf75a37 File manager now provides the directory for screenshots and 
shader. Location of screenshots is now changed:
windows: %APPDATA%/supertuxkart/screenshots
osx: ~/Library/Application Support/SuperTuxKart/Screenshots
Linux: $HOME/.cache/supertuxkart/screenshots


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12535 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-01 03:11:17 +00:00