Commit Graph

15292 Commits

Author SHA1 Message Date
hiker
3a023776fd Minor style changes. 2015-10-13 09:19:40 +11:00
hiker
356588e09a Merge branch 'dev' of https://github.com/konstin/stk-code into konstin-dev 2015-10-12 22:42:34 +11:00
hiker
45954e5881 Minor improvement. 2015-10-12 22:03:46 +11:00
hiker
c1d280eaa1 Cosmetic changes only. 2015-10-12 21:37:22 +11:00
Benau
786bc5d5b6 More detailed comments 2015-10-12 07:48:43 +08:00
Benau
f20158acd1 Merge remote-tracking branch 'mime/freetype_benau' into freetype 2015-10-12 07:38:25 +08:00
Benau
c7f20e549d Revert widget changes 2015-10-12 07:33:09 +08:00
hiker
da73e7d9cf Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-10-12 10:07:04 +11:00
hiker
c0b7fec58a Replaced another mutex with Sychronised. 2015-10-12 10:06:30 +11:00
hiker
47cb6ac2e3 Used Synchronised instead of pthread mutex. 2015-10-12 08:18:15 +11:00
hiker
124420b90a Cosmetic changes only. 2015-10-12 08:02:20 +11:00
Benau
23e1f8fb3e Default text wrapping in label widget
It should make no more text rendered out of area as stated in forum.
2015-10-12 01:48:13 +08:00
Benau
73ae81554d Better size handling to specific languages 2015-10-12 01:14:47 +08:00
hiker
4b0d4cb853 Fixed typo in comment. 2015-10-11 21:23:39 +11:00
hiker
525cf6df62 Fixed incorrect name of stkgui file. 2015-10-11 21:22:58 +11:00
Marianne Gagnon
fbf158eaa4 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-10-10 20:52:18 -04:00
Marianne Gagnon
d63837260f Remove seemingly uneeded rotation, see #2345. Not sure I understand what is going on 2015-10-10 20:52:12 -04:00
Deve
debb238b35 Use '3' graphical level when STK is run first time instead of custom settings.
Degraded_IBL parameter was probably accidentally set to false because option in settings means "enable IBL if true", but variable means "disable IBL if true".
2015-10-10 16:04:33 +02:00
Benau
9fe84d3dd4 More code clean up with doxygen for freetype related file 2015-10-10 16:20:33 +08:00
hiker
f0c04a8bef Started to support LAN servers in the GUI (wip). 2015-10-10 12:13:32 +11:00
Marianne Gagnon
e4095c03a3 Fix material manager issue 2015-10-09 19:46:53 -04:00
hiker
612ec37dbd Updated credits. 2015-10-10 10:36:50 +11:00
Benau
a7b2c8838f Try to fix the edged font when changing resolution
I add a debug function to write the glyph page png(s) too.
2015-10-10 01:59:29 +08:00
hiker
73cf58d13b Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-10-10 00:19:44 +11:00
Deve
500cbe2ebf Allow to use 1280x720 resolution.
This is quite popular resolution and it is a kind of standard. Even the most of new monitors have it because it has the same porportion as 1920x1080. And it looks much better than 1024x768 expanded to 16:9 proportionos ;) I also didn't notice any issues in gui during using it.
2015-10-09 13:47:19 +02:00
hiker
a66af6dc91 Cosmetic changes for coding style. 2015-10-09 16:47:18 +11:00
hiker
42ea2e5819 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-10-09 12:53:27 +11:00
hiker
4d181d3358 Make icons visible if login status is changed. 2015-10-09 12:52:49 +11:00
Marianne Gagnon
e1a6478038 Forgotten file in previous commit 2015-10-08 21:35:18 -04:00
Marianne Gagnon
7c5d6711b9 Introduce new mechanic to create keyboard shortcuts for debug functions, and start using it for FPS camera. Fixes #2341 2015-10-08 20:06:42 -04:00
hiker
92f18d03dc Removed unnecessary variable. 2015-10-09 09:43:50 +11:00
hiker
d687d17bfe Added (atm not working) LAN server menu entries. 2015-10-09 09:36:08 +11:00
Benau
486495d976 More code clean up
Now all freetype related file are written in c++ class, which enable
better coding style with current stk

Windows build tested, the edge showing issue doesn't happen on Windows btw
Maybe driver problems?
2015-10-09 01:59:22 +08:00
Benau
ebeca35460 First version of glyph page loading supporting for freetype stk
Performance should be good, it cleans some unused code too.

Windows build not tested.
2015-10-08 16:41:31 +08:00
hiker
917905c779 Removed unused functions. 2015-10-08 16:28:23 +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
14e84ed96b Minor style changes. 2015-10-07 08:22:02 +11:00
hiker
ccf8fd4e68 Renamed stkgui so that .cpp and .stkgui file names are identical. 2015-10-07 08:11:57 +11:00
Deve
2a12fa51ed Merge pull request #2337 from Elderme/fix_2328
Fix global illumination bug with intel driver #2328
2015-10-06 12:18:57 +02:00
Benau
1e7e895d7f Fix build and code clean up
Now billboard text should have a better alignment
2015-10-06 16:14:32 +08:00
Marianne Gagnon
ca107bf159 Translatable DateTime (see #2335) 2015-10-05 19:36:39 -04:00
Marianne Gagnon
d47faaaa89 Fix billboard text 2015-10-05 19:22:08 -04:00
Elderme
0fc3d3336e removed useless varying in rhpassthrough.geom shader 2015-10-05 21:22:22 +02:00
Deve
6318e8c8f8 Fixed compiler warnings 2015-10-04 16:54:14 +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
Deve
ec33e92ad0 Forgot about sun 2015-10-03 21:12:41 +02:00
Deve
bac60ff126 Fixed crash on exit race with OpenGL 2.1 2015-10-03 21:06:32 +02:00