Deve
9b5e4e9201
Merge pull request #2352 from leyyin/fix-compilation
...
Fix linux compilation
2015-10-16 10:43:10 +02:00
Daniel Butum
8cfa2f925a
Fix linux compilation
2015-10-16 11:22:20 +03:00
hiker
162bcced37
Make m_ip and m_port in TransportAddress private (adding setters and getters).
2015-10-16 16:59:42 +11:00
hiker
83811d2960
More compilation fixes :(
2015-10-16 10:37:20 +11:00
hiker
8183760cd9
Fix travis build.
2015-10-16 10:28:29 +11:00
hiker
aeb4ba63d0
Fixed #2350 .
2015-10-16 09:46:59 +11:00
hiker
517ba2c2df
Cosmetic changes, added some convenience functions.
2015-10-16 00:52:28 +11:00
hiker
9a55da5c2c
Reserve space for NetworkStrings (to reduce copying when reallocating).
2015-10-16 00:03:23 +11:00
hiker
e7860e1c14
Fixed compiler warnings.
2015-10-15 21:48:17 +11:00
hiker
a61506046b
Updated assets version.
2015-10-15 11:22:47 +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
hiker
beca77e94f
Use NetworkString for stun response data.
2015-10-14 00:18:13 +11:00
hiker
192e2f99b5
Merge branch 'konstin-dev'
2015-10-13 22:09:11 +11:00
hiker
7356958774
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-13 21:12:22 +11:00
hiker
86574e4521
Added comments and further cosmetic changes. Removed some duplicated functions.
2015-10-13 20:53:53 +11:00
Marianne Gagnon
a565c561e8
Scripting engine : add new getter Kart::getMaxSpeed
2015-10-12 19:59:17 -04: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
Deve
407f29641c
Use ugly hack for compile bullet with 64-bit mingw until I will find better solution
2015-10-13 01:05:41 +02:00
Deve
375e7ea0ed
More fixes for 64-bit mingw
2015-10-13 01:05:41 +02:00
Deve
91db8620f8
Some work on support 64-bit windows compilation using mingw
2015-10-13 01:05:41 +02:00
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
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
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
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
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
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