Commit Graph

4359 Commits

Author SHA1 Message Date
hikerstk
1bd17892e5 4-This line, and those below, will be ignored --
M    src/states_screens/addons_screen.cpp
M    data/gui/addons.stkguRemoved unused field.i


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8627 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-17 07:06:10 +00:00
hikerstk
837277ef92 Fixed compile warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8626 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-17 06:47:44 +00:00
hikerstk
c3d40b798a Renamed addons_view_dialog.stkgui to addons_loading.stkgui,
so that the stkgui name is the same as the source file name.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8625 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-17 06:43:18 +00:00
hikerstk
7fb3a6fb0b Removed compiler warnings about order of initialisations.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8624 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-17 05:32:36 +00:00
hikerstk
9bdc12ba95 Removed unused HC_SLEEP command.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8623 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-17 05:31:33 +00:00
mbjornstk
53640b68c2 Change printf to fprintf (as other err prints in same file) so it compiles.
Otherwise it halted with g++ 4.6 with the following test:
addons/addons_manager.cpp: In member function ‘void* AddonsManager::downloadIcons()’:
addons/addons_manager.cpp:157:41: error: cannot pass objects of non-trivially-copyable type ‘const string’ through ‘...’
addons/addons_manager.cpp:157:41: warning: format ‘%s’ expects argument of type ‘char*’, but argument 2 has type ‘const string’ [-Wformat]


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8622 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-17 04:24:56 +00:00
auria
780f45754f make list header non-focusable for keyboard-only navigation
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8620 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-17 01:15:21 +00:00
auria
7a1ab1fc61 Further improve list widget header
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8619 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-17 01:06:12 +00:00
auria
698ab54e7c revert to default is currently selected skin is not found (if someday we decide to remove 'glass', for instance ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8616 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-17 00:55:13 +00:00
auria
5041199771 Some more work on list with header
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8614 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-17 00:49:57 +00:00
auria
3cee2ddbe3 A optional header to list control (atm not very pretty and only supports 2 columns, but the basic features are there)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8613 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-17 00:39:55 +00:00
hikerstk
8cd2eb1e16 Renamed Synchronised::get()/set() to getAtomic()/setAtomic()
to better indicate what those functions are doing.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8611 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-16 21:49:58 +00:00
hikerstk
e0107c35eb 1) Fixed handling of aborts (previously an abort during installation
could end in cancelling a currently ongoing icon download, e.g. if
   icons were still downloading, and the download of the addon had not
   been started yet).
2) Fixed potential deadlocks or crash problems at exit.



git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8610 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-16 13:17:03 +00:00
hikerstk
6ac6e76f12 Bugfix: clicking on 'back' in a new addon installation case
crashed stk.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8609 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-16 13:13:22 +00:00
hikerstk
859a77df0d Added support for new XML format which can specify either
an image or an icon.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8608 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-16 13:11:37 +00:00
hikerstk
709b73deb8 Added warning message in case of an addon that has no image defined.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8607 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-16 13:10:38 +00:00
auria
13de7b86d4 Give the same APPROXIMATE plunger-in-face handicap at all resolutions
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 23:59:49 +00:00
auria
344c89e258 When aiming at the closest kart, prefer karts on similar Y levels to karts much higher or much below
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8597 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 23:42:21 +00:00
auria
4e85539c21 Remove commented out code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8595 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 23:26:12 +00:00
auria
2ed8f0f6d2 highlight ribbon arrows as requested by Joerg
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8594 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 23:08:15 +00:00
auria
41bded8917 More sound tweaks in multiplayer
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8593 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 18:58:33 +00:00
auria
a3b3fafe27 More sound tweaks in multiplayer
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8592 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 18:44:42 +00:00
auria
32a534b80f Dim more sounds in multiplayer
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8591 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 18:38:31 +00:00
auria
75c1b486db Suppress annoying and harmless warning
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 18:28:35 +00:00
auria
c66ada8168 Suppress annoying warning
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8589 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 18:28:07 +00:00
auria
424f176497 Fix annoyingly high terrain sounds in multiplayer mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8586 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 18:20:24 +00:00
hikerstk
c3a0007bd5 Bugfix:
1) If a downloaded file already existed (e.g. an aborted download previously),
   the rename from *.part might fail (the behaviour of rename in this case
   is unspecified).
