Commit Graph

9719 Commits

Author SHA1 Message Date
hikerstk
56de36925c Oops - missing file in previous commit.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13618 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-02 23:14:17 +00:00
hikerstk
991662fc9f Fixed circular includes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13617 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-02 23:02:15 +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
47b8cdf35b Shoot only one item while fire key is pressed
It fixes #953 and #1006.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13614 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-01 16:02:18 +00:00
deveee
5e90c9fa6b Add patch by lennartack to avoid segfault when game is running with --no-graphics parameter
Ticket #1029

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13613 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-31 07:51:37 +00:00
unitraxx
046269cebb moar achievement stuff
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13612 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-31 02:06:56 +00:00
unitraxx
cd7e986486 Achievements start
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13608 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 22:28:57 +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
deveee
0647c7cd4c Testing commit
Added the same icons which are for Windows - in src/windows_installer/icon.ico.
They have higher quality than previous. I also added icon 128x128 as default.
It looks much better in Gnome 3.x and probably other desktop environmetns.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13606 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 18:46:11 +00:00
curaga
d2c468980d time: include stdio, needed on newer GCC
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 12:25:13 +00:00
curaga
efe3b59bc5 Rename Time to StkTime, X11 has a type called Time
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13604 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 12:24:12 +00:00
curaga
2a6c1a0a8f Mark the irr changes that are upstream
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13603 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 12:15:45 +00:00
curaga
f83a30db47 Some more header cleanup
Now it only takes 38s to build after touching irr_driver.hpp, vs prev 1m 10s.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 12:13:23 +00:00
curaga
a7b990a49f The soccer files were CRLF. Mark as native.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13601 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 12:12:23 +00:00
curaga
fe9d2ec86c Mark the main clean function static
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13600 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 11:39:40 +00:00
curaga
4c0b875f9a Resize the overworld splatmaps to 128x128
Not touching media as I have no media checkout.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13599 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 09:22:30 +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
magned
592dacf391 Removed track alpha-planetarium from trunk.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13597 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 01:52:12 +00:00
magned
e06bdc4e0e Added new icon for 'Expert' difficulty, and renamed 'Iron Man' difficulty to another stolen name. ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 00:24:45 +00:00
hilnius
50db118a91 fixing usleep unistd include
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13593 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-29 17:59:56 +00:00
hilnius
71fb252654 removed some useless files + improvements in end-race GUI interaction
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13592 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-29 17:57:56 +00:00
unitraxx
7e8d167a89 Decent clean-up when closing STK. Send a message to the server if still signed in. (Server-code will not be pushed immediately, so testers might experience errors.)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 22:45:11 +00:00
hikerstk
298bd078fb Applied Deve's patch for #1042 - thanks!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13588 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 13:58:45 +00:00
curaga
3125886dac High-priority log events always go to console
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13587 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 13:51:38 +00:00
curaga
97232fe314 Invalid params should go to console
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13586 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 13:51:12 +00:00
curaga
c353dc1013 Don't pass NaNs to OpenAL
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13585 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 13:50:20 +00:00
hikerstk
abef4345c5 Fixed typo (which only happens when compiling with wiimote).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13584 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 11:59:40 +00:00
hikerstk
dadca72349 Fixex VS compilation: need to link with Iphlpapi.lib,
and apparently 'interface' is reserved (or #defined) in VS.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13583 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 06:52:11 +00:00
hikerstk
de14757419 Fixed compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13582 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 03:39:44 +00:00
hikerstk
c940616909 Fixed compilation on linux.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13581 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 03:36:51 +00:00
hikerstk
ffb2ee7c22 Replaced usleep (which isn't available on windows) with new
custom function in Time::. Replaced calls to irrlicht's
device's sleep function (since it can cause a crash if the
device doesn't exists, which can happen when a thread calls
device->sleep while changing screen resolution).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13580 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 03:17:44 +00:00
unitraxx
e0e8dff768 Last bug filtered out!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13579 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 00:23:31 +00:00
unitraxx
c24bdc66bd Fixed some holes and other improvements.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13578 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-27 23:24:25 +00:00
hilnius
8233b8067d merging uni's and trunk branches. Not everything tested right now
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13577 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-27 01:02:41 +00:00
unitraxx
217ec5ce9c Lots of improvements, mainly related to login (dialog)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13576 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-27 00:07:29 +00:00
hikerstk
1591eb4126 1) Bugfix: member variables where accessed after deleting this
2) Removed unnecessary member variable, some code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13575 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 23:02:06 +00:00
hilnius
93ec81f309 now to know the public ip address, the GetPublicAddress protocol uses randomly selected STUN servers from the UserConfig file. If the server doesn't answer after two seconds, the protocol will reset and pick a random server again.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13574 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 14:14:52 +00:00
unitraxx
fe85a75036 small fix for polling result
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13573 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 14:06:19 +00:00
hikerstk
74c819fd8d Fixed compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13572 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 13:27:03 +00:00
hikerstk
c2e11c5783 Fixed compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13571 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 13:24:58 +00:00
hikerstk
7b970b643a Added (somewhat experimental) code to detect the local
IP address on windows (and to discover if 127.0.0.1 can
be used to connect to a client on the local machine).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13570 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 11:09:39 +00:00
hikerstk
96c04daa6a Fixed VS compilation error.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13569 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 11:07:20 +00:00
hikerstk
d08583b19f Applied same patch from hilnius branch to fix compilation (to
avoid conflicts when merging later).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13568 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 04:38:05 +00:00
unitraxx
616fc2b5be dialog bug fix
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13565 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 00:06:30 +00:00
hikerstk
ee8ec31e62 Fixed VS compilation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13564 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-25 23:37:12 +00:00
unitraxx
5fa970b517 Fixed registration dialog bug and changed event checking in online screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13563 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-25 23:22:28 +00:00
hikerstk
ce67d78d1e Fixed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13562 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-25 13:24:49 +00:00
hikerstk
9896c7ae3b Fixed usage of usleep and round for visual studio.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13561 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-25 12:02:18 +00:00
hilnius
ff1ef8b0b6 addded a List UserConfigParam and a StringListUserConfigParam that contains a list of STUN servers (to avoid hard-coding the STUN server domain name.)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13560 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-24 16:47:56 +00:00