Commit Graph

12249 Commits

Author SHA1 Message Date
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
vlj
8e6fba3185 Some fixes 2014-06-24 23:57:29 +02:00
vlj
948c5e8aa2 Use explicit attribute location.
Should help implementing basevertex later, and simplify vao creation a
lot.
2014-06-24 23:17:41 +02:00
vlj
edc38c9933 Use object_pass.vert for transparent objects. 2014-06-24 22:20:01 +02:00
vlj
69e342490e Fix ssao blur without compute. 2014-06-24 19:13:18 +02:00
konstin
a8343b2885 Merge branch 'master' of https://github.com/supertuxkart/stk-code into a 2014-06-24 16:42:18 +02:00
Marianne Gagnon
9ed57bdd46 Set ambient light when rendering minimap 2014-06-23 20:09:54 -04:00
Marianne Gagnon
1be98dc5db Support animated textures in non-static objects too 2014-06-23 20:02:31 -04:00
Marianne Gagnon
4c3cce42ee new minimap RTT fixes, getting there! 2014-06-23 19:45:48 -04:00
Marianne Gagnon
e9acaa8e4d Do not hardcode minimap size 2014-06-23 19:34:29 -04:00
konstin
01623da5e9 remove +1 2014-06-23 16:13:54 +02:00
Vincent Lejeune
4d6aa9d942 Override clear color inside makeMiniMap
Track clear color was used, resulting in wrong alpha channel value.
2014-06-23 14:54:16 +02:00
Vincent Lejeune
1a8b35c796 Set blendfunc when calling draw2DImageFromRTT. 2014-06-23 14:46:02 +02:00
Arthur-D
d4bbb50e0a Fixed accidental and embarrassing error. 2014-06-23 13:28:06 +02:00
Arthur-D
31d8234776 Added friend message icon. 2014-06-23 13:11:42 +02:00
hiker
01a3a446bb Adjust the text width computation to take the left/right border of
the achievement background into account.
2014-06-23 17:24:07 +10:00
hiker
299816ac6f Fixed sort order of achievements- and friend-messages. 2014-06-23 16:40:30 +10:00
hiker
3e77f4be0a Fix windows compiler warnings. 2014-06-23 16:17:38 +10:00
Arthur-D
1a590e0fe1 Added new achievement background 2014-06-23 05:38:56 +02:00
Marianne Gagnon
d5e1bb6631 Make progress on new minimap RTT : it was actually 2 issues. First the new code calls camera->setAspectRatio which resets the matrix; second, we rendered the minimap from the back, and backface culling is now active 2014-06-22 21:28:25 -04:00
Marianne Gagnon
ca2ee5d226 New minimap rtt branch : now something is visible 2014-06-22 20:06:58 -04:00
hiker
6ed86fe09c Fixed linux compilation. 2014-06-23 09:28:01 +10:00
hiker
6231e618d8 Added new message system to show achievements in race (and not as a
dialog later). Work in progress ... it doesn't look particulary nice yet ;)
2014-06-23 09:13:44 +10:00
hiker
8004e9d42c Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-23 09:05:22 +10:00
vlj
d2fc258124 Tweak ssao (again)
Random factor is less perdicable, no more spiral.
2014-06-23 01:03:55 +02:00
vlj
be26ac7213 Fix crash with intel 2014-06-23 00:24:02 +02:00
hiker
afdfa15134 Merge remote-tracking branch 'origin/master' 2014-06-23 08:17:34 +10:00
vlj
a461a1f807 Remove tick for GI. 2014-06-23 00:12:39 +02:00
vlj
aaee62ca82 Reverse delete order of fbo.
Should be safer.
2014-06-22 18:08:26 +02:00
vlj
f76cd6e7a9 Implement bilateral with fragment codepath. 2014-06-22 18:04:46 +02:00
vlj
8f5dd6edae Some tweak to ssao. 2014-06-22 18:04:46 +02:00
Vincent Lejeune
3219e564d0 Implemented bilateral for compute path. 2014-06-22 18:04:45 +02:00
vlj
d8edf64caf Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-06-22 02:32:43 +02:00
vlj
c377bdff58 Merge branch 'master' into NewRTTMinimap 2014-06-22 02:24:26 +02:00
vlj
7e8486d670 Merge remote-tracking branch 'origin/shadowdebug' 2014-06-22 02:21:15 +02:00
vlj
a7dbdc7a54 Use EAC_OFF 2014-06-22 02:17:50 +02:00