Deve
|
b9eb981fcc
|
Some cleanup with USE_XRANDR flag
|
2014-07-25 19:24:35 +02:00 |
|
deve
|
f3746c068c
|
Some minor fixes for MinGW compiler
|
2014-07-25 13:00:01 +02:00 |
|
hiker
|
2f71c5f99f
|
Merge branch 'konstin-lapnumber'
|
2014-07-24 17:44:26 +10:00 |
|
hiker
|
fbf5bf4166
|
Changed default number of laps to be 3 (and not the number of laps
used last time), which seems to be a better default. Some minor
cosmetic changes.
|
2014-07-24 17:43:11 +10:00 |
|
hiker
|
9267e2d304
|
Merge branch 'lapnumber' of https://github.com/konstin/stk-code into konstin-lapnumber
|
2014-07-24 16:48:03 +10:00 |
|
Marianne Gagnon
|
9478adbd8c
|
Merge branch 'TupleTest'
|
2014-07-23 21:17:08 -04:00 |
|
hiker
|
12259c6c48
|
Try to fix travis building debug and release (cd failed before, causing
travis to fail).
|
2014-07-24 09:52:29 +10:00 |
|
hiker
|
2896b47233
|
Try to let yavis compile both debug and release mode.
|
2014-07-24 09:26:27 +10:00 |
|
Marianne Gagnon
|
7f56bf6946
|
Invalid defaut value for sortable was used in list widget
|
2014-07-23 18:43:12 -04:00 |
|
Deve
|
16d4f0481e
|
Merge pull request #1421 from Flakebi/master
Fix compiling issues without debug mode in my log code
|
2014-07-23 23:13:44 +02:00 |
|
Flakebi
|
277aab1a0e
|
Fix compiling issues without debug mode in my log code
|
2014-07-23 21:40:46 +02:00 |
|
hiker
|
9fa93d74d5
|
Fixed linux compilation.
|
2014-07-23 22:11:37 +10:00 |
|
Marianne Gagnon
|
06e4cbb9be
|
Fix input config screen, since the list widget was improved it didn't display quite right
|
2014-07-22 20:09:38 -04:00 |
|
auriamg
|
daa84aabef
|
Merge pull request #1419 from Flakebi/master
Fixes and using the log for log output
|
2014-07-22 19:38:55 -04:00 |
|
Deve
|
35436346cd
|
Merge pull request #1420 from konstin/gitignore
make git ignore "data/models" and the track editor
|
2014-07-22 22:10:32 +02:00 |
|
konstin
|
ba92e1ef6b
|
make git ignore data/models and the track editor
|
2014-07-22 17:45:35 +02:00 |
|
Flakebi
|
55090a0566
|
Unify log output
|
2014-07-22 12:54:11 +02:00 |
|
Flakebi
|
53fd34f7b8
|
Fix issues with in-game screens
|
2014-07-22 12:54:11 +02:00 |
|
Flakebi
|
a9a46a2dd6
|
Some little fixes
|
2014-07-22 12:54:10 +02:00 |
|
hiker
|
c322c507da
|
Fix shader error (vlj, please check).
|
2014-07-22 13:28:12 +10:00 |
|
Marianne Gagnon
|
fff498b9fe
|
Improve graphics settings dialog to try to avoid mutually incompatible options
|
2014-07-21 19:58:45 -04:00 |
|
Marianne Gagnon
|
b2fab2ae6d
|
Fix glitch where the irrlicht dialog close button would be slightly visible in the corner of a STK dialog, and a crash would ensue if you clicked it
|
2014-07-21 19:55:02 -04:00 |
|
Marianne Gagnon
|
939e5d9fff
|
Rework graphics settings popup to make it clear which options require the advanced pipeline
|
2014-07-21 19:48:17 -04:00 |
|
Marianne Gagnon
|
14080e602a
|
Code in previous commit was incorrect, no idea why it even compiled for me
|
2014-07-20 18:18:35 -04:00 |
|
Marianne Gagnon
|
476d6eda02
|
almost there
|
2014-07-20 18:10:48 -04:00 |
|
Marianne Gagnon
|
01ed87ec1b
|
continue
|
2014-07-18 20:30:35 -04:00 |
|
Marianne Gagnon
|
7e8fb6bc16
|
Fix duplicated paramter name
|
2014-07-18 20:11:40 -04:00 |
|
Marianne Gagnon
|
071270cb5e
|
more work
|
2014-07-18 20:02:10 -04:00 |
|
Marianne Gagnon
|
40851516ac
|
continuing work
|
2014-07-18 19:22:20 -04:00 |
|
Deve
|
bb4381a0a7
|
Merge pull request #1414 from konstin/fontsize
fix #1410 + better text alingment in GP info dialog
|
2014-07-18 21:02:35 +02:00 |
|
konstin
|
7a8743fb65
|
better text alingment in GP info dialog
|
2014-07-18 16:03:23 +02:00 |
|
konstin
|
0a93b7a2d3
|
fix #1410
|
2014-07-18 15:58:34 +02:00 |
|
Marianne Gagnon
|
6aa95f58b9
|
Merge branch 'master' into origin/TupleTest
|
2014-07-17 20:01:27 -04:00 |
|
Marianne Gagnon
|
00ae12677a
|
Fix GUI crashes when exiting STK by clicking the X button in the window titlebar
|
2014-07-17 19:24:35 -04:00 |
|
konstin
|
e7a9c6fcc6
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lapnumber
|
2014-07-17 20:32:54 +02:00 |
|
vlj
|
4e079b0e14
|
Fixes shader errors reported by Auria
|
2014-07-17 02:17:49 +02:00 |
|
vlj
|
23bc1f9344
|
Remove use of texture2d in rh.frag
|
2014-07-17 02:11:04 +02:00 |
|
Marianne Gagnon
|
e6fd365685
|
Re-fix clang fixes so that it works on other compilers too
|
2014-07-16 20:02:52 -04:00 |
|
Marianne Gagnon
|
8483613a4e
|
clang fixes
|
2014-07-16 19:51:24 -04:00 |
|
vlj
|
c4238d2089
|
Use emplace_back instead of push_back(std::make_tuple())
|
2014-07-17 01:44:57 +02:00 |
|
vlj
|
14e3ccd059
|
Duplicate singleton code for abstract/non abstract cases
|
2014-07-17 01:30:45 +02:00 |
|
vlj
|
366439bdd0
|
Reenable transparents.
|
2014-07-17 01:07:59 +02:00 |
|
vlj
|
6e4cca81d1
|
Fix material identification.
|
2014-07-17 01:06:17 +02:00 |
|
vlj
|
25c5fb326f
|
Do not use srgb texture for splatting.
|
2014-07-17 00:56:11 +02:00 |
|
vlj
|
6710f61863
|
Do not convert normal map to srgb.
|
2014-07-17 00:46:17 +02:00 |
|
vlj
|
be55a1a1c6
|
Reenable normal map material.
|
2014-07-17 00:36:10 +02:00 |
|
Marianne Gagnon
|
44bce402e3
|
clang fixes
|
2014-07-16 18:34:59 -04:00 |
|
vlj
|
f5a5988967
|
Fix instanced and reenable displace.
|
2014-07-17 00:24:09 +02:00 |
|
vlj
|
40a7ab0780
|
Raise one of ssao tolerance value.
|
2014-07-17 00:12:54 +02:00 |
|
vlj
|
e6bade24ad
|
Fix RSM
|
2014-07-17 00:10:34 +02:00 |
|