nixt
5912dd2dd6
Merge remote-tracking branch 'upstream/master' into walldriving
...
Conflicts:
src/karts/kart.cpp
2014-07-29 00:18:52 +05:30
Deve
46f73e8ecc
Some improvements for xrandr
...
- choose best available refresh rate
- if resolution doesn't exist, choose first available
- other minor changes.
Works fine with Gnome, but I notices some issues on Openbox and Unity.
2014-07-28 19:23:03 +02:00
hiker
dbe722316a
If an addon icon can not be shown, delete the image file (which will
...
trigger a re-download on the next start).
2014-07-28 21:07:39 +10:00
hiker
f6fcb9d8da
Changed return type of getIconBasename() to be a reference.
2014-07-28 21:07:03 +10:00
hiker
d3dbc42174
Fix #1429 (physical objects do not reset when restarting a race).
2014-07-28 16:53:08 +10:00
hiker
425675bdac
Moved check_structure detection from center of kart to the front
...
of the kart (which will work better for a photo finish). Hopefully
no other side effect.
2014-07-28 09:52:44 +10:00
Deve
992c97258f
Few more checks
2014-07-27 20:00:04 +02:00
Deve
0409a84fa0
Remove debug output
2014-07-27 19:36:40 +02:00
Deve
068b88cb4b
Rename some variables, free memory etc.
2014-07-27 19:32:12 +02:00
Deve
85dd8d11a9
Add experimental support for multi-monitor on linux using xrandr.
...
Now you can play STK on one screen and watch TV on the second ;-)
Currently I use first (main) screen. We can detect from which screen STK was executed using xinerama.
Will be improved.
2014-07-27 00:48:34 +02:00
Vincent Lejeune
f87b404561
Add some doxygen on shader creation/usage
2014-07-26 23:54:57 +02:00
Deve
b9eb981fcc
Some cleanup with USE_XRANDR flag
2014-07-25 19:24:35 +02:00
nixt
4cc406062f
Fix the initial raycast to make it go towards the track.
2014-07-25 20:31:42 +05:30
deve
f3746c068c
Some minor fixes for MinGW compiler
2014-07-25 13:00:01 +02:00
nixt
51a460e3cf
Merge branch 'walldriving' of https://github.com/lurk26/stk-code into walldriving
2014-07-25 15:12:10 +05:30
nixt
051ee24173
Fix item orientation bug. Items should now appear correctly.
2014-07-25 15:11:49 +05:30
hiker
78cdc3bd69
Fixed rescue bug: the kart orientation adjustment would cause a collision
...
with the track on rescue. For now disable the orientation if the kart is
close to the ground. A proper solution will be implemented as part of the
soft-landing branch.
2014-07-24 21:38:58 +10:00
hiker
43124f05fe
Merge branch 'walldriving' of github.com:lurk26/stk-code into walldriving
2014-07-24 21:38:33 +10: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
nixt
a8a6435657
Merge remote-tracking branch 'upstream/master' into walldriving
2014-07-23 20:14:21 +05:30
nixt
abd07e0dc5
Merge branch 'walldriving' of https://github.com/lurk26/stk-code into walldriving
2014-07-23 20:01:38 +05:30
nixt
2673e59844
Fix a bug where the rubber ball would collide with the ceiling in a tunnel.
2014-07-23 20:00:15 +05:30
nixt
f19afc98cf
Fix plunger to work on vertical tracks.
2014-07-23 19:59:20 +05:30
hiker
9fa93d74d5
Fixed linux compilation.
2014-07-23 22:11:37 +10:00
hiker
0c49b87ed7
Merge remote-tracking branch 'upstream/master' into walldriving
2014-07-23 17:07:07 +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
hiker
de46494482
Merge branch 'walldriving' of github.com:lurk26/stk-code into walldriving
2014-07-23 08:12:53 +10:00
hiker
0ef42111bc
Fixed rescue transform: the heading rotation need to be done around
...
(0,1,0), not around the normal, and the order of rotation needs to be
first the heading rotation, then pitch/roll to make the kart parallel
to the ground.
2014-07-23 08:11:30 +10:00
hiker
f0ea8a1a38
Simplify up-offset computation.
2014-07-23 08:03:10 +10:00
hiker
6c02849df3
Avoid use of quaternions, simplify rescue animation. Heading is currently
...
unchanged, but it looks ok-ish.
2014-07-23 08:02:13 +10:00
hiker
20603a2084
Try better computation of heading (which might be better if the kart
...
is not in the xz plane).
2014-07-23 07:59:47 +10: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
nixt
8a4911d41d
Rubber ball (Basketball) now fixed for non-horizontal tracks.
2014-07-22 16:36:08 +05:30
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
