hiker
65454db0ce
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-22 11:04:07 +11:00
hiker
6213959f31
Cosmetic/coding style changes.
2015-10-22 11:03:41 +11:00
Deve
8bfe048f0f
Remember race type in saved GP.
...
Continue standard race as follow the leader and vice versa doesn't have a sense.
2015-10-21 22:42:59 +02:00
Deve
4049722677
Don't crash if selection is larger than number of items in ribbon widget
2015-10-21 22:37:38 +02:00
hiker
25ca5646ff
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-22 00:03:11 +11:00
hiker
d6e7ddf000
Avoid copying STK Events for networking.
2015-10-22 00:02:40 +11:00
hiker
f297c92039
Removed more includes of event.hpp in hpp files.
2015-10-21 17:39:53 +11:00
hiker
841d9b248e
Removed some unnecessary #includes.
2015-10-21 17:31:33 +11:00
hiker
1a0fb9fa4c
Renamed notifyEvent to propagateEvent for the manager to avoid
...
'duplicated' name (notifyEvent also exists in each protocol).
2015-10-21 17:18:27 +11:00
hiker
cce4793fa3
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-21 08:43:32 +11:00
hiker
40629d9816
Changed Event's m_peer from STKPeer** to STKPeer *. Fixes some minor memory leaks.
2015-10-21 08:11:35 +11:00
hiker
814f248cbd
Fixed linux compilation.
2015-10-21 08:09:24 +11:00
hiker
9cdf7058a7
More coding style fixes.
2015-10-21 08:07:00 +11:00
hiker
94e87796f5
Coding style fixes.
2015-10-21 07:51:53 +11:00
Deve
054d9251bb
Don't sort karts after loading saved GP.
...
This causes issues in follow the leader races, because after sorting the leader is not leader anymore.
This sorting function is most probably not needed because the list is sorted in startNextRace function (where the leader is properly skipped).
2015-10-20 19:52:57 +02:00
Deve
4ac479cbf3
Merge pull request #2354 from hasufell/master
...
Fix compilation with system angelscript
2015-10-20 19:12:32 +02:00
hasufell
4e307522d1
Fix compilation with system angelscript
...
Upstream names the shared library angelscript_s.
In addition, add more common PATH_SUFFIXES.
2015-10-20 16:47:23 +02:00
hiker
54a0e50fe3
Try to fix linux compilation.
2015-10-21 00:18:51 +11:00
hiker
10c612a0f6
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-20 22:44:26 +11:00
hiker
0dfa05227e
Cosmetic changes mostly, removed unused functions.
2015-10-20 22:42:57 +11:00
Marianne Gagnon
cc7f7b9b4c
Use SigmarOne font for digits
2015-10-19 21:02:25 -04:00
Marianne Gagnon
9c3da791a4
Add Benau to credits, thank you :)
2015-10-19 20:56:38 -04:00
Marianne Gagnon
2dfc493adf
Minor FreeType cleanup
2015-10-19 19:25:51 -04:00
hiker
6fc4b9c19d
Prevent crash in case of issues creating the server.
2015-10-20 09:37:51 +11:00
hiker
46b4d275a9
Minor refactoring and coding style fixes.
2015-10-20 09:34:14 +11:00
Deve
0d58774b54
Fixed mingw compilation
2015-10-19 20:50:39 +02:00
hiker
d5a9364ece
Minor cosmetic changes.
2015-10-19 17:06:14 +11:00
hiker
3a544b69eb
Merge branch 'freetype_lazyloadchar' of github.com:supertuxkart/stk-code into freetype_lazyloadchar
2015-10-19 13:31:39 +11:00
hiker
52b5b7c8d1
Fixed crash caused by using a char pointer to a temporary string only (which can get
...
overwritten/freed before the pointer is used).
2015-10-19 13:29:52 +11:00
Marianne Gagnon
fcd402b538
Merge remote-tracking branch 'Benau/lazyloadchar' into freetype_lazyloadchar
2015-10-18 21:47:16 -04:00
Benau
109d6b91ce
Choose the correct title font smartly
2015-10-19 09:39:57 +08:00
Marianne Gagnon
06fb6d4eb2
Delete old fonts and related code
2015-10-18 20:15:05 -04:00
Marianne Gagnon
dd975de74f
Remove the font tool, which is no longer necessary
2015-10-18 20:10:31 -04:00
Marianne Gagnon
6d365032f3
A few minor bugfixes, a little cleanup in TTF font code. Add Ubuntu font for latin languages since it generally looks better than Freesans for a game
2015-10-18 20:07:11 -04:00
Marianne Gagnon
1a58df0696
Fix issue in language selection screen (improper utf-8 decoding)
2015-10-18 19:53:20 -04:00
Marianne Gagnon
0571db6bef
Freetpye support on OSX
2015-10-18 19:44:28 -04:00
hiker
8d0c22346d
Cosmetic changes only.
2015-10-19 08:15:43 +11:00
hiker
e535afc9d8
Cosmetic changes only.
2015-10-19 08:11:28 +11:00
hiker
faf697ef5d
Made access to the public address thread safe, and simplified setting
...
of the public address.
2015-10-19 08:02:44 +11:00
Benau
218f94d181
Silence warning
2015-10-18 10:10:03 +08:00
Marianne Gagnon
d0d6476feb
Merge remote-tracking branch 'Benau/lazyloadchar' into freetype_lazyloadchar
2015-10-17 21:41:56 -04:00
Benau
fad23b148b
Fix travis build
2015-10-18 09:40:37 +08:00
Marianne Gagnon
cee6d9d611
Merge branch 'master' into freetype_lazyloadchar
2015-10-17 21:34:19 -04:00
Marianne Gagnon
a84b04db66
Merge remote-tracking branch 'Benau/freetype' into freetype_lazyloadchar
2015-10-17 21:31:05 -04:00
Marianne Gagnon
f909619413
Add translation help comment, for issue #2335
2015-10-17 20:47:19 -04:00
Marianne Gagnon
fcfbd82a0e
Merge branch 'TranslatableDateTime'
2015-10-17 20:44:32 -04:00
Deve
e7e7e9e7d3
Make sure that we compile irrlicht only as static library.
...
Compiling as shared library can cause errors during linking because of GLContextDebugBit variable, which is defined in STK sources.
2015-10-17 16:02:35 +02:00
hiker
4fad614d55
Removed unnecessary copy constructor call, which makes the Synchronised
...
class work with NoCopy objects.
2015-10-17 09:33:05 +11:00
Ben
adbaa44864
Fix typo
2015-10-17 03:03:56 +08:00
Benau
d166aa620e
Add lazy load char function
...
Now less fonts are used to prevent mismatch, also include font license file
2015-10-17 02:57:27 +08:00