hiker
|
2228897f46
|
Merge pull request #1384 from leyyin/master
Fix move on unitialised values in displayFPS
|
2014-07-04 08:32:37 +10:00 |
|
Bart Cools
|
c274a3beef
|
Inserted fix for wrong use of parameters. The kart bars are now set correctly, but the use of "magical numbers" in the bars should be avoided somehow
|
2014-07-03 23:42:34 +02:00 |
|
Daniel Butum
|
e2418aea13
|
Fix c++11 feature
|
2014-07-04 00:34:37 +03:00 |
|
Daniel Butum
|
efac42f746
|
Fix move on unitialised values in displayFPS
|
2014-07-03 17:22:00 +03:00 |
|
hiker
|
80d09825bb
|
Fix (potential) problem with exponential spring response (which is
not used atm).
|
2014-07-03 16:53:12 +10:00 |
|
hiker
|
926f5fc641
|
Merge branch 'properties'
|
2014-07-03 15:25:08 +10:00 |
|
hiker
|
15dbc752d8
|
Added a space, hoping that this will trigger an automatic run of cmake
to discover new files to build.
|
2014-07-03 14:23:35 +10:00 |
|
hiker
|
be3882845c
|
Merge branch 'properties' of https://github.com/solistice/stk-code into properties.
Fixed conflict.
Conflicts:
src/guiengine/widgets/model_view_widget.cpp
|
2014-07-03 14:17:45 +10:00 |
|
vlj
|
ad913bc961
|
Fix crash without advanced pipeline.
|
2014-07-02 22:37:52 +02:00 |
|
vlj
|
fd5061057d
|
Fix for instanced object with default material.
|
2014-07-02 22:37:51 +02:00 |
|
vlj
|
d5c91dcfe4
|
Remove Untextured material.
|
2014-07-02 22:37:51 +02:00 |
|
vlj
|
80cab0ed28
|
Use a default texture for default material when there is none
|
2014-07-02 22:37:50 +02:00 |
|
vlj
|
475d738d4b
|
Merge remote-tracking branch 'origin/NewRTTMinimap'
|
2014-07-02 00:24:03 +02:00 |
|
Bart Cools
|
d8f65cf3fa
|
moved test scripts to tools directory
|
2014-07-01 14:32:24 +02:00 |
|
Bart Cools
|
4a13eebc00
|
Merge branch 'master' into properties
|
2014-07-01 13:55:10 +02:00 |
|
Bart Cools
|
b1426dd31d
|
small changes to the tests to get some initial results
|
2014-07-01 13:33:35 +02:00 |
|
Bart Cools
|
41a5b5275b
|
properties group node is not really necessary
|
2014-07-01 13:32:26 +02:00 |
|
Bart Cools
|
0fa6df587f
|
Removed redundant kart configuration
|
2014-07-01 12:25:02 +02:00 |
|
Bart Cools
|
8862be1efc
|
Final fix for properties, every missing field / overwrite should now be handled
|
2014-07-01 10:59:42 +02:00 |
|
Bart Cools
|
1bbd294750
|
Forgot to add documentation to a single node
|
2014-07-01 10:43:00 +02:00 |
|
Bart Cools
|
a73462759b
|
Moved the default kart-type to <general-kart-defaults> to better catch missing values in the kart-type nodes. Also moved the documentation again to properly fit the fields.
|
2014-07-01 10:37:00 +02:00 |
|
hiker
|
2b6e1b8432
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-07-01 09:51:56 +10:00 |
|
Deve
|
ff6af6b072
|
Change power of bouncy edges in soccer field as temporary solution for #1367.
Ideally power of bounce should depend on soccer ball weight.
|
2014-06-30 18:20:31 +02:00 |
|
hiker
|
621539849a
|
Removed unused code.
|
2014-06-30 16:45:00 +10:00 |
|
vlj
|
61aaccca33
|
Clean vao_shadow_pass on instanced.
|
2014-06-29 22:30:18 +02:00 |
|
vlj
|
5cce35041b
|
Some cleanup
|
2014-06-29 22:28:50 +02:00 |
|
vlj
|
b861c3fb73
|
Use fixed attribute location for instanced objects.
|
2014-06-29 22:19:10 +02:00 |
|
vlj
|
bc7e2cd517
|
Some cleanups
|
2014-06-29 16:26:12 +02:00 |
|
hiker
|
be76aae256
|
Interpolate the normal for the gravity to allow smoother changes of
gravity - though it does not improve the bumpiness on twisted road section.
|
2014-06-29 22:53:35 +10:00 |
|
vlj
|
14cfa57f2a
|
Change "faceness" of lap line.
|
2014-06-28 16:05:21 +02:00 |
|
Vincent Lejeune
|
8f59d8cac0
|
Add a weight for vignette.
|
2014-06-28 00:20:44 +02:00 |
|
Bart Cools
|
109f783fa4
|
Finally implemented the correct way to parse the data
|
2014-06-27 23:26:02 +02:00 |
|
Deve
|
45abf1c45a
|
Fixed compilation error
|
2014-06-27 21:19:36 +02:00 |
|
vlj
|
bde17a28d5
|
Fix for GL 3.1 context
|
2014-06-27 20:58:52 +02:00 |
|
hiker
|
9e44c5980a
|
Fixed --track command line option.
|
2014-06-27 15:39:33 +10:00 |
|
Marianne Gagnon
|
21cb22f13a
|
Workaround crash. Vlj, please look at this, this is probably not an idea fix!
|
2014-06-26 21:43:47 -04:00 |
|
Marianne Gagnon
|
394fb9be9b
|
Merge branch 'master' into NewRTTMinimap
|
2014-06-26 20:23:02 -04:00 |
|
Bart Cools
|
000fa2cf73
|
Fixed skill bars to return correct values. Also minor fix in kart properties
|
2014-06-26 13:43:53 +02:00 |
|
Bart Cools
|
c3e862f40c
|
fix for different kart properties, now based on kart type set in kart.xml
|
2014-06-26 12:53:17 +02:00 |
|
Bart Cools
|
0fa746c805
|
Changes to stk_config to make 3 groups of karts, which will default to the medium, and can be set in the kart.xml
|
2014-06-26 12:09:22 +02:00 |
|
hiker
|
5eb447d3e6
|
Adjust graphical offset by rotation to fix graphical position not exactly
the same as physicsl position when kart drives on wall.
|
2014-06-26 16:55:33 +10:00 |
|
hiker
|
76cf9ed141
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-06-26 16:52:15 +10:00 |
|
hiker
|
e3939fdc7c
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-06-26 16:22:19 +10:00 |
|
vlj
|
79838bffe3
|
Add 50% transparency to minimap.
|
2014-06-26 00:46:55 +02:00 |
|
Deve
|
d0091d9977
|
Fixed accidentaly noticed typo in comment
|
2014-06-25 22:22:54 +02:00 |
|
Deve
|
a56d6405dc
|
Simplify code for checking best refresh rate on linux, which I added previously.
|
2014-06-25 22:22:54 +02:00 |
|
vlj
|
9bc2203adf
|
Remove break at wrong position
|
2014-06-25 01:43:51 +02:00 |
|
hiker
|
6905812425
|
Fixed typo in warning message.
|
2014-06-25 09:31:10 +10:00 |
|
vlj
|
a93b96d0b1
|
Use UBO matrixes in displace.
|
2014-06-25 01:22:03 +02:00 |
|
vlj
|
45e5fba979
|
Simplify vao management for non instanced nodes.
|
2014-06-25 01:13:23 +02:00 |
|