Commit Graph
68 Commits
Author SHA1 Message Date
hiker 801b390860 Removed linux compiler warnings. 2015-11-26 09:16:27 +11:00
hiker f81bd5d0c5 Fixed names utf8ToWide and wideToUtf8; added convenience functions
taking std:;string and core::stringw as parameter (removed .c_str()
in many function calls).
2015-11-26 08:47:02 +11:00
Flakebi 65c15fc19a Add a check to split for non-wide strings too 2015-08-17 01:32:13 +02:00
Flakebi 80a649fc2d Merge branch 'master' into test
Conflicts:
	src/utils/string_utils.hpp
	src/utils/translation.cpp
2015-08-17 00:22:02 +02:00
Marianne Gagnon 9f883db6f7 Start work to enable scripting 2015-04-24 20:59:32 -04:00
Flakebi 59b4e2c97e Clean some string code 2015-04-24 01:27:04 +02:00
Flakebi 53164e5cbe Simplify string code 2015-04-24 01:27:04 +02:00
hiker 8d07d26c25 Updated (c) year to include 2015. 2015-03-30 11:42:50 +11:00
Marianne Gagnon e6aea6e0b6 Improve tools and usage of XML encoding, fixes #1982 2015-02-14 18:30:23 -05:00
hiker edd11e3fd2 Changed version number from 'svn' to 'git'. 2014-12-16 11:46:38 +11:00
hiker 006a7f95c9 Cherrypicked pull request #1743 (cppcheck performance fixes). 2014-12-01 15:14:27 +11:00
deve f8de826888 Fixed compiler warnings 2014-10-08 14:44:05 +02:00
hiker ad20635cce Applied patch for #600 (support 64 bit compilation on windows). 2014-09-23 14:41:32 +10:00
Flakebi 55090a0566 Unify log output 2014-07-22 12:54:11 +02:00
konstin ce7da4b237 running whitespace.py 2014-07-08 20:59:34 +02:00
hiker a50177c96a Removed messages.?pp files (and used the strings directly where they
are needed).
2014-06-16 22:05:50 +10:00
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
hiker d4b95e81b4 Moved hash function from StringUtils into player, there is no
other use of that function.
2014-01-23 09:54:48 +11:00
hikerstk 9ee06a5fe0 Replaced boolstr with toString specialisation for bool;
fixed translations in current user. Otherwise many many
cosmetic only changes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15071 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-14 11:47:25 +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 095d5a58c1 Core for viewing achievements of others
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13656 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 23:10:36 +00:00
unitraxx c0c744b45b Fixed const iterator issue and something with the string utils.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13619 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-02 23:22:10 +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 6c210a8c09 Added assert to Log::fail so that a debugger breakpoint can
be triggered. Added Log:: calls to string_utils.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13347 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 07:12:49 +00:00
unitraxx ad198a6e70 Temporary commit so that I can easily revert if shit goes down. And it will go down. Thread callbacks madness!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13290 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 21:20:32 +00:00
unitraxx 8ec5adeec0 Signin in now fully uses asynchronous http requesting. Implemented a nice "loading dots" gimmick for loading.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13276 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 22:49:19 +00:00
unitraxx a3ec5c3d97 [GSoC uni] Small increment.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12900 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-20 02:15:05 +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 e8900f69e6 Fixed #796 (**:**:** as time), which happens if the race is aborted
before a kart has moved (due to a division by zero). Now 99:59:00
is displayed instead, but in case that there should be other 
circumstances that trigger this problem, use 99:59:99 instead of
**:**:**.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12055 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-23 13:13:38 +00:00
hikerstk 9aad59398b Fix one more potential crash.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11938 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-14 06:03:00 +00:00
hikerstk 93da1096fc Fixed crash in STK if a version number was only
two digits (like "0.5" instead of "0.5.0"). This
happens with the classic sand track.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11936 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-14 04:31:11 +00:00
stephenjust 27a2e6902d Add support for hiding add-ons which are marked as being present in the current version of the game.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11409 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-20 03:40:16 +00:00
auria aced31cbfa Add support for playing sounds at given points during the cutscene
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11310 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-16 23:35:51 +00:00
auria 7e5f51b270 Identify players by a unique ID and no more by their name, so that when you rename a player game slots are no longer so confused. This is a somewhat painful change, please report any breakage
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11146 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-24 01:28:43 +00:00
auria f9f8052f09 Improve error handling in string utils
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10481 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-22 21:01:17 +00:00
auria 92eb0ebd2a Ran a small bash script to remove all of those annoying strings. The only thing they gave us were the need to rebuild after committing
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-06 18:43:36 +00:00
hikerstk e92827f357 Cosmetic changes only.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10248 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-11-24 00:22:39 +00:00
auria 9be7bf48ba In the XML standard, entities must start with 'x' if they are hex
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9515 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-16 01:32:19 +00:00
hikerstk c9057d6e74 Added encoding of special characters when writing
addons_installed.xml.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9511 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-15 23:32:18 +00:00
hikerstk 5eff0a1773 Removed the warning " [StringUtils] WARNING: Invalid HTML entity in
'Berny & STKRudy85' (we only support &#...; type HTML entities)"; #364.

The reason for this warning message is that irrXML already decodes "&"
(in attribute values) - so even though the '&' is encoded correctly in
the xml as '&', STK only receives a '&' from irrlicht, which then triggers the
warning message. On the other hand, irrXML does not decode &#...; hex
values. 

So short of changing our encoding of "&" I don't see another choice
except just removing this warning.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9510 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-08-15 23:29:14 +00:00
auria c19572dcfb Add code to resolve all numeric XML entities
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9389 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-30 20:14:30 +00:00
auria 9f33ff77e8 Added support for some XML entities in add-ons description
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9060 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-25 22:38:19 +00:00
hikerstk 3c729b4b0f 1) Added proper handling and detection of installed addons
2) Moved addon related data files into a separate 'addons' directory.
3) Directory names of addons are now lower case.
(Still addons are not stable enough to be used!)


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7252 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-04 21:49:17 +00:00
auria e7734931f2 Added support for %0 type syntax in StringUtils::insertValue, since tools that verify translations integrity don't all like the older %0 syntax I used
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7199 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-31 01:29:04 +00:00
auria 51cc6b8d5c Improved StringUtils::insertValues to only print warnings, not crash, when something is wrong
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7146 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-23 01:30:38 +00:00
hikerstk 940fb65e8a Bugfix: if an xml attribute for an integer array is an empty string,
an array of length 1 with a 0 would be returned instead of an empty
array.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6529 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-11-14 21:08:40 +00:00
hikerstk 6a6d574823 Prevented buffer overflows in case of invalid times (which could happen e.g.
as result of estimated times on a track with invalid drivelines), see also
bug 3078740.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6180 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-10-01 11:00:22 +00:00
hikerstk c1c7daf2fa 1) Added support for new camera mode: end camera positions and types
can now be specified in the scene file. Currently supported are:
   - normal 'ahead of kart' camera (which is what we used so far)
   - fixed camera: camera is at a fixed position, always looking
     at the kart.
2) Removed camera.hpp dependency from kart.hpp.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5585 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-06-28 23:33:07 +00:00