Deve
d05cff09c8
Add a graphics restriction for BGRA format on android.
...
It causes issues with particles transparency.
2016-09-17 03:55:50 +02:00
auria.mg
6a94d12a11
Update credits
2016-09-15 20:05:06 -04:00
auria.mg
f2bf4eb549
Add new soccer ball icons
2016-09-15 20:00:00 -04:00
Deve
3a9b2b9872
Fixed advanced lighting on android
2016-09-12 21:43:31 +02:00
deve
6c9050f47a
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2016-08-26 10:36:09 +02:00
deve
5abc047b0c
Declare precision also in vertex shaders in GLES renderer.
...
Some drivers complain that it was declared only in fragment shaders.
2016-08-26 10:35:48 +02:00
auria.mg
061323ffb0
Add information for translators
2016-08-23 20:01:06 -04:00
auria.mg
a07a8b6516
Fix XML files and regenerate strings
2016-08-23 19:53:41 -04:00
Aapo Rantalainen
38e5799167
Four help?.stkgui -files were treated as binary by git ( #2612 )
2016-08-23 19:36:16 -04:00
konstin
138daf57a4
Move credits file back
2016-08-23 11:07:13 +02:00
konstin
4ce6fb04ea
Remove unused documentation and tool files
2016-08-23 01:58:53 +02:00
Deve
d5fe015ba7
Fixed typo in previous commit.
2016-08-20 08:35:08 +02:00
Deve
a001505abd
Set ForceLegacyDevice for intel ironlake and for old radeon drivers.
...
This hopefully will allow to run STK with these graphics cards and drivers.
2016-08-20 08:13:17 +02:00
Alpt
67e94e73ce
In the addons screen, show a tip to remember that the Internet connection is disabled. (Issue #1763 ). ( #2605 )
2016-08-19 18:28:59 -04:00
Elderme
41cd1e0364
merged with master
2016-08-18 22:36:19 +02:00
Michael Murphey
d213bef9db
Place buttons in confirm dialog horizontally ( #2573 )
...
* Place buttons in confirm dialog horizontally closes #2548
* Use RibbonWidget for MessageDialog
* Use buttonbar for confirm dialog
2016-08-16 19:08:45 -04:00
Deve
bd6ad544cc
Fixed bloom with scale_rtts_factor parameter.
2016-08-15 08:46:02 +02:00
Benau
2d95df1722
Update appdata file to latest standard
2016-08-12 00:48:57 +08:00
MTres19
8e8433f08c
Credit where credit is due ( #2593 )
...
* Give GeekPenguinBR and TuxKartDriver credit
* Give credit to samuncle and konstin
2016-08-05 19:12:52 -04:00
auria.mg
ea939459e8
Improve string as suggested on transifex
2016-07-30 21:51:31 -04:00
Elderme
a21d7b4b71
Merge branch 'master' into renderer_refactoring
2016-07-26 22:16:48 +02:00
Elderme
cd1b9a66a0
Merged master in branch
2016-07-26 21:31:52 +02:00
qwertychouskie
9cbf8a0641
Update link
2016-07-23 14:16:09 -07:00
Benau
744a4705b6
Auto embolden glyph of bold face, without fallback font
2016-07-21 12:26:19 +08:00
Benau
a72f67015c
Remove 36MB CJK fonts, use the previous font instead
2016-07-20 09:49:10 +08:00
Benau
89f06ed8d3
Fix crash with fixed pipeline
2016-07-18 23:56:14 +08:00
Benau
05419cd555
Initial work on new font rendering engine
2016-07-18 16:03:11 +08:00
Benau
8408a7c158
Merge remote-tracking branch 'origin/master' into colorful_track_object
2016-07-15 09:27:59 +08:00
Deve
93fc20e275
Merge OpenGL ES renderer branch
...
It adds support for OpenGL ES renderer, which is needed for Android port and for running STK on other embedded devices such as Raspberry Pi.
Currently it works in two ways:
- Shader-based pipeline, which requires OpenGL ES 3.0 (Android >= 4.3)
- Fallback to irrlicht-based fixed pipeline that needs OpenGL ES 2.0. The fixed pipeline generally works, but it is affected by the same issues as our OpenGL 2.1 fixed pipeline renderer.
I tried to modify our OpenGL renderer as little as possible to avoid regressions. The only one major change is that we are now using the "#stk_include" directive in shaders instead of linking multiple shaders into one program.
Currently it works only on linux. The Android port needs some refactoring. In theory it should be possible to make it working on Windows, but we would need some OpenGL ES SDK, or maybe modified libglew.
At this stage it is playable with current mesa drivers. I tested it on intel graphics card and I didn't notice any issues.
On Android only the OpenGL ES 2.0 renderer with fixed pipeline has been tested for now.
2016-07-14 20:54:30 +02:00
Benau
53374176ad
First try to support colorization texture mask
2016-07-15 00:53:22 +08:00
Deve
886382bb54
Merge remote-tracking branch 'origin/master' into gles
2016-07-11 23:43:10 +02:00
Deve
0f7976e5f8
Merge branch 'master' into gles
2016-07-11 23:23:02 +02:00
Benau
19acdad9b4
Replace Ubuntu font with a really free font
2016-07-11 15:52:16 +08:00
Deve
f1effe3208
Revert "Fixed a grass being too dark in some places."
...
This reverts commit 2b734a9579
.
2016-07-09 02:20:06 +02:00
Deve
2b734a9579
Fixed a grass being too dark in some places.
...
It seems to be an inconsistency in using sRGB rendering.
2016-07-07 01:52:22 +02:00
Deve
04d3bfb9a1
Restore previous version of object pass shader.
...
This one doesn't have sense at all. We should make sure that uniforms are always initialized in c++ code.
2016-07-05 01:10:53 +02:00
Deve
9ceab23c5f
Apply ssao fix from master
2016-06-30 00:50:33 +02:00
Deve
0fb119068b
Fixes in more shaders
2016-06-28 21:55:51 +02:00
Benau
22e5c0909c
Allow setting color without copying the mesh
2016-06-28 14:55:48 +08:00
Deve
bf54626815
Added missing file
2016-06-27 23:06:48 +02:00
deve
964baad705
Some fixes
2016-06-27 13:39:20 +02:00
deve
d5e30ee41e
Port also other shaders to use #stk_include
2016-06-27 13:11:27 +02:00
Benau
892bc490f7
Make shaders run as efficient as possible
2016-06-27 13:49:27 +08:00
Deve
f679078e75
Port some basic shaders to use #stk_include.
...
Already working race with disabled advanced lighting :)
2016-06-26 16:39:34 +02:00
Benau
8bae12e080
Fix potential warning
2016-06-26 15:52:47 +08:00
Benau
b467d0819d
Add a missed shader
2016-06-26 07:16:07 +08:00
Benau
416050a923
Use a more simple way to render red/blue karts
2016-06-26 07:14:11 +08:00
Deve
ce8a1c4e1b
Already working GUI in shader-based pipeline
2016-06-25 15:10:53 +02:00
Elderme
80713ec019
Fixed glow color issue when GL_ARB_draw_indirect extension is not available
2016-06-25 14:55:51 +02:00
Benau
7e806fe86f
Merge remote-tracking branch 'origin/master' into render_kart_driver_differently
2016-06-25 16:31:08 +08:00
Benau
2f217fd55b
Allow render red or blue karts in soccer mode using shader
2016-06-25 16:29:54 +08:00
Deve
d13716a917
Initial linux version.
...
Currently works only with irrlicht-based renderer because shaders are not ported yet.
2016-06-24 02:47:13 +02:00
auria.mg
f90703beb6
Move hardcoded cutscene FOV to a config file
2016-06-23 19:10:56 -04:00
qwertychouskie
c17070209d
Fix warning for cards without "Radeon" in string ( #2523 )
2016-06-21 19:38:44 -04:00
Elderme
b359e8f9fd
Merged with master, solved conflicts
2016-06-18 19:28:54 +02:00
auria.mg
8e886b796a
Improve python script that sets translation authors to be able to process all files at once
2016-06-08 19:54:17 -04:00
auria.mg
1469a9e396
Update pot file, slightly breaking string freeze. Sorry about that, better late than never :S
2016-06-07 19:49:33 -04:00
Deve
cc92ee6ef3
One more tweak in SSAO.
...
Just use mod(x, 6.283185307179586) as suggested by mesa developer, instead converting it to degrees and back to radians.
2016-05-26 11:48:57 +02:00
Deve
cee0de3af3
Fixed a bug in my previous commit.
...
I forgot that sin and cos functions want angle value in radians.
Now the code looks a bit ugly, but generates proper values.
2016-05-26 02:39:35 +02:00
Deve
cdae595724
Fixed SSAO on intel.
...
In ssao.frag we are computing theta valaue and it looks that intel driver doesn't like too big values for sinus and cosinus computations.
I just used modulo 360 to store lower angle values in theta variable.
2016-05-25 23:16:01 +02:00
auria.mg
6f36bc5b34
Update changelog and credits
2016-05-18 20:01:21 -04:00
auria.mg
2c6e678929
Add new volcano track
2016-05-18 19:57:09 -04:00
Deve
edfc7d285c
Fixed shadows and GI for mesa drivers.
...
The check for GL_ARB_geometry_shader4 doesn't have sense at all because we don't use this extension and our geometry shaders use functionality which is available in core OpenGL 3.2.
The reason that it wasn't working for older mesa versions must be a bug in mesa or maybe missing other functionality (but not GL_ARB_geometry_shader4).
I checked it with mesa 11.2 and current git version and it works fine on intel, nouveau and with software rendering.
It needs some testing because it potentially affects all drivers with OpenGL >= 3.2 on every platform.
If someone could test it with Radeon drivers, I would be really happy to enable it in upcoming release, at least on linux.
2016-05-18 22:19:31 +02:00
auria.mg
5b2cb52dc5
Add higher-res icon
2016-05-14 21:15:11 -04:00
Deve
58f7424b4f
Add a workaround for skybox.
...
The problem was with shader-based pipeline with disabled "advanced effects" in options.
In this case we don't use RTTs and gl_FragCoord contains values in range of whole window. So fo 2 players we still get gl_FragCoord.y = 0..window_size instead of gl_FragCoord.y = 0..window_size/2.
The easiest way to solve it seems to be modulo it by current viewport size. It should be compatible with advanced pipeline as well as single-player games.
Atm. I'm not sure if this should be applied to 0.9.2 branch. It should work fine, but needs some testing.
2016-05-08 21:39:50 +02:00
qwertychouskie
87f3609b06
Update screenshots and description
2016-05-06 19:50:57 -07:00
Deve
d989ae1d4a
Update graphics restrictions for mesa:
...
- Increase version for sRGB-capable visual workaround because it doesn't look that it will be fixed anytime soon
- Enable compute shaders because it works fine now
- Enable texture compression because it works now too.
Texture compression for intel should work fine also for older versions, but it's hard to say which one version is the first working one.
2016-05-03 21:48:21 +02:00
Deve
62ea873373
Fixed compute shaders on mesa.
...
It was reporting an error:
[error ] GLWrap: Error in shader gaussian6h.comp
[error ] GLWrap: 0:77(1): error: storage qualifiers must come after precise, invariant, interpolation, layout and auxiliary storage qualifiers
2016-05-03 21:48:21 +02:00
hiker
1870691900
Decrease leaning somewhat, and increased leaning speed.
2016-04-27 18:11:57 +10:00
hiker
d90dc8ea37
Removed unused entry.
2016-04-27 17:58:28 +10:00
hiker
30d60acfaf
Added freetype to list of software used.
2016-04-27 15:19:00 +10:00
auria.mg
4bc0cccf00
Fix user/login screen layout, fixes #2474
2016-04-25 19:10:56 -04:00
auria.mg
32eba771e2
Tweak GP win and GP lose buttons : translator reported they were too small, and also they were designed for mouse use only and didn't work well from another input device
2016-04-24 18:21:45 -04:00
auria.mg
8c337110a2
Fix text
2016-04-23 09:00:40 -04:00
auria.mg
b6431c3383
Tweak grand prix
2016-04-22 20:44:35 -04:00
auria.mg
cffd0bd00c
Fix invalid XML and update translations
2016-04-22 20:28:21 -04:00
auria.mg
ea14dcc1ca
Update pot file
2016-04-22 18:59:07 -04:00
auria.mg
1fc99d7948
Add a few more replays + minor text change
2016-04-22 18:55:26 -04:00
auria.mg
5e8168e020
Add a few more stock replays
2016-04-22 18:20:32 -04:00
Benau
55278122fe
Allow showing same difficulty of ghost replay only
2016-04-22 23:07:45 +08:00
Benau
f6ce065cee
Allow a few replays coming with the game
2016-04-22 09:49:46 +08:00
auria.mg
790cd807a3
Start updating changelog for STK 0.9.2. Prepare challenges/GPs for the new abyss track (replacing the old subsea)
2016-04-21 20:50:01 -04:00
auria.mg
c18343f60b
Improvements to login screen : properly center buttons, and allow logging in by pressing enter
2016-04-12 19:27:11 -04:00
Benau
c258418577
Fix going back
2016-03-21 01:02:13 +08:00
Benau
fce3eec66f
New GUI for track only screen, used in network and loaded from replay
2016-03-20 16:23:49 +08:00
Benau
b92210d4a0
No watching replay when split-screen
...
And some bugs fixes
2016-03-20 08:40:55 +08:00
Benau
da70d305a9
Allow watch replay only
2016-03-20 01:33:26 +08:00
Benau
07afd444a8
Allow racing against the replay on equal footing
...
It make record while replay possible too.
We show the ghost only when start racing, fixing the overlapping issue.
2016-03-19 14:57:22 +08:00
Benau
5b7161710d
Add GUI option in track info screen for random item location.
2016-03-17 12:16:19 +08:00
Benau
c48ce20091
Thanks leper for this fix
2016-03-14 00:43:00 +08:00
Benau
8a9168a024
Remove the hard-coded localized name in language.cpp
2016-03-13 10:25:26 +08:00
Marianne Gagnon
5500a06ceb
Tweak subsea challenge
2016-03-10 20:57:43 -05:00
Marianne Gagnon
90f0c12393
More work on networking UI
2016-03-10 18:48:40 -05:00
Marianne Gagnon
35451515a2
Work on "Create server" screen to include more options
2016-03-09 19:47:45 -05:00
Marianne Gagnon
193aabe393
Remove weird unicode character from help GUI files
2016-03-09 19:47:21 -05:00
Marianne Gagnon
8ba337c343
Regenerate pot file, fixing transifex issue hopefully
2016-03-08 21:35:25 -05:00
hiker
edbdde4536
Replaced another soft-dash with a normal - (to avoid transifex complains).
2016-03-07 13:58:44 +11:00
hiker
c6cef53c99
Merge branch 'refactor-network-string'
2016-03-07 12:26:36 +11:00
hiker
68e394702b
Merge branch 'refactor-network-string' of github.com:supertuxkart/stk-code into refactor-network-string
2016-03-07 12:20:43 +11:00
hiker
64993718b4
Replaced soft-dash with a normal - (to avoid transifex complains).
2016-03-07 12:15:20 +11:00
Marianne Gagnon
04999c35ee
More work on networking UI
2016-03-06 20:01:40 -05:00
Marianne Gagnon
14c8ecddb5
Add waiting screen for networking
2016-03-01 18:58:51 -05:00
Benau
96a10ce92c
Update strings
2016-02-29 10:59:42 +08:00
Benau
64522d9d13
Merge remote-tracking branch 'origin/master' into fix_replay
2016-02-17 14:03:58 +08:00
Marianne Gagnon
9c49312714
Work on networking GUI, combine older server interfaces with the newer online/profile screens
2016-02-16 18:33:09 -05:00
Benau
a6412d7a07
Add ghost icon, use it in race setup screen
2016-02-15 09:28:36 +08:00
Benau
8a121ed32b
Add Ghost replay GUI
2016-02-13 01:34:00 +08:00
Benau
7765b43d42
Merge remote-tracking branch 'origin/master' into fix_replay
2016-02-11 13:45:16 +08:00
Benau
ece95cbb81
Use MessageQueue to show whether the replay file is saved successfully
2016-02-11 13:42:25 +08:00
Marianne Gagnon
fe6bbb80c4
Delete unused da_DK translation, closes #2435
2016-02-10 19:56:45 -05:00
Benau
bb88a0f0ec
Allow auto-save replay when specified in time trial mode.
...
It will disable AI when recording, also it will only save if the
race is completed, ie no one gave up or all events fit in max frame recorded.
2016-02-11 00:42:33 +08:00
Benau
e8adf7f051
Remove bubblegum in soccer mode as suggested by auria
2016-01-25 12:50:20 +08:00
Benau
a7aedbe208
Remove unused PNG
2016-01-22 09:20:03 +08:00
Benau
b7df193ed4
Add Red/Blue icon in soccer setup screen
2016-01-19 08:49:23 +08:00
Marianne Gagnon
025c117d58
Tweak soccer setup screen to be clearer
2016-01-17 21:21:55 -05:00
Benau
b410c8f67c
Make soccer menu useful in single player
...
Notice: As race_manager->setKartSoccerTeam(i, info.team) already
pre-set karts team, there is no need to test for
(getNumKartsInTeam(SOCCER_TEAM_RED) == 0 || getNumKartsInTeam(SOCCER_TEAM_BLUE) == 0),
so the the menu code is simplified.
2016-01-16 16:11:33 +08:00
Benau
e296ebe4af
Use white-black ball in minimap
2016-01-15 19:52:49 +08:00
Benau
283c1a7c37
Update supertuxkart desktop file to support searching with keywords
2016-01-08 09:34:13 +08:00
hiker
b8ed2025ed
Merge remote-tracking branch 'origin/master' into refactor_networking
2016-01-06 17:53:45 +11:00
Benau
629f090646
More battle mode improvements
...
1. Fix text overflow in arena menu
2. Try to make battle AI avoiding eating banana
2015-12-29 08:27:24 +08:00
Benau
94c5ba4193
Add more arena info in track screen
2015-12-24 07:53:49 +08:00
Deve
5020f3ca2e
Disable compute shader for intel on mesa for now, because it is shaking for some reason.
2015-12-20 13:46:41 +01:00
hiker
68e37c902f
Merge remote-tracking branch 'origin/master' into refactor_networking
2015-12-15 22:52:55 +11:00
Deve
80d36208f1
Added ugly hack, which forces srgb-capable framebuffer creation for intel drivers on linux
2015-12-11 19:18:14 +01:00
Marianne Gagnon
508dcdd7e8
Update credits
2015-12-07 19:07:10 -05:00
Flakebi
c5277edc54
Change suspension-travel that was changed in master meanwhile
2015-12-03 02:15:58 +01:00
Flakebi
b3cb029087
Remove kart-type specific turn settings
2015-12-02 19:40:59 +01:00
Flakebi
ba3bc326eb
Minor refinements
2015-11-29 22:21:03 +01:00
hiker
da2671c6ee
An 'authorised' client can now tell the server to select karts.
2015-11-23 08:08:23 +11:00
Flakebi
2f1d08edbd
Add enabled property to skid characteristics
2015-11-21 23:27:00 +01:00
Flakebi
ffa85d2206
Merge remote-tracking branch 'upstream/master' into kart-properties
2015-11-21 23:03:58 +01:00
hiker
815d663ee3
Revert "Removed unnecessary stkgui file." - it was the wrong file :P
...
This reverts commit e804fc281a
.
2015-11-21 12:21:16 +11:00
hiker
e804fc281a
Removed unnecessary stkgui file.
2015-11-21 12:15:02 +11: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
Benau
7cf4d662ee
Allow configurable fonts file names in stk-config
2015-11-13 02:25:52 +08:00
Deve
8a288f05ff
Implement lightning effect using shaders
2015-10-31 01:00:48 +01:00
Marianne Gagnon
366a458a6b
Remove a few unused files, see #2066
2015-10-22 19:13:41 -04:00
Marianne Gagnon
cc7f7b9b4c
Use SigmarOne font for digits
2015-10-19 21:02:25 -04:00
Marianne Gagnon
9c3da791a4
Add Benau to credits, thank you :)
2015-10-19 20:56:38 -04:00
Benau
109d6b91ce
Choose the correct title font smartly
2015-10-19 09:39:57 +08:00
Marianne Gagnon
06fb6d4eb2
Delete old fonts and related code
2015-10-18 20:15:05 -04:00
Marianne Gagnon
6d365032f3
A few minor bugfixes, a little cleanup in TTF font code. Add Ubuntu font for latin languages since it generally looks better than Freesans for a game
2015-10-18 20:07:11 -04:00
Marianne Gagnon
cee6d9d611
Merge branch 'master' into freetype_lazyloadchar
2015-10-17 21:34:19 -04:00
Benau
d166aa620e
Add lazy load char function
...
Now less fonts are used to prevent mismatch, also include font license file
2015-10-17 02:57:27 +08:00
hiker
aeb4ba63d0
Fixed #2350 .
2015-10-16 09:46:59 +11:00
Marianne Gagnon
0af8842767
Update translations
2015-10-14 19:52:36 -04:00
samuncle
d80c7136e0
Add a better firework effect !
2015-10-14 02:34:23 +02:00
samuncle
4cf0b06d22
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-13 01:25:06 +02:00
samuncle
094d78e682
Minor change in gfx
2015-10-13 01:23:24 +02:00
hiker
f0c04a8bef
Started to support LAN servers in the GUI (wip).
2015-10-10 12:13:32 +11:00
hiker
612ec37dbd
Updated credits.
2015-10-10 10:36:50 +11:00
hiker
d687d17bfe
Added (atm not working) LAN server menu entries.
2015-10-09 09:36:08 +11:00
hiker
00e7c35484
Match one more .stkgui and .cpp file name.
2015-10-07 16:37:42 +11:00
hiker
d391727879
Match more .stkgui and .cpp file names.
2015-10-07 16:33:01 +11:00
hiker
a49fdca521
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-07 13:16:02 +11:00
hiker
3aadc019a3
Made more .stkgui name correspond to the c++ file name.
2015-10-07 12:33:36 +11:00
hiker
ccf8fd4e68
Renamed stkgui so that .cpp and .stkgui file names are identical.
2015-10-07 08:11:57 +11:00
Elderme
0fc3d3336e
removed useless varying in rhpassthrough.geom shader
2015-10-05 21:22:22 +02:00
Benau
3a5ec83ae9
Basic render of text using freetype
...
This is a testing version of stk using freetype
It enable better arabic font display with less blurred glyph to all fonts thanks to hinting provide by freetype.
TODO: billboard text
2015-10-04 11:59:44 +08:00
Flakebi
abc2ae54ea
Use correct cached characteristics
2015-10-03 20:14:39 +02:00
Flakebi
5e6e85ab79
Merge branch master into kart-properties
2015-10-03 15:20:06 +02:00
samuncle
71069752ba
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-09-29 20:09:55 +02:00
samuncle
26298e9e1a
Add several new particle effect and correct the bug to enable emit map & alpha testing
2015-09-29 20:08:56 +02:00
Joerg Henrichs
4791731946
Moved update_po_authors to data/po so that we don't forget it.
2015-09-29 08:45:50 +10:00
hiker
344912ac2a
Updated Asian fonts.
2015-09-28 10:14:20 +10:00
hiker
63967b8a21
Fixed typo in credits.
2015-09-28 10:00:02 +10:00
Marianne Gagnon
31875565bb
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-09-27 19:41:30 -04:00
Marianne Gagnon
27be1b9013
update translations
2015-09-27 19:40:16 -04:00
hiker
8d45d689b7
Updated donations.
2015-09-28 09:21:30 +10:00
Marianne Gagnon
870a5fad3e
Update credits in master too
2015-09-25 20:44:27 -04:00
hiker
e97c4858f3
Updated supertuxkart.pot to be not sorted (see pull #2319 ).
2015-09-26 00:21:16 +10:00
Karl Ove Hufthammer
96cde24615
(Again) don’t sort strings alphabetically (makes the translators’ work much easier).
2015-09-25 10:51:31 +02:00
hiker
125bc1fc8f
Renamed'lazy' loading in material (which is used to not load font
...
textures sinze they are not all needed) to 'dont_load' - so that
'lazy' can be used for lazy loading (i.e. on demand, but still
by the material, not by an external object) of textures.
2015-09-18 09:51:52 +10:00
Marianne Gagnon
87ebb00d7d
Tweak mathclass challenge
2015-09-12 19:42:36 -04:00
Deve
e47be9b283
Update .pot file
2015-09-08 20:13:29 +02:00
Marianne Gagnon
9f15659a77
Tweak challenge, fixed #2156
2015-09-07 18:02:11 -04:00
MiroslavR
517f493ca3
Add 'Ť', 'Ý' and 'Ľ' glyphs to the title font
2015-09-06 22:26:00 +02:00
Marianne Gagnon
0a1053b3e4
Update translations, remove unused GUI file that generated unused strings
2015-08-28 20:09:06 -04:00
Marianne Gagnon
77098c9e7c
Tweak subsea challenge
2015-08-25 21:28:49 -04:00
Marianne Gagnon
ca384dc870
More font improvements for #2121
2015-08-21 19:39:01 -04:00
Marianne Gagnon
82ad06052d
Add missing font char, see #2121
2015-08-21 19:35:14 -04:00
Flakebi
b51eadae28
Merge branch 'master' into kart-properties
2015-08-16 16:45:47 +02:00
Flakebi
1c29ce7636
Fix little issues and remove wheel position from characteristics
2015-08-16 16:23:06 +02:00
Flakebi
acbc629610
Add a script that automates the code replacements
...
Various other things:
- Try to use newer c++ features
- Rename travelcm
- Remove wheel radius
2015-08-16 15:54:05 +02:00
Elderme
0b748634ae
Removed calls to resizeBox for nitro emitter
2015-08-13 18:15:34 +02:00
Elderme
01c8b25cb6
When the particles position is computed, the position of the emitter in both current and previous frames is now taken into account. There is no more visual artifact when the particles velocity and emitter velocity are not aligned (for example with nitro particles when a kart is skidding)
2015-08-13 14:53:45 +02:00
hiker
a19119a2f2
Merge remote-tracking branch 'origin/master' into lensdust
2015-08-06 16:40:00 +10:00
hiker
43c12c1a1e
Fixed slightly outdated documentation.
2015-08-05 20:57:27 +10:00
hiker
b44f0605dc
Try to bring karts quicker back on the ground when the kart is
...
on its side, without overcompensating (and therefore shaking)
when the kart is only slightly non-parallel to the ground
when flying.
2015-08-05 17:00:40 +10:00
hiker
78c592e4e5
Added a file with a 'unique filename' with version number which is used by STK
...
to detect that stk is reading the right data files (and therefore avoids #2073 ,
in which stk finds the wrong data directory).
2015-07-31 22:06:21 +10:00
Flakebi
ec3083827d
Add some documenation and try to get some backwards compatibility
2015-07-29 23:02:16 +02:00
Flakebi
5d36b95c95
Merge remote-tracking branch 'upstream/master' into kart-properties
...
Conflicts:
data/stk_config.xml
sources.cmake
src/karts/kart.cpp
src/karts/kart.hpp
src/karts/kart_properties.cpp
src/karts/kart_properties.hpp
src/tracks/track.cpp
2015-07-29 02:48:43 +02:00
Marianne Gagnon
280ddf967d
Add missing character to the font, fixes #2226
2015-07-28 19:17:37 -04:00
samuncle
9087d0f837
Increase the strenght of the lens dust
2015-07-27 02:00:34 +02:00
samuncle
1ca6339589
Add color to the lens dust
2015-07-26 05:30:29 +02:00
samuncle
51bd87d303
ground work for lens dust
2015-07-26 04:48:29 +02:00
Marianne Gagnon
a268354ac9
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-07-25 19:55:55 -04:00
Marianne Gagnon
e0dd736a7c
Main menu : prevent text on mouse over from overflowing the bounds of the screen. FIxes #2163
2015-07-25 19:55:17 -04:00
samuncle
d95f9d844d
put into comment the blue lens flare if we need in the future
2015-07-26 01:51:28 +02:00
samuncle
1ec0c18d5a
Change the fov (hiker you can still tweak or make an option
2015-07-26 01:49:29 +02:00
samuncle
12b1ea5a6c
Turn on color for lens flare
2015-07-26 01:46:19 +02:00
hiker
2f51406e3d
Made field-of-view configurable in the config file.
2015-07-22 08:12:44 +10:00
hiker
802d4897fe
Removed unused kart properties settings.
2015-07-18 12:24:56 +10:00
Flakebi
2620a77dc1
Adjust and remove properties
2015-07-13 00:23:05 +02:00
Flakebi
1317714ba1
Adjust the speed and power values
2015-07-12 01:09:01 +02:00
Flakebi
5bfb1a2c6b
Fix some bugs
2015-07-12 00:39:38 +02:00
Flakebi
db13a1fae6
Remove data from stk_config.xml
2015-07-11 19:33:13 +02:00
Flakebi
9fc6f84545
Switch from properties to characteristics
2015-07-11 19:22:27 +02:00
Flakebi
eb19bf571e
Load and combine characteristics
2015-07-11 15:38:52 +02:00
Flakebi
0ecc76090b
Add kart types
2015-07-10 01:14:08 +02:00
Flakebi
a305b357a3
Change characteristics to characteristic and add player characteristics
2015-07-10 00:36:50 +02:00
hiker
93282f8abf
Completely removed the usage of a physical wheel radius in the physics, it was
...
never really necessary, the phsyics are basically the same). Wheel rotation is
was refactored to be completely done in KartModel now.
2015-07-09 23:59:53 +10:00
hiker
5d573832e1
Oops - forgot to change the actual value of 'travel' from cm to m.
2015-07-09 09:15:34 +10:00
Flakebi
483993d2d8
Start with getters
2015-07-08 16:55:10 +02:00
Flakebi
fc8a726156
Add config file for kart characteristics
2015-07-08 16:54:35 +02:00
hiker
3b9e85af0b
Converted bullet's TravelCM (i.e. in cm) into Travel (i.e. in m).
2015-07-09 00:06:19 +10:00
auriamg
4070933364
Merge pull request #2212 from Flakebi/remove-icc
...
Strip ICC headers from png files to silence warning
2015-06-23 21:15:14 -04:00
Marianne Gagnon
64adbb4238
Remove anchor as weapon from help menu, fixes #2173
2015-06-23 18:32:38 -04:00
Flakebi
41002fc262
Strip ICC headers from png files to silence warning
2015-06-05 03:32:26 +02:00
hiker
9a1cba3ac8
Merge remote-tracking branch 'origin/master' into refactor_shaders
2015-06-03 15:11:27 +10:00
hiker
d4f3fc88d6
Merged pull requests #2191 .
2015-06-02 14:50:32 +10:00
hiker
2cf4341916
Merge remote-tracking branch 'origin/master' into refactor_shaders
2015-06-02 14:49:50 +10:00
hiker
8fd0b9186a
Merge pull request #2198 from nado/Fix-#2164
...
Fix #2164 : Resized max length of mail address up to 254 chars
2015-06-02 13:47:54 +10:00
hiker
a51d56a6e5
Merge remote-tracking branch 'origin/master' into refactor_shaders
...
Conflicts:
src/tracks/track_object_presentation.cpp
2015-06-01 09:28:23 +10:00
Marianne Gagnon
722cd0e181
Merge branch 'Scripting'
2015-05-21 19:29:01 -04:00
hiker
4d6a9726b6
Renamed shader.
2015-05-21 16:37:59 +10:00
hiker
dc8361b941
Fixed spelling of shader.
2015-05-21 11:19:40 +10:00
hiker
52017e31ea
Removed unused shader.
2015-05-19 16:36:24 +10:00
Nado
2b36759ba3
Resized max length of mail address up to 254 chars
2015-05-18 09:33:21 +02:00
Marianne Gagnon
080936f144
Work on scripting
2015-05-17 19:27:25 -04:00
auriamg
0ca0b21327
Merge pull request #2188 from huftis/removestringsorting
...
Don’t sort strings alphabetically (makes the translators’ work much easier)
2015-05-12 21:01:05 -04:00
Karl Ove Hufthammer
6106ed3ec6
Don’t sort strings alphabetically (makes the translators’ work much easier).
2015-05-12 18:20:11 +02:00
Karl Ove Hufthammer
465130a4a2
Added ‘Æ’ glyph to the title font
...
The glyph was created by combining the existing
‘A’ glyph and ‘E’ glyph, and then retouching the
result to make it look good (both the glyph heights
and the gradients differed for the two letters).
2015-05-12 18:17:20 +02:00
hiker
e337b72789
Moved *Detailed* shader into render_geometry, renamed all detailled
...
to detailed.
2015-05-11 17:17:08 +10:00
Marianne Gagnon
85cf5b181e
Support extracting translations from scripts
2015-04-30 19:03:54 -04:00
hiker
eacd599b93
Removed version number warning for Radeon cards on osx (since they
...
have completely different version numbers).
2015-04-27 09:04:16 +10:00
Marianne Gagnon
fc942433e2
Tweak over previous commit
2015-04-24 20:17:55 -04:00
Marianne Gagnon
30431adc69
Add forgotten credit to Divvy81
2015-04-24 20:17:22 -04:00
Marianne Gagnon
1cc3a0f0b8
Tweak times of scotland challenge
2015-04-23 19:20:42 -04:00
hiker
55079289da
List all GSoC students.
2015-04-17 09:48:45 +10:00
hiker
50ff2e6e35
Fixed donations, udpated samuncle's credits.
2015-04-17 09:40:28 +10:00
hiker
543bb8d303
Updated donations.
2015-04-17 08:29:40 +10:00
hiker
52f77f7d43
Fixed duplicated translator-credits strings.
2015-04-17 08:19:49 +10:00
hiker
fbac4d791c
Updated Asian fonts.
2015-04-16 16:59:12 +10:00
hiker
4ea1145af1
Updated translations credits by running update_po_authors.py script.
2015-04-16 15:29:38 +10:00
Marianne Gagnon
4b956ebfce
Update translations
2015-04-15 18:45:29 -04:00
Deve
a4536d7752
Disable texture compression for mesa.
2015-04-08 22:20:04 +02:00
Marianne Gagnon
66db970564
Add context to help translators
2015-04-07 19:32:55 -04:00
hiker
3f76b0c68d
Used better icon for achievements in tabs.
2015-04-02 10:46:30 +11:00
samuncle
4b735861cd
Add a particle system
2015-04-01 04:30:17 +02:00
Marianne Gagnon
e1eec44d1a
Tweak challenges
2015-03-28 20:16:45 -04:00
Marianne Gagnon
dda3bb0f31
Tweak more challenges
2015-03-28 19:21:48 -04:00
Marianne Gagnon
f2d0b4d7e0
Some challenge tweaks, more coming. See #2052
2015-03-28 18:19:27 -04:00
Marianne Gagnon
e65b3414b9
Tweak cocoa challenge. Further testing welcome
2015-03-28 00:14:10 -04:00
samuncle
a0bd9db496
Add more particle effect
2015-03-26 00:46:52 +01:00
samuncle
4e9ab3e786
Improved sparks for flame
2015-03-24 17:59:03 +01:00
hiker
a400ac3ed8
Used proper names for GSoC students, renamed version SVN to GIT,
...
and removed version numbers (to avoid confusion that e.g. Deve
is now not listed as contributor to 0.8.1 anymore).
2015-03-23 23:18:24 +11:00
hiker
b61823e1af
Added GSoC students (initial version, names might need to be changed).
2015-03-23 17:23:03 +11:00
hiker
52b1aef99c
Updates Asian fonts.
2015-03-23 13:12:28 +11:00
Marianne Gagnon
fab1698d69
Update translations
2015-03-22 21:03:06 -04:00
Marianne Gagnon
633f6c5e30
Update credits
2015-03-22 20:41:13 -04:00
hiker
d09f6d3c7a
Revert "Clean bloomblending since it's not used anymore"
...
This reverts commit 2206f8ad5c
.
Conflicts:
src/graphics/post_processing.cpp
2015-03-16 08:49:36 +11:00
hiker
d9375c9a43
Revert 65cb55add4
(Make bloom less
...
pixelated using Intel doc) since it causes crashes on hd3000.
2015-03-16 08:37:59 +11:00
Marianne Gagnon
036a6f986a
Update POT file
2015-03-13 21:43:09 -04:00
hiker
fa9a58cbe1
Updated strings for translations.
2015-03-14 09:48:17 +11:00
hiker
6b2d35a86a
Updated 'all tracks' achievement to actually include all tracks :)
2015-03-14 00:14:21 +11:00
hiker
5c4f1f796c
Updated challenges and gp for assets r16110 (renamed chocolate and
...
island).
2015-03-13 23:44:02 +11:00
hiker
7c42468e75
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-03-13 11:04:04 +11:00
hiker
8203d6b0e4
Fix #1786 (needs r16106 on the assets to work!!!!!).
2015-03-13 11:02:59 +11:00
Marianne Gagnon
7e63566087
Upgrade minimum track version requirement
2015-03-12 19:50:09 -04:00
hiker
f347cd0b10
Updated license information for new notification elements.
2015-03-05 11:26:16 +11:00
hiker
b21dafc12b
Added error message type for skins, which is atm only used to display
...
automatic login failures. Added Arthur's new icons for errors, and
friend+achievement icons for Ocean skin.
2015-03-02 18:51:50 +11:00
auriamg
cb5670c843
Merge pull request #1994 from Flakebi/credits
...
Fix transparency of fallback characters
2015-02-28 19:00:45 -05:00
Deve
988f5ea933
Hopefully proper fix for #2007
2015-02-26 20:16:39 +01:00
Vincent Lejeune
26b38a3afe
GodRay use correct screencoord
2015-02-24 22:29:31 +01:00
Vincent Lejeune
419b96c068
Do not use extra uv for mlaa
2015-02-24 22:08:49 +01:00
Vincent Lejeune
bcffedc186
Start working on proper SDSM
2015-02-23 22:35:53 +01:00
Vincent Lejeune
2206f8ad5c
Clean bloomblending since it's not used anymore
2015-02-23 22:11:57 +01:00
Vincent Lejeune
06f0188a5b
Fix passthrough shader
...
It was not using half coordinate center
2015-02-23 22:02:32 +01:00
Vincent Lejeune
65cb55add4
Make bloom less pixelated using Intel doc
2015-02-23 21:41:22 +01:00
hiker
2c1b80b939
Added separate achievement and friend message boxes for Ocean ... which atm
...
is just the peach one (though imho looks better than the previous normal box).
2015-02-23 22:44:35 +11:00
Marianne Gagnon
8a4c240f8b
Tweak subsea challenge, fixes #1997
2015-02-22 20:08:19 -05:00
Marianne Gagnon
e3c408fc0e
Implement interface to allow disabling IBL
2015-02-22 18:25:59 -05:00
Vincent Lejeune
13a2f9f597
First part of #1988 fix
2015-02-22 20:31:14 +01:00
Flakebi
a371338c14
Fix transparency of fallback characters
2015-02-21 18:06:27 +01:00
hiker
f56fc91d42
Fix #1793 by disabling global illumination on osx with intel
...
graphics cards.
2015-02-19 16:21:37 +11:00
Vincent Lejeune
9641380171
Fix billboard transparency
2015-02-19 00:44:21 +01:00
hiker
5f9e4086af
Fixed #1476 (well, better a work around intel bugs).
2015-02-19 09:24:23 +11:00
hiker
7f90d151c4
Use "Local Name" to fix #1977 .
2015-02-17 17:15:25 +11:00
hiker
198d6470d7
Let medium kart accelerate a bit less.
2015-02-17 08:33:32 +11:00
hiker
f9bb17384c
Try to balande the different kart physics better.
2015-02-17 08:14:31 +11:00
Marianne Gagnon
12e583dde0
Add scripts to translate from Transifex
2015-02-15 20:45:52 -05:00
hiker
aae307c8b6
Fixed #1985 (improve message for per-player handicaps).
2015-02-16 09:35:49 +11:00
auria
13bfee5ce1
Do not output line numbers for strings that come from XML, since XML comments are extracted from a fake .h ffile and their location in that intermediary file has no use
2015-02-08 18:17:05 -05:00
auria
671e3829a4
Do not extract strings from wip-tracks. Fixes #1967
2015-02-08 18:05:42 -05:00
Marianne Gagnon
758eb6e003
Use label with word_wrap instead of list for terms. See #1812
2015-02-06 20:11:15 -05:00
Vincent Lejeune
831c1e7285
Duplicate rule for gallium
2015-02-02 00:42:16 +01:00
hiker
0b0c1fbaee
Workaround or fix for #1922 - warning about plural form.
2015-01-30 16:29:29 +11:00
Odd0002
8abccf3ee4
Vastly improve data optimization script
...
Changes include:
- Make each type of data optimization optional
- Multithread all data optimization
- Add B3D to B3DZ compression (disabled by default)
- Optimize images in many more ways
- More comments describing each section and some explanations
- Ability to vastly increase runtime for a few more mb saved (enabled by default; depends on types of optimizations used)
- Probably a few more minor changes
2015-01-27 22:50:52 -06:00
hiker
62bbed278d
Fixed duplicated entries in credits.
2015-01-28 11:05:16 +11:00
hiker
a13e13d1d0
Updated donation section.
2015-01-28 09:37:41 +11:00
Vincent Lejeune
56f1dff65d
Split scattering function in ambiant/point light part
...
This fix #1913
2015-01-24 20:00:04 +01:00
Vincent Lejeune
9dcdd53425
Add advanced pipeline GR to hd3000
2015-01-23 01:00:05 +01:00
Marianne Gagnon
76156920de
Update credits
2015-01-21 20:26:42 -05:00
hiker
aab8066611
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-21 09:17:14 +11:00
hiker
678eeac836
Disable highdef textures on intel cards on windows.
2015-01-21 09:15:41 +11:00
Vincent Lejeune
788732993f
Add pop up for Mesa < 10.3
2015-01-20 22:50:39 +01:00
hiker
21eace8f80
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-20 12:22:03 +11:00
hiker
e62dfe2fe5
Updated Asian fonts.
2015-01-20 12:21:22 +11:00
Vincent Lejeune
d35e4d3e7c
Use radeon instead of AMD for graphic restriction
2015-01-20 02:08:46 +01:00
hiker
c352052719
Updated translations.
2015-01-20 11:45:36 +11:00
Vincent Lejeune
4d9835df0d
And on all os
2015-01-19 00:48:02 +01:00
Vincent Lejeune
8e221df753
Ask newer driver if catalyst below 14.4
2015-01-19 00:46:12 +01:00
Vincent Lejeune
95cb413e39
Remove comment in graphic restriction
2015-01-19 00:43:48 +01:00
hiker
234d59a5fd
Fix error in xml causing a crash.
2015-01-19 10:38:04 +11:00
hiker
79df2151e9
Add a popup window to be shown first if it is detected that
...
the driver is too old.
2015-01-19 10:21:41 +11:00
Vincent Lejeune
73a20508ef
Remove unused shaders
2015-01-17 02:49:48 +01:00
hiker
111b3f6361
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-16 11:55:31 +11:00
hiker
5f4ce613c0
Updated help text for new register screen layout.
2015-01-16 11:54:59 +11:00
Vincent Lejeune
f22cf2a05e
Use a fullscreen pass for skybox
2015-01-15 20:50:19 +01:00
Vincent Lejeune
70e8b4c854
When there are 8 lod level, 7 is the max
2015-01-15 19:52:48 +01:00
auriamg
c5cf42755f
Merge pull request #1882 from math07/working
...
Make note spinner values of addons search bar readable in low resolution
2015-01-14 19:28:53 -05:00
samuncle
fc670cecf2
Add two new particle effect
2015-01-15 00:11:14 +01:00
Vincent Lejeune
08cb4b4297
Fix tangent/bitangent computation
...
Shouldn't make any difference since we don't rescale that much
2015-01-12 23:01:35 +01:00
Vincent Lejeune
cfbbeef441
Clamp lod level in SSAO shader later.
2015-01-12 22:47:53 +01:00
Vincent Lejeune
95e2213b1e
SSAO can me 0 sometimes
2015-01-12 20:13:11 +01:00
Vincent Lejeune
b8ab68b31a
Fix precision issue in SSAO
2015-01-12 20:05:40 +01:00
Vincent Lejeune
3bcdc04279
Fix precision issue in CIE/RGB conversions
2015-01-12 20:05:16 +01:00
deve
1b5ee918f0
Fixed inconsistency in CREDITS file.
...
GP editor wasn't available in 0.8.1 version.
2015-01-12 09:56:20 +01:00
hiker
342cb82653
Merge branch 'new_register_screen'
2015-01-12 12:19:56 +11:00
hiker
a2006c3e16
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-12 12:10:23 +11:00
hiker
7bd1126df8
Improve flow from register screen back to user screen. Now password
...
and online user name do not need to be added again.
2015-01-12 09:41:34 +11:00
Vincent Lejeune
019ec344fe
Allow to reduce shadow resolution
2015-01-11 00:45:38 +01:00
Marianne Gagnon
bf1fa71be9
Vlj was a little too humble when adding himself to the credits ;)
2015-01-09 21:58:06 -05:00
Vincent Lejeune
7dd48f4d3b
Add myself to the credits
2015-01-09 22:35:21 +01:00
hiker
5ccedfc349
Use tabs in register screen (work in progress).
2015-01-09 09:42:18 +11:00
hiker
b0879514fb
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-01-08 13:33:16 +11:00
hiker
520625adae
Removed 'sign' (in/out), use 'log' (in/out) instead.
2015-01-08 13:32:50 +11:00
Marianne Gagnon
91b4c6e08a
Apply modified version of pull request #1881 , fixing #1859
2015-01-07 19:53:25 -05:00
Marianne Gagnon
b55d1a2367
Set minimum OS X version in Info.plist, fixes #1863
2015-01-07 18:46:35 -05:00
Vincent Lejeune
cc43861896
Tangent/Bitangent direction only matters.
2015-01-07 21:51:23 +01:00
Vincent Lejeune
02cf7afcf3
Use graphic restrictions system for all CVS query
2015-01-06 23:46:36 +01:00
Mathieu Laprise
24944a810c
Add a new achievement : Mosquito Hunter
2015-01-06 14:54:21 -05:00
samuncle
91b062ee52
Add amanda in the credits
2015-01-06 01:04:09 +01:00
Mathieu Laprise
765484efd9
Make note spinner values of addons search bar readable in low resolutions
2015-01-05 19:04:01 -05:00
auria
f672bbb77e
Extract strings
2015-01-02 18:38:11 -05:00
leper
d21f0ffa2b
Support plural translations. Fixes #1852 .
2015-01-03 00:25:53 +01:00
konstin
fa10561d09
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lights
2015-01-01 23:05:26 +01:00
Vincent Lejeune
3451d4e9a0
Add a ESM/PCF switch
2015-01-01 20:06:34 +01:00
Vincent Lejeune
883ab43e29
Assume __VERSION >= 130 everywhere
2015-01-01 03:18:13 +01:00
konstin
531b94a0ac
cleaning up and adding radius and energy sliders
2014-12-30 18:47:25 +01:00
Deve
aa9de807f9
Generate achivements in supertuxkart.pot
2014-12-27 22:50:03 +01:00
Deve
3e6677b755
Rename "title" to "name" in achievements to keep consistency with other xml files such as tracks and karts
2014-12-27 22:43:25 +01:00
Deve
a80d449aaf
Improved update_pot script
...
- added stk-assets path
- restored karts and tracks
- added achevements
- better formatting and faster executing
Updated supertuxkart.pot
2014-12-27 22:12:16 +01:00
Vincent Lejeune
d8b3cf9c8f
Factorise MRP
2014-12-27 03:22:06 +01:00
Vincent Lejeune
e42cdc5d64
Used #ifndef in header.txt
2014-12-27 03:21:55 +01:00
GunChleoc
ed56858321
Fixed a typo.
2014-12-23 16:21:47 +01:00
samuncle
c54fed411f
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-12-21 09:58:06 +01:00
samuncle
b54ddb9828
Add emit map to object pass 2 shader
2014-12-21 09:58:03 +01:00
Vincent Lejeune
c4e5a720f7
Do not undefine builtin macros.
2014-12-18 22:09:14 +01:00
Marianne Gagnon
0af3f3de83
Misc tweaks, mainly to include new island tracks in challenges and GPs, and other minor fixes
2014-12-15 21:34:22 -05:00
Vincent Lejeune
84cf087ae6
Forget to update grass pass 2 sun location
2014-12-16 02:10:26 +01:00
Vincent Lejeune
7aa7e2d148
Factorise sun color/position
2014-12-15 23:09:19 +01:00
Deve
2995051f7c
Merge pull request #1779 from math07/working
...
When entering gp_name, display buttons vertically to allows gamepad
2014-12-15 12:17:00 +01:00
hiker
3fa8625c78
Fixed incorrect icon name.
2014-12-15 17:10:34 +11:00
Vincent Lejeune
03694d9c7c
Factorise SH coefficient in an UBO
2014-12-15 00:18:03 +01:00
Vincent Lejeune
4b2abef56c
Remove redondant uniform in IBL
2014-12-14 21:55:15 +01:00
Vincent Lejeune
1732b1cfef
Clean up sunlight shader + factorize diffusebrdf
2014-12-14 21:39:18 +01:00
Vincent Lejeune
d50dde4c97
Revert "Try to fix ibl precision issue"
...
This reverts commit 1cf592394b
.
2014-12-14 02:48:47 +01:00
Vincent Lejeune
1cf592394b
Try to fix ibl precision issue
2014-12-13 22:35:46 +01:00
Vincent Lejeune
7872bc7860
Fix image format for bilateral blur
2014-12-13 22:28:16 +01:00
Mathieu Laprise
15927f319c
When entering gp_name, display buttons vertically to allows gamepad selection
2014-12-12 20:19:27 -05:00
hiker
ba990318d1
Merge remote-tracking branch 'origin/master' into new_server
2014-12-13 10:49:45 +11:00
Marianne Gagnon
72a02128de
Fix gand prix
2014-12-11 20:20:42 -05:00
Marianne Gagnon
9b3b99610a
MInor GUI XML cleanup
2014-12-11 19:39:30 -05:00
Marianne Gagnon
334cca21ad
Merge branch 'Math07_master'
2014-12-10 21:06:09 -05:00
Marianne Gagnon
7cc28a9755
Revert "Friends Search bar goes off the bottom of the screen #1762 "
...
This reverts commit f98a169e9c
.
2014-12-10 21:04:57 -05:00
Vincent Lejeune
1c05d9ef68
Port colored lines too
2014-12-11 01:44:58 +01:00
Vincent Lejeune
db6600a687
Frustrum shader is updated to new system
2014-12-11 01:19:17 +01:00
hiker
c0c4357331
Switch from IP address to addons.supertuxkart.net (including new
...
certificate).
2014-12-10 23:53:47 +11:00
samuncle
cb8017cae1
clamping values to avoid pink specularity
2014-12-10 03:02:36 +01:00
hiker
83f49ec319
Merge remote-tracking branch 'origin/master' into new_server
...
Conflicts:
src/online/http_request.cpp
2014-12-10 11:25:16 +11:00
Vincent Lejeune
a8ce996047
Revert "Simplify sunlight shadow shader."
...
This reverts commit cc7f95163c
.
2014-12-09 21:20:55 +01:00
Vincent Lejeune
cc7f95163c
Simplify sunlight shadow shader.
2014-12-09 19:00:21 +01:00
Vincent Lejeune
c91c04c862
Same for shadow blur pass
2014-12-09 18:54:27 +01:00
Vincent Lejeune
b24fd621a5
Precompute coefficient in gaussian blur pass
2014-12-09 18:43:48 +01:00
Vincent Lejeune
d97b9f2d0e
Clamp SpecularIBL value on positive range
2014-12-09 01:33:58 +01:00
Vincent Lejeune
2667791621
Tweak IBL
2014-12-08 19:36:23 +01:00
Vincent Lejeune
72fdf816e7
Fix Importance sampling
2014-12-08 19:16:26 +01:00
Vincent Lejeune
2b0680d92d
Use texture buffer instead of uniform for samples
...
Should fix nvidia glsl error
2014-12-08 18:24:43 +01:00
Vincent Lejeune
6041c48fbe
Source DiffuseIBL algorithm
2014-12-07 21:37:16 +01:00
Vincent Lejeune
a320eebece
Cleanup tonemap shader
2014-12-07 21:27:26 +01:00
Vincent Lejeune
a094bbae19
Factorize DiffuseIBL and SpecularIBL
2014-12-07 19:10:22 +01:00
Vincent Lejeune
e491422bdc
Weight sample in importance sampling
2014-12-07 18:26:51 +01:00
Mathieu Laprise
f98a169e9c
Friends Search bar goes off the bottom of the screen #1762
2014-12-06 17:28:02 -05:00
Mathieu Laprise
107e434fe9
Missing button in grand prix editor name dialog #1765
2014-12-06 15:14:27 -05:00
auria
d3ba1ca283
Update strings
2014-12-05 19:26:09 -05:00
Marianne Gagnon
f05618b3b9
Add possibility to specify non-translated texts in GUI XML files, and use it for debug strings that should not be translated
2014-12-05 19:17:52 -05:00
Vincent Lejeune
1e2656dc88
Use clamp instead of max(0, dot(normalized, normalized))
...
Should help GLSL compiler to optimize them.
2014-12-05 17:51:18 +01:00
Vincent Lejeune
8f3b8cf448
Implement specular IBL properly
2014-12-05 16:42:49 +01:00
hiker
48593534a5
Added certificate for our vps.
2014-12-05 13:57:27 +11:00
Vincent Lejeune
4079c18050
Update graphic restriction
...
This should fix bug #1519
2014-12-05 01:38:54 +01:00
Vincent Lejeune
fd2da4085b
Rename some shader to improve their meaning
2014-12-05 00:20:16 +01:00
Vincent Lejeune
23b781e7dd
Move glossmap formula to getspecular shader
2014-12-05 00:09:15 +01:00
hiker
645f01a508
Removed 'can use existing stkaddons' account from message.
2014-12-04 16:24:14 +11:00
Marianne Gagnon
35f55c19a1
Tweak jungle challenge to use Cocoa Temple and a slightly adjusted time
2014-12-01 18:42:46 -05:00
samuncle
3627719440
min max where inverted
2014-12-01 23:54:34 +01:00
Vincent Lejeune
354dad7392
Fix an error when indirect instancing is not supported
2014-12-01 01:46:50 +01:00
hiker
020c129691
Specify the replay buffer size as time value (i.e. how many seconds),
...
not how many frames.
2014-11-27 16:15:53 +11:00
hiker
ea3a433147
Fix #1620 (Player's achievements can only be seen when logged in).
2014-11-25 17:12:47 +11:00
hiker
ebfbf5e2aa
Updated pot file (just to check launchpad integration, no string freeze yet).
2014-11-25 15:05:51 +11:00
Marianne Gagnon
cd7bc96d68
Fix invalid snow particles XML file that would cause assertion failures
2014-11-24 18:31:38 -05:00
samuncle
82b8548066
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-11-24 21:10:08 +01:00
samuncle
92801f2b74
Tweak the snow
2014-11-24 20:23:55 +01:00
Deve
54b311f6f7
Allow to set custom ratio for images from xml file.
...
It avoids crashes and memory leaks after changing resolution.
2014-11-24 19:31:46 +01:00
Marianne Gagnon
5d5460d845
Add way to test intro cutscene easily; do not throttle sound effects on cutscenes
2014-11-22 18:21:31 -05:00
samuncle
91736e1941
Add the support for emit map. For the moment it's only for solid objects
2014-11-22 15:59:22 +01:00
Vincent Lejeune
d426a395bb
Use old formula for glossmap
2014-11-22 02:03:20 +01:00
Vincent Lejeune
f3a637fb99
Fix sun area light
2014-11-21 02:44:27 +01:00
Vincent Lejeune
79e5e9f880
Revert "Use f0 in fresnel schlick"
...
This reverts commit acdafc5566
.
2014-11-21 02:09:02 +01:00
Vincent Lejeune
593f462ec5
Revert "Use color for specular"
...
This reverts commit fcba1dab86
.
2014-11-21 02:09:00 +01:00
Vincent Lejeune
4a8afd2d40
Implement sun as an disk area light.
...
Solid angle is defaulted to sun's one.
2014-11-21 01:54:30 +01:00
Vincent Lejeune
fcba1dab86
Use color for specular
2014-11-20 22:57:32 +01:00
Vincent Lejeune
acdafc5566
Use f0 in fresnel schlick
2014-11-20 22:51:22 +01:00
Vincent Lejeune
bcd3452b70
Remove bubble shaders
2014-11-20 22:05:19 +01:00
Vincent Lejeune
a78b889b05
Modelise Beer Lambert absorption for fog
2014-11-20 21:23:33 +01:00
Vincent Lejeune
c594295288
Tweak shadow blur
2014-11-18 03:44:45 +01:00
Flakebi
4ab84a6b83
Unify I18N attributes in screens
2014-11-17 00:08:47 +01:00
Marianne Gagnon
d8b0f79428
Tweak register script so that the "Online" checkbox is closer to the text
2014-11-15 18:38:51 -05:00
Vincent Lejeune
c2859d24ce
Improved shadow stability
2014-11-15 21:27:15 +01:00
Vincent Lejeune
448f254a2b
Fixes
2014-11-15 21:02:24 +01:00
Vincent Lejeune
a7b8ba13cd
Add shader content
2014-11-15 20:43:44 +01:00
Vincent Lejeune
7e3c2c4897
Add a shader to blur shadow
2014-11-15 20:37:47 +01:00
Vincent Lejeune
687bb6e065
Spare a few lds inst
2014-11-15 19:18:07 +01:00
Vincent Lejeune
3c42223add
Try graphical restrictions on nvidia old drivers
2014-11-15 03:10:23 +01:00
Vincent Lejeune
6cc721eaf9
Use CS for gaussian6
2014-11-15 01:11:26 +01:00
hiker
2ec5c3765a
Added a config file which can be used to disable certain graphical
...
options dependeing on card, os, driver version.
2014-11-15 10:06:54 +11:00
Marianne Gagnon
c6651489c1
Tweak nitro for new engine
2014-11-13 19:24:15 -05:00
Deve
5c32aa8baa
Minor modifications for skidding and nitro.
...
Still could be better, I'm not an artist ;p
2014-11-13 19:24:53 +01:00
samuncle
bd9823dbbe
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-11-13 18:02:49 +01:00
samuncle
ffb76788a9
Minor tweak with transluscent material
2014-11-13 18:02:25 +01:00
hiker
22b6aaea25
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-13 22:47:05 +11:00
hiker
753c3d7168
Fixed #1638 (text overflows behind buttons) - partially by removing
...
the confirmation field for the emal address.
2014-11-13 22:42:32 +11:00
Deve
c1fd2d3614
Fixed skidding and nitro particles.
...
Not perfect but at least working.
2014-11-12 22:20:33 +01:00
Deve
91d26e92ef
A bit better rain.
2014-11-12 16:31:41 +01:00
hiker
25b4d35a65
Merge branch 'perPlayerDifficulties' of https://github.com/Flakebi/stk-code
2014-11-12 15:45:03 +11:00
hiker
28db99b7c1
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-12 12:26:00 +11:00
hiker
4b01d090c6
Fixed track name for GP.
2014-11-12 12:25:33 +11:00
samuncle
1bd3ee24c6
Add a description to the shader
2014-11-12 01:22:33 +01:00
samuncle
f39ae90b6e
merge with trunk + try to adapt to the new blur system
2014-11-12 00:08:21 +01:00
Vincent Lejeune
192ed8a486
Fix classic fog
2014-11-11 22:43:25 +01:00
Vincent Lejeune
09fa1ee3cb
Implement scattering for point light
2014-11-11 22:36:27 +01:00
Vincent Lejeune
bd4fe57524
Use fog start value to determine density
2014-11-11 21:52:54 +01:00
Vincent Lejeune
84affec451
Change fog equation
2014-11-10 22:08:12 +01:00
Vincent Lejeune
85bbc0f8b8
Use variable sigma for blur filter
2014-11-10 21:32:04 +01:00
samuncle
d0caeb3b63
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare
2014-11-10 06:51:10 +01:00
hiker
8dff64644a
Fixed #1687 (time too long when using many karts in ftl)>
2014-11-10 16:49:13 +11:00
samuncle
e20d8bdcdf
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare
...
Keep lens flare updated with trunk
2014-11-08 01:51:40 +01:00
hiker
5401e7f3b7
First try to prevent #1566 : kart chassis appears inside of terrain.
2014-11-08 11:43:06 +11:00
Vincent Lejeune
04d313671c
Fix sqrt(int) in diffuseenvmap
2014-11-08 01:02:46 +01:00
Vincent Lejeune
5eefe0c0ad
Make envmap reflexion less blurry
2014-11-08 00:57:49 +01:00
samuncle
2a440bb2cb
minor modification to the blueish mood of lens flare
2014-11-07 16:20:39 +01:00
samuncle
1e547652f7
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare
...
Keep lens flare updated with master
2014-11-07 16:14:11 +01:00
Vincent Lejeune
d7f3198ac9
Merge branch 'sdsm'
2014-11-07 13:42:29 +01:00
Vincent Lejeune
909948c9a4
Implement depth histogram to position cascade split
2014-11-07 13:42:13 +01:00
Vincent Lejeune
cacb008ae6
Prepare compute shader to stretch lightcoord
2014-11-07 13:42:13 +01:00
hiker
cfb4dc13a8
Updated GP for new mines track.
2014-11-05 13:39:57 +11:00
Flakebi
9dd86c8332
Don't handicap AIs
2014-11-04 23:57:33 +01:00
Flakebi
5a84b471e4
Add 'handicapped' to player name
2014-11-04 23:36:16 +01:00
samuncle
52bc4cebd4
Add the lensflare shader
2014-11-04 21:15:18 +01:00
Vincent Lejeune
92ecd01e61
Make cascade split modifiable
2014-11-04 20:53:32 +01:00
samuncle
d7caebe847
enable vignette during races
2014-11-03 21:53:44 +01:00
hiker
dec5ac8aa2
Fixed several xml errors (unclosed <space> tags).
2014-11-03 15:25:39 +11:00
Vincent Lejeune
17aafae42c
Merge remote-tracking branch 'origin/esm'
2014-11-03 01:02:27 +01:00
hiker
841ae8814e
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-11-03 08:56:19 +11:00
hiker
62b81b3e9a
Shortened labels to fit on smaller screens.
2014-11-03 08:23:35 +11:00
hiker
0be0d7ee72
Merge branch 'perPlayerDifficulties' of https://github.com/Flakebi/stk-code into Flakebi-perPlayerDifficulties
2014-11-03 06:52:31 +11:00
Vincent Lejeune
ddecd23472
Tweak values
2014-11-02 19:07:02 +01:00
Vincent Lejeune
ebe11370a2
Reenable bluring
2014-11-02 16:30:44 +01:00
Vincent Lejeune
c5186e3ab3
Use depth in exp space
2014-11-02 16:26:46 +01:00
Vincent Lejeune
b975b63eea
Use proper depth linear value
2014-11-02 16:00:41 +01:00
Vincent Lejeune
f5a44c0a19
Take more sample
2014-11-02 02:42:44 +01:00
Vincent Lejeune
9113aa7a39
Implement Exponential Shadow map
2014-11-02 02:36:10 +01:00
Vincent Lejeune
7679213e26
Use exp algorithm for the gaussian blur
2014-11-02 02:35:02 +01:00
Vincent Lejeune
6aed902ae0
Store depth in color buffer instead of depth
...
This allows for instance to blur it using already existing shaders
2014-11-01 22:38:38 +01:00
Flakebi
9ca1c03480
Applying merges correctly is difficult...
2014-10-31 18:54:52 +01:00
Flakebi
abf7bacfea
Merge branch 'upstream/master' into perPlayerDifficulties
...
Conflicts:
src/graphics/stkmesh.cpp
src/states_screens/kart_selection.cpp
2014-10-31 16:47:34 +01:00
Vincent Lejeune
ee687440c7
Increase shadow filtering
2014-10-29 18:57:39 +01:00
Marianne Gagnon
bf0f75a367
Fix (again) initial scattering of now so that it falls evenly
2014-10-28 19:06:29 -04:00
Arthur-D
6c0ace85ee
Slight improvement on notification backgrounds. Feedback welcome.
2014-10-28 07:16:29 +01:00
Flakebi
f27597c450
Revert "Fix incorrect alignment in spinner widgets"
...
This reverts commit 4cb8be6ab4
.
2014-10-26 18:02:28 +01:00
Flakebi
46f3fa5f74
Merge branch 'upstream/master' into perPlayerDifficulties
...
Conflicts:
data/gui/options_ui.stkgui
src/graphics/stkmesh.cpp
src/states_screens/options_screen_ui.cpp
2014-10-26 17:47:29 +01:00
Flakebi
4cb8be6ab4
Fix incorrect alignment in spinner widgets
2014-10-26 17:10:28 +01:00
Flakebi
690e632e1b
Move handicap to ui options and to the player name spinner
2014-10-26 16:56:50 +01:00
Arthur-D
ef2cf3b17d
Sorry for the previous messy merge - no files were changed remotely so should be safe. Due to my mishap I need to commit the files I wanted to again. Those are new bg images for achievement and friend notifications. Feedback welcome.
2014-10-26 15:34:51 +01:00
hiker
f7893afbef
Adjusted button position, thanks to auria.
2014-10-24 11:16:08 +11:00
hiker
8bc6aa91bb
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-24 10:34:59 +11:00
hiker
1920703f09
Converted label to button, just for tests.
2014-10-24 10:34:10 +11:00
Vincent Lejeune
794ab54b7a
Clamp lodval
2014-10-24 00:41:34 +02:00
hiker
b4f95d672a
Started to indicate the name of the logged in user ... still work in
...
progress (black writing on dark grey).
2014-10-23 22:26:11 +11:00
Vincent Lejeune
9ca4d7e3e6
Improve ibl specular reflexion using mipmap chain
2014-10-22 14:49:06 +02:00
hiker
c012e98f9b
Allow disabling of hw stats collection.
2014-10-22 08:20:26 +11:00
Flakebi
57afd1d585
Merge remote-tracking branch 'origin/master' into perPlayerDifficulties, this time the right branch...
...
Conflicts:
data/gui/user_screen.stkgui
data/gui/user_screen_tab.stkgui
src/graphics/glwrap.cpp
src/graphics/weather.cpp
src/states_screens/user_screen.cpp
2014-10-20 22:36:54 +02:00
Marianne Gagnon
c95e90b925
Tweak checkbox position on login screen
2014-10-17 19:24:21 -04:00
Vincent Lejeune
2f45266c6f
Fix position of speedmeter
...
Only need to get the texture
2014-10-17 18:51:41 +02:00
Vincent Lejeune
ce7f017adf
Some fixes
2014-10-17 18:43:39 +02:00
Deve
3499975b03
Move track name to center.
...
It allows a bit longer track names and looks better.
2014-10-16 19:33:54 +02:00
hiker
50c21cc11e
Added secret achievement (i.e. progress not shown in list).
2014-10-09 23:32:17 +11:00
auriamg
3061123e3e
Merge pull request #1606 from Flakebi/fix
...
Fix some more bugs
2014-10-08 18:18:37 -04:00
Vincent Lejeune
ea3cc141ff
Fix grass in azdo mode
2014-10-08 01:01:28 +02:00
hiker
4ff00018b4
Fixed alignment of password field.
2014-10-08 08:25:00 +11:00
Flakebi
0193c4c7a5
Fix #1170 Add "Don't Assign" option when configuring inputs
2014-10-07 00:06:15 +02:00
Vincent Lejeune
9de7d11ee4
Fix bloom effect on mesa
2014-10-07 00:00:16 +02:00
Vincent Lejeune
20ea7ca271
GI use sun color value
2014-10-06 22:51:41 +02:00
vlj
b10f1a3ef2
Tweak envmap
2014-10-06 02:29:18 +02:00
vlj
c7b98c4e6c
Emulate envmap specular reflexion
2014-10-06 02:19:21 +02:00
hiker
cb40f68229
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-06 09:07:34 +11:00
hiker
6f5b7aa4ae
Tried a different layout for the checkboxes (sorry, but I didn't like the
...
previous approach at all). Only disadvantage now (I can think of) is that
the width of the lables is now hard coded to 40% of the screen.
2014-10-06 07:48:15 +11:00
Vincent Lejeune
44792a1490
Fix splatting
2014-10-05 22:46:02 +02:00
Vincent Lejeune
9394f275cd
Merge branch 'specmap'
2014-10-05 21:56:10 +02:00
Vincent Lejeune
019db1a11d
Revert "Revert "Prepare shader for specmap value""
...
This reverts commit 780482edba
.
2014-10-05 21:56:04 +02:00
Vincent Lejeune
0db951f374
Try to emulate enery conservation
2014-10-05 21:53:06 +02:00
Vincent Lejeune
300a09746f
Additionnal fixes
2014-10-05 21:45:56 +02:00
Vincent Lejeune
a8161288a9
Convert remaining shaders
2014-10-05 20:47:13 +02:00
Vincent Lejeune
9f2b66d195
Use specmap on others mats
2014-10-05 20:37:49 +02:00
hiker
2730c3c026
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-10-05 21:37:42 +11:00
hiker
df62c8921e
Added limited lazy-load flag to avoid loading of all font textures
...
(most of which might not be needed). Fixes #1592 .
2014-10-05 21:35:14 +11:00
Flakebi
dc78c35b50
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
...
Conflicts:
data/gui/user_screen.stkgui
data/gui/user_screen_tab.stkgui
src/karts/kart.cpp
2014-10-05 12:10:39 +02:00
Vincent Lejeune
780482edba
Revert "Prepare shader for specmap value"
...
This reverts commit 88954a5d88
.
2014-10-05 02:30:15 +02:00
Vincent Lejeune
0121ae8db6
Use specmap value
2014-10-05 02:30:01 +02:00
Vincent Lejeune
88954a5d88
Prepare shader for specmap value
2014-10-05 02:12:04 +02:00
Marianne Gagnon
83b25768cc
tweak players screen, checkbox placement was weird
2014-10-04 19:44:04 -04:00
hiker
f63e7d93b8
Fixed #1598 (error message about font texture not found).
2014-10-04 23:32:54 +10:00
samuncle
97772ba1ae
set the downard impulse to 5 + a more easy to use backward camera
2014-10-02 13:53:59 +02:00
vlj
30dda3e343
Fix sky warp
2014-10-02 02:53:31 +02:00
hiker
de9a1f51a7
Removed empty 'online overview' page, show the achievements page instead.
2014-10-02 07:59:24 +10:00
vlj
2236e8dd1c
Fix extra respawning particles
2014-10-01 01:19:49 +02:00
Flakebi
47da30dd24
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-30 19:22:18 +02:00
samuncle
af037d6267
tweak particle.xml
2014-09-29 12:30:43 +02:00
hiker
a593c81a64
Some improvement for #1505 , but still wip.
2014-09-26 16:33:47 +10:00
hiker
2d7b8228e9
Fix #1565 : Added better instructions for account creation screen (and also made the
...
instructions actually visible).
2014-09-26 08:57:52 +10:00
Flakebi
2cf9707294
Merge branch 'upstream/master' into perPlayerDifficulties
...
Conflicts:
src/states_screens/kart_selection.cpp
I hope I got everything
2014-09-24 17:58:12 +02:00
vlj
58e1b73752
Fix bloom computation
2014-09-24 01:19:37 +02:00
hiker
06523a62c3
Fixed typo, renamed file to have proper extension.
2014-09-23 22:58:08 +10:00
hiker
13cbde2e09
Added new supertuxkart.appdata file from hughsie ( #1545 ).
2014-09-23 15:51:06 +10:00
hiker
4cea6bd7fe
Fixed #709 (Missing R with caron in title font). Thanks!
2014-09-22 15:53:40 +10:00
hiker
249c34cd0d
Fixed achievement warning.
2014-09-22 07:54:34 +10:00