Flakebi
12a1227f20
Merge branch 'upstream/master' into kart-properties
2015-11-29 22:21:08 +01:00
Flakebi
ba3bc326eb
Minor refinements
2015-11-29 22:21:03 +01:00
Flakebi
aea68a2c14
Remove characteristics from kart
2015-11-29 04:08:12 +01:00
Flakebi
9fbe72b3c5
Move getter from characteristics to properties
2015-11-29 04:08:12 +01:00
hiker
896d55816f
Removed linux compiler warnings.
2015-11-26 09:13:57 +11:00
hiker
5c0f71ad07
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:56:03 +11:00
Marianne Gagnon
8ca0fea6fa
Fix audio listener positionning code crash
2015-11-23 19:05:51 -05:00
Marianne Gagnon
c806c1de49
Clear status text in register screen, fixes #2361
2015-11-23 19:04:24 -05:00
Flakebi
6e36c223b9
Hold one kart properties object per player
2015-11-23 01:19:00 +01:00
Deve
8a0927f574
Fixed minor inconsistency in video settings dialog.
...
Regression since 9b562d31f4
2015-11-22 15:33:46 +01:00
Flakebi
79c962dd79
Remove skidding properties and use characteristics instead
2015-11-22 00:40:11 +01:00
Flakebi
2f1d08edbd
Add enabled property to skid characteristics
2015-11-21 23:27:00 +01:00
Flakebi
b4904b182f
Fix merge
2015-11-21 23:15:54 +01:00
Flakebi
ffa85d2206
Merge remote-tracking branch 'upstream/master' into kart-properties
2015-11-21 23:03:58 +01:00
Flakebi
4778460f6c
Apply script
2015-11-21 23:02:16 +01:00
Flakebi
4be02becac
Add skiding properties to characteristics
2015-11-21 23:02:02 +01:00
Deve
b78d4a0c3d
Merge pull request #2372 from rugk/patch-1
...
Readme and Install.md improvments
2015-11-18 09:32:00 +01:00
Deve
a69eb99094
Merge pull request #2380 from nado/clang-fix
...
Fixes few warnings at compilation
2015-11-17 15:23:55 +01:00
Nado
d66a70b250
Fixing some -Wunused-variable
2015-11-17 11:42:28 +01:00
Nado
97de0cbc34
Fixing clang only warnings
2015-11-17 11:42:28 +01:00
Marianne Gagnon
708608177a
Fix audio listener positionning issue
2015-11-16 19:13:28 -05:00
auriamg
794908681d
Merge pull request #2379 from Benau/skin_color_font
...
Color the text base on current skin
2015-11-15 18:13:25 -05:00
Benau
f1982c1bee
Fix coloring
2015-11-15 01:24:06 +08:00
Benau
0deb065fe9
Two new skin (Ruby and Forest)
...
Also fix some alignment issue when the multiplayer selection boxes.
2015-11-14 16:28:37 +08:00
Benau
2b0e3b8828
Reverse type and state
2015-11-14 10:38:14 +08:00
Benau
962fe919d2
Color the text (mainly border including title and billboard) base on current skin
2015-11-14 01:06:28 +08:00
auriamg
bc712b5a44
Merge pull request #2378 from Benau/custom_font
...
Allow configurable fonts file names in stk-config
2015-11-12 19:59:26 -05:00
Benau
7cf4d662ee
Allow configurable fonts file names in stk-config
2015-11-13 02:25:52 +08:00
hiker
8b916a7565
Fixed sfx not playing at right location (e.g. bridge in Green Valley).
2015-11-11 23:14:00 +11:00
Marianne Gagnon
6afc34c06b
Try to fix audio potential issues
2015-11-10 21:31:38 -05:00
Marianne Gagnon
bf14e49ea4
Create OpenAL sound sources asychronously
2015-11-09 19:22:06 -05:00
Marianne Gagnon
86d18c0c3e
Merge branch '2360_fix_attempt'
2015-11-09 18:15:02 -05:00
hiker
4ea8bfd4ab
Fixed typo.
2015-11-09 09:17:45 +11:00
hiker
a7547dff23
Try to fix compilation by reducing number of threads.
2015-11-09 09:14:44 +11:00
hiker
a6ea57d09a
Used leyyins code to dynamically adjust number of threads.
2015-11-09 09:07:12 +11:00
hiker
ce219f2fd4
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-11-09 09:04:43 +11:00
hiker
fbff4db589
Increase number of threads to 32.
2015-11-09 09:03:59 +11:00
Marianne Gagnon
b1803b8dff
Apply fix by Benau
2015-11-07 21:48:12 -05:00
Marianne Gagnon
35316c447d
Merge remote-tracking branch 'Benau/ftcleanup#2'
2015-11-07 21:37:47 -05:00
Benau
09a6b9b502
Remove unneeded variable
2015-11-08 10:34:48 +08:00
Benau
cee7cf0b37
Implement better error detection
2015-11-08 10:24:31 +08:00
auriamg
32e54d4f87
Merge pull request #2374 from Benau/ftcleanup#2
...
More clean up freetype-related code
2015-11-07 20:21:55 -05:00
Benau
0b5a916980
Remove unused header
...
Also fix some spacing
2015-11-08 01:36:40 +08:00
Benau
09101e923c
More clean up freetype-related code
...
1. Remove useless get font properties class
2. Pre-set the face dpi
3. Make all freetype related code to have a better coding style
2015-11-07 16:24:31 +08:00
auriamg
c2d863888b
Merge pull request #2373 from Elderme/issue_2369
...
Fix issue 2369
2015-11-04 18:24:03 -05:00
Elderme
8d91ab5105
merge with master
2015-11-04 21:24:25 +01:00
Marianne Gagnon
78fd0e373f
#2360 fix attempt
2015-11-03 19:15:55 -05:00
auriamg
1cfbdd7c8c
Merge pull request #2371 from leyyin/clean-python
...
Make remove-whitespaces script more pythonic
2015-11-03 18:44:29 -05:00
rugk
d1e0564f8b
Merge pull request #4 from rugk/patch-2
...
Update INSTALL.md
2015-11-03 23:23:35 +01:00
rugk
b31464042d
Update INSTALL.md
...
* correct spaces
* proper names with a capital letter
* also use block code indentation for single-line commands to keep a consistent look (`this code style` should only be used for code/commands mentioned inside of other text)
2015-11-03 23:21:08 +01:00