2) Reset the abort flag if a download is aborted - otherwise no further download
   is possible.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8585 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 12:56:07 +00:00
hikerstk
3198d8a6b7 Bugfix: don't cancel a download if the user actually only clicked
on 'back' in the uninstall page.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8584 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 12:54:12 +00:00
hikerstk
d0f4c8917a Renamed IGNORE macro to FOR_GETTEXT_ONLY since IGNORE is
already defined in winbase.h.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8583 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 10:58:24 +00:00
auria
85c337fc7f Add LOD to item. Say hello to a 5-10 FPS boost\!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8579 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-15 00:18:35 +00:00
auria
0cf4b61e56 Removed some unused strings
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8573 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-14 19:40:58 +00:00
auria
ca2906bac6 Allow translating the basic groups
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8572 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-14 19:33:48 +00:00
auria
5f812437b9 Build upon work from previous commit. Commented out because the code is currently not very useful
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8567 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-14 00:42:57 +00:00
auria
15cdaf04bd For ticket #82 : start adding the infrastructure to show in the UI which gamepad is which
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8566 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-14 00:30:30 +00:00
auria
922eb14a22 Simplify and make more robust the random kart selection code for AIs, hopefully fixing Arthur_D's bugs
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8565 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-13 23:40:29 +00:00
hikerstk
6ccd28d7b2 Fixed race condition on game end: if the network thread quit between the lines:
if(m_thread_id)
   pthread_cancel(*m_thread_id)
a crash in pthread_cancel happened. Changing m_thread_id is now protected
by a mutex.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8564 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-13 06:49:12 +00:00
hikerstk
c52fa8ceff 1) Fixed race condition: the network thread could access network_http
before it is assigned.
2) The network thread is now signalled to quit earlier, giving it more
   time to quit cleanly.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8563 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-13 06:29:12 +00:00
auria
8b92b84076 Fixed crash when textures are not found
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8561 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-13 01:33:22 +00:00
auria
3d743e8e2d Use a better path for add-ons on OSX, before I had chosen a poor location and addon files were among config files
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8560 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-13 01:29:18 +00:00
auria
3b91d2c327 Add some missing docs
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8557 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-13 01:03:38 +00:00
auria
209911fa21 Add method beforeAddingWidgets to dialogs too, use it to fix Joerg's problem
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8556 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-13 01:02:24 +00:00
hikerstk
5d787ec0cb Try to use bubble widget for the description of addons. Also removed
'Description:' text.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8555 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-13 00:51:13 +00:00
auria
1ad86ccf55 Allow escaping from gamepad visualisation screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8554 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-13 00:03:12 +00:00
auria
61af0d7159 Update Xcode project
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8553 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-13 00:02:23 +00:00
hikerstk
498a0a104e 1) Moved news message handling into a separate object.
2) Added prioritised request list to network manager.
3) Fixed ticket 217 (crash at shutdown), which happens if 
   the background thread downloading the icons is still
   active when STK is quit (and then accessing managers
   that have been deleted).
4) Handled partial downloads correctly: files are now
   downloaded with ".part" appended to the filename,
   and only upon a successful download renamed to 
   the original name.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8552 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-12 23:51:00 +00:00
auria
11e925f867 Fix musical note hiccup bug by preparing track music in 2 phases
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8551 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-11 01:47:27 +00:00
hikerstk
449f99be62 Used bitmask for verbosity.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8549 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-09 12:28:52 +00:00
auria
4c2d0215a0 Fixed leak + blindly try to fix disabling devices not working as seemed to be reported
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8534 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-08 00:56:09 +00:00
auria
1e2dc94c18 Minor tweak to Xcode project : sort files alphabetically
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8523 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-07 16:43:25 +00:00
auria
67b0d9b4d4 Fixed 'all' tabs
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8522 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-06 01:28:19 +00:00