663 Commits

Author SHA1 Message Date
auria.mg
e7a2988273 Remove translations that are not complete enough 2016-06-26 19:33:40 -04:00
auria.mg
8691dfb2d4 Update translations from transifex 2016-06-26 19:28:27 -04:00
auria.mg
edde451551 Update version number 2016-06-26 19:22:05 -04:00
auria.mg
851bd36ce1 Add new improved race end sound 2016-06-24 20:22:48 -04:00
Rémi Verschelde
27bcdb341e Fix double slash in include
Triggers a weird 9 year old RPM bug when extracting
debugging information for the compiled binary:
https://bugzilla.redhat.com/show_bug.cgi?id=304121
2016-06-16 20:23:55 -04:00
hiker
17649cc502 Don't include ilk (linker) files, properly remove shortcut to editor. 2016-06-14 23:03:21 +10:00
Benau
f4c8c72e16 Remove a unneeded setting 2016-06-13 09:09:49 +08:00
Benau
b6027e0f18 Fix default value of m_angular_damping 2016-06-12 08:10:49 +08:00
hiker
9d94473c05 Fixed compiler warning. 2016-06-10 16:06:35 +10:00
hiker
85c05098b1 Fixed missing collision callbacks for e.g. soccer balls. 2016-06-10 13:13:35 +10:00
auria.mg
0e9e2af89e Update translation authors. Also modify the authors script to be easier to use 2016-06-08 19:51:30 -04:00
auria.mg
08f407c55c More verson and translation stuff 2016-06-08 19:45:28 -04:00
auria.mg
fe8dcdf478 Set version number to 0.9.2-rc1. Update translations from transifex 2016-06-08 19:42:25 -04:00
hiker
6281b479ac Made more physics parameters for objects adjustable in the xml file
(for now to support a puck).
2016-06-07 11:49:29 +10:00
hiker
489182749b Added support for setting the restitution for physical objects. 2016-06-07 11:49:18 +10:00
auria.mg
d3ce304d28 Update changelog 2016-06-06 19:55:44 -04:00
Deve
d5c403dfe3 One more tweak..... 2016-06-04 00:08:50 +02:00
Deve
9f0d22c013 Define constants in glew cmake file before 'add_library' function.
It was working for me as it was before, but based on this comment: 10488bc79a (commitcomment-17724549) it looks that some cmake versions may ignore definitions that are defined below add_library.
2016-06-03 06:49:28 +02:00
Benau
bf3b88e458 Fix #2498 2016-06-02 08:31:08 +08:00
Benau
2ab2953879 Fix warning 2016-06-01 10:13:24 +08:00
Benau
c1ebcf8165 Remove not too useful angle calculation
Fix a bug in reverse position returned
2016-06-01 10:13:12 +08:00
Benau
92b37d6de4 More detailed comments 2016-06-01 10:13:04 +08:00
Benau
5ad6be3d5b Don't use getDistance from battle graph for kart
As sometimes it will return 0 if kart is on unknown node

Also try to make banana avoidance better
2016-06-01 10:12:55 +08:00
Benau
c7b01b8e23 Use an improved turn radius determination 2016-06-01 10:12:45 +08:00
Benau
b45a5cec2e Make gift package playable 2016-06-01 10:12:28 +08:00
hiker
745df386e4 Added backtwards force when reversing. That fixes the problem that a
kart might sometimes get stuck when driving backwards.
2016-05-31 15:11:52 +10:00
hiker
b9cb30bbd7 Fixed FreeBSD builds (freebsd installs Freetype etc in /usr/local/lib,
but does not search in that directory for libraries).
2016-05-31 13:44:19 +10:00
Deve
8b4cd23329 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:49:32 +02:00
Deve
19f107d23f 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:40:16 +02:00
Benau
d7684d7cea Try to make AI work like zidane 2016-05-26 08:27:15 +08:00
Deve
2dbffbe7fd 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:17:39 +02:00
deve
e841ae4526 Restore old check for geometry shaders availability on non-linux platforms.
This is done to avoid too many modifications before release.
2016-05-25 13:26:23 +02:00
Deve
17867219a0 Added a check for GL_ARB_explicit_attrib_location extension.
It is enabled by default for OpenGL 3.3, but we need it for some of our shaders in render_geometry.cpp (which are OpenGL >= 3.2) and also for InstancedColorizeShader.
2016-05-24 19:01:40 +02:00
Deve
45b750c01b 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-24 19:01:31 +02:00
Deve
cb58631b5a Fixed an error message when unlocking texture in spherical harmonics.
On some tracks it was reporting following message:
[warn   ] GLWrap: OpenGL debug callback - API
[warn   ] GLWrap:     Error type : ERROR
[warn   ] GLWrap:     Severity : HIGH
[warn   ] GLWrap:     Message : GL_INVALID_VALUE error generated. Size and/or offset out of range.

This fixes #2504
2016-05-24 19:00:17 +02:00
Benau
0333054ca6 Add more defense 2016-05-24 16:02:12 +08:00
Benau
a65d4b0829 Update CHANGELOG.md 2016-05-24 09:14:10 +08:00
Benau
21793191c4 Fix wrong colon 2016-05-21 11:34:59 +08:00
Benau
99d1c48e0a Fix crashes in arena profiling mode
Notice: you need to merge arena_ai_profiling into here to test
2016-05-21 09:26:11 +08:00
Benau
001c7b30ee Use math formula to determine overtake position 2016-05-21 09:26:04 +08:00
Benau
3d95cdc76f Fix goal target not updated when going back
Also fix some unitialized value issue
2016-05-21 09:25:56 +08:00
Benau
0b162984a5 Improvements in soccer mode with minimap
1. Larger ball

2. Draw goal line of two teams in minimap
2016-05-21 09:25:47 +08:00
Benau
a48b88d890 First playable advanced soccer ai 2016-05-21 09:25:38 +08:00
Benau
2b075e7f0f Get rid of two more member values 2016-05-21 09:25:30 +08:00
Benau
4df5a269e8 Remove unneeded memeber 2016-05-21 09:25:21 +08:00
Benau
4049067c50 First version of advanced soccer ai 2016-05-21 09:25:11 +08:00
Benau
2b8e5c09d0 Try to fix lost control for soccer ai 2016-05-21 09:24:02 +08:00
auria.mg
d88bebae1e Update changelog and credits 2016-05-18 20:00:57 -04:00
auria.mg
5b42b43dee Add new volcano track 2016-05-18 19:57:27 -04:00
Benau
7b707a3546 Fix x N items font size
It should depend on screen scaling.
2016-05-18 13:04:06 +08:00
Benau
5c2286f556 Don't crash if missing texture 2016-05-18 10:06:31 +08:00
auria.mg
7f2f62be11 Add higher-res icon 2016-05-14 21:14:56 -04:00
Deve
6b7bc2c67e Update dependencies for Ubuntu
- use officially supported pkg-config instead of pkgconf replacement
- add zlib library to dependencies
- remove GLU library which is not needed at all since this commit: 60dc171700
- add libgl1-mesa-dev and mesa-common-dev which contains OpenGL headers that we need
- use libcurl-gnutls instead of openssl because it is used by default in Debian/Ubuntu for STK and many other projects.
2016-05-14 23:18:00 +02:00
auria.mg
80c8e2ace3 Merge PR 2494 into the 0.9.2 branch 2016-05-13 21:10:03 -04:00
Deve
60dc171700 Don't link libGLU library.
This should allow to run linux static package even if libglu1-mesa package is not installed. And the utilities from GLU library are not used in STK anyway.
2016-05-12 23:39:23 +02:00
auria.mg
cc77d63f5b Undo previous "bugfix", it doesn't work 2016-05-11 19:45:32 -04:00
auria.mg
822fa73b07 Fix camera roll in cutscenes 2016-05-11 19:34:30 -04:00
Deve
b0251cf0b1 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-11 09:55:13 +02:00
qwertychouskie
43152ff3ed Update screenshots and description 2016-05-07 23:35:06 -04:00
Benau
e31ea79602 Auto-balance the number of AIs
If there are uneven the number of human players in each team
2016-05-08 08:10:55 +08:00
hiker
5a72ef711c Merge branch '0.9.2' of https://github.com/supertuxkart/stk-code into 0.9.2 2016-05-07 00:15:35 +10:00
hiker
b2447f114f Fixed second location where the kart/playe rname was used. 2016-05-07 00:14:55 +10:00
Benau
c22da37992 Fix determineTurnRadius in ArenaAI
Before this function always return nan/inf/too large number of
radius, now this function will calculate the radius of curvature
correctly.
2016-05-06 22:05:22 +08:00
hiker
7ac674aebd Show the name of the player in the grand prix result screen. 2016-05-06 23:47:26 +10:00
auria.mg
12ea4bc76f Create the 0.9.2 branch, hide networking stuff 2016-05-05 19:54:14 -04:00
hiker
ef4b200dca Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-05-06 09:13:50 +10:00
auria.mg
ce6bc4a3fe Document new command-line option 2016-05-05 19:12:27 -04:00
hiker
43c2cb37c9 Use a #define SkiddingAI TestAI in the TestAI to make this file
as close as possible to the SkiddingAI, which makes it easier to
compare the two AIs to find significant differences.
2016-05-06 08:52:46 +10:00
hiker
e8c54bbdcd Use getControllerName instead of hard coded to string, minor
coding style fixes.
2016-05-06 08:52:19 +10:00
hiker
c1bdfabc89 Fixed comment. 2016-05-06 08:25:46 +10:00
hiker
ff561aa679 Fixed steering when avoiding a collision (see 79b3864511
for same patch on skidding ai).
2016-05-06 08:24:45 +10:00
hiker
79b3864511 Fixed incorrect steering direction when trying to avoid a crash. 2016-05-06 08:12:58 +10:00
hiker
ca379d921d Left the comments in, but reset the test ai to be identical to the
skidding ai again.
2016-05-05 18:42:11 +10:00
hiker
101611af3e Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-05-05 12:51:40 +10:00
auria.mg
8496352133 Make it easier to launch cutscenes, see #2482 2016-05-04 19:44:26 -04:00
hiker
45184a0322 Fixed line endings. 2016-05-05 09:40:41 +10:00
hiker
57bbf30d76 Improve new AI performance on math class (and others), but
this makes it worse on some other tracks (xr591, zen).
Maybe we should tweak AI per track?
2016-05-04 17:54:38 +10:00
hiker
f0c35965af Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-05-04 08:51:01 +10:00
hiker
8c25addda5 Changed item display from "item N x" to "item x N". 2016-05-04 07:52:40 +10: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
2e6eeb15ea Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-05-03 21:31:49 +10:00
hiker
a5ba5b0a2a Improved profile statistics somewhat. 2016-05-03 21:31:32 +10:00
hiker
2745e42935 Added a new 'testing ai', which can be started using a command line
option to either test it in play against computer, or in AI against
AI races. Atm the test_ai is nearly identical to the skidding
ai, except for one brake statement that needs to be investigated.
2016-05-03 21:28:11 +10:00
Benau
bf64ce9ec0 Avoid negative square root
Which seems to happen if a kart is going backward
2016-05-03 15:44:44 +08:00
auriamg
a852c9857e Merge pull request #2475 from antoniusriha/support_disable_race_intro_sound
Support disabling race intro sound
2016-05-02 18:58:01 -04:00
Antonius Riha
342b4f299e Delay start for 3s when intro sound is off
To bridge the silence before ready-set-go, the engines are started earlier than normal if intro sound is off.
2016-05-02 21:53:34 +02:00
hiker
c1445386b2 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-05-02 22:27:25 +10:00
hiker
8950bc1b6c Added '(beta)' to editor link. 2016-05-02 22:26:53 +10:00
Antonius Riha
d4f1f28070 Support disabling race intro and start sounds 2016-05-02 11:32:04 +02:00
Benau
f8ec241d9a Add isInvulnerable() detection for skidding ai 2016-05-02 12:28:23 +08:00
hiker
56d8f10ef9 Minor code cleanup. 2016-05-02 10:37:37 +10:00
hiker
ec41a7806c Fixed setting colour of (debug) spheres added. 2016-05-02 09:58:01 +10:00
hiker
24d298b743 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-05-01 23:14:58 +10:00
hiker
f17abe4095 Updated visual studio redistributable to the latest version (14.0.23026). 2016-05-01 23:13:53 +10:00
Benau
c096503860 Fix swatter on bubblegum shield decreasing a life in battle mode
Also let the AIs be able to protect itself using bubblegum shield
when a kart nearby is using a swatter
2016-04-30 11:13:28 +08:00
Benau
56549f68d4 Fix memory leak 2016-04-30 07:00:24 +08:00
hiker
0449263b6e Fixed compiler warning. 2016-04-28 17:16:02 +10:00
hiker
92f0ab6819 Implemented command line option "--dont-load-navmesh" to disable
loading of any navmeshes (to avoid extremly slow loading times
in debug mode, e.g. for temple).
2016-04-28 17:15:07 +10:00
hiker
b83246aac2 Revert "Do not compute the battle graph in case of a single kart in debug"
since Benau has suggested a better approach.
This reverts commit c9c37fb400.
2016-04-28 16:58:37 +10:00
hiker
fdf2df2f0f Also search for directories with the name 'build' for the editor
(not only bld), which is the documented name to use for the editor.
2016-04-28 13:59:21 +10:00
hiker
c9c37fb400 Do not compute the battle graph in case of a single kart in debug
mode in an arena: in debug mode computing the distance matrix
takes a LONG time (approximately 12 minutes on my machine). In
release mode it's fast enough for now.
2016-04-28 11:17:20 +10:00
Benau
1ad20811b8 Fix leaning value 2016-04-28 08:23:50 +08:00
hiker
94ad7ad676 Adjust wheel position in case of leaning: move the wheels on the side
that is higher in the air a bit further down so that they touch the ground.
Fixed #2400.
2016-04-27 18:15:28 +10: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
hiker
a0dc35b1fe Removed openal installer, fixed installer to properly install and remove
the editor (now named supertuxart-editor).
2016-04-27 14:00:02 +10:00
hiker
95b5161367 Removed openal installer (which is likely not necessary, see
ticket #2089.
2016-04-26 13:10:36 +10:00
hiker
031ae27919 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-04-26 12:50:51 +10:00
hiker
031c918bf4 Fixed files that were not uninstalled. 2016-04-26 12:50:21 +10:00
auria.mg
4bc0cccf00 Fix user/login screen layout, fixes #2474 2016-04-25 19:10:56 -04:00
Benau
0503855b7d Add freetype into INSTALL.md 2016-04-25 09:18:37 +08:00
auria.mg
a1eceb9d3d Fix build 2016-04-24 19:55:37 -04:00
auria.mg
5e9f0ba246 Fix invalig logging 2016-04-24 19:37:51 -04:00
auria.mg
8dfa5a3755 GPLose screen tweak 2016-04-24 19:37:27 -04:00
auria.mg
ab2f46cc90 Improve reverse track support 2016-04-24 19:36:52 -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
hiker
b59194cdf3 Add a command line option to start the network console. 2016-04-22 16:37:17 +10:00
hiker
d092dcf96c Avoid slowdown in profile mode in profile mode when fps is < 60. 2016-04-22 16:04:27 +10:00
Benau
ff10bfd07a Fix getHeading() for ghost karts 2016-04-22 11:32:55 +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
hiker
9299eca758 Fixed compilation after moving the windows installer to a different directory. 2016-04-22 07:54:40 +10:00
hiker
41ecd83d55 Started to add support for installing the editor. 2016-04-22 00:19:22 +10:00
hiker
97b7320c5b Fixed uninstallation to only delete files belonging to STK (to avoid
problems if someone installed STK e.g. in c:\Program Files - without
a subdirectory).
2016-04-22 00:03:49 +10:00
hiker
28d78447c3 Fixed installation of prerequisites. 2016-04-21 23:14:39 +10:00
hiker
6a0fdba062 Moved windows installer into tools directory. 2016-04-21 23:13:53 +10:00
hiker
889baa7e39 Removed unnecessary --with-profile command line option. 2016-04-21 22:32:24 +10:00
hiker
b16f225e47 Fixed path in installer, and support common different names
for the build directory (bld, build, cmake_build).
2016-04-21 22:28:50 +10:00
hiker
3827b504c7 Added new installer from MattDevo. 2016-04-21 09:14:33 +10:00
hiker
6987c82c7b Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-04-20 09:16:52 +10:00
hiker
9de3b4484f Fixed crash when collecting profiler output. 2016-04-20 08:47:02 +10:00
Deve
dac357daec Fixed kart selection screen for legacy pipeline 2016-04-19 01:38:48 +02:00
Benau
bb67ee78fe Fix Lesbea's game 2016-04-18 23:57:42 +08:00
Benau
caca4b06b2 Fix #1797
Don't give a bomb in case of time trial.
2016-04-16 08:15:18 +08:00
Deve
58846002eb Fixed bullet compilation for gcc 6.0.
Just converted all negative values and kept unsigned char* type to avoid too many modifications in the code.
2016-04-15 23:46:14 +02:00
hiker
ff7556130a Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-04-14 11:04:28 +10:00
hiker
95853787b3 Minor code cleanup. 2016-04-14 09:37:20 +10:00
hiker
f59ea0f258 Moved the camera debug parameter from UserConfig to a static value
in camera. Added proper names for the debug modes instead of int.
2016-04-14 09:30:26 +10:00
hiker
ef1e5da4bc Fixed compiler warning. 2016-04-13 17:11:43 +10: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
Deve
29e4d4a0bc Fixed memory corruption in case of gamepads with large buttons count.
SEvent::SJoystickEvent::NUMBER_OF_BUTTONS is a constant value and is equal to 32. In practice we don't expect any gamepad that has over 32 buttons. However some wireless mices are incorrectly detected as gamepads and they report for example 69 available buttons. Just resize m_buttonPressed array to be equal to the reported buttons count.
2016-04-10 01:22:39 +02:00
auria.mg
8c29fb01f6 Minor tweaks to split screen text to make it clearer 2016-04-07 20:53:48 -04:00
auria.mg
1ef082b2e6 Fix tabs accidentally committed previously 2016-04-04 19:46:41 -04:00
Benau
9fb7f5617b Merge remote-tracking branch 'origin/master' into transparent_kart 2016-04-04 09:02:45 +08:00
Benau
dca821d4e6 Allow looking back when watching replay 2016-04-04 09:02:04 +08:00
Benau
ae8fac6dcb No powerup display when watching replay 2016-04-04 07:54:24 +08:00
Benau
740e4e10c8 Remove soccer team color handling in kart model
Let hope in the future someone is smart enough to implement that...
2016-04-04 07:53:33 +08:00
auria.mg
53b8b90ae6 Update servers list as they are found 2016-04-03 18:56:35 -04:00
auria.mg
b0af2b40b3 Multiplayer : don't lock tracks 2016-04-03 18:42:46 -04:00
Benau
224bd277b3 Better function name 2016-04-03 13:59:10 +08:00
Benau
508ddfcd45 Show translucent icon for ghost kart in race gui 2016-04-03 11:27:46 +08:00
Benau
2e016e63b4 Allow displaying transparent wheels and speed weight objects
That's done by copying the mesh, not sure if it should be avoided...
2016-04-03 00:17:36 +08:00
Benau
79db5e2365 Fix comment 2016-04-02 16:02:51 +08:00
Benau
ccd6294699 Add transparent ghost kart in STK
There is already define for soccer team too, so in the future,
if anyone is smart to make a shader to draw red/blue karts,
it should be easier.

TODO: wheels and speed weight objects. (They seem need to be copied to work)
2016-04-02 15:53:21 +08:00
Benau
5ac25db7f8 Initial work to support transparent kart in ghost replay 2016-04-02 12:55:20 +08:00
Benau
34f9d507d0 Fix real lan network connection 2016-04-01 09:59:16 +08:00
auria.mg
894a38f6c7 Fix empty popup when no lan server detected 2016-03-31 20:40:42 -04:00
Benau
a3265d5c15 Fix uninitialised member value 2016-03-30 10:58:21 +08:00
hiker
932365cee3 Fixed VS compilation. 2016-03-29 11:18:19 +11:00
hiker
840244d476 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-29 11:09:55 +11:00
hiker
5c83249a30 Fixed crash in stand-alone server. 2016-03-29 11:09:07 +11:00
auriamg
640b6bb6b8 Merge pull request #2464 from Odd0002/master
Fix debug build on GCC 5.3.0
2016-03-28 20:08:53 -04:00
Benau
09bfdafd12 Use current font to getDimension for text
Fix crashes
2016-03-28 14:46:04 +08:00
Benau
4e0f217fc8 Remove unneeded cast 2016-03-27 20:53:33 +08:00
Odd0002
47bac3b33d Fix debug build on GCC 5.3.0 2016-03-26 22:36:22 -05:00
Benau
692539690d No combined uint32
Sorry people, you will need to re-record replay
2016-03-27 08:31:31 +08:00
Benau
dff5f8d459 Allow auto recreation of ghost replay file lists after recording. 2016-03-25 16:11:32 +08:00
Benau
151cc72e22 Save skidding info in replay 2016-03-25 15:37:53 +08:00
Benau
11b119066c Add support for using ghost kart in challenge
Real challenge file added later.
2016-03-23 14:26:48 +08:00
Marianne Gagnon
33defa44b7 Merge most modifications by egirsova to build 64-bits on OS X 2016-03-21 20:16:59 -04:00
Benau
8df9ff2cd8 Simplify ghost replay screen 2016-03-21 15:18:47 +08:00
hiker
ee4c4bd962 Try again to fix crash when exiting the server profile screen without networking. 2016-03-21 14:14:21 +11:00
hiker
ad545861ed Fix crash when exiting the server screen (network was still set to
be enabled).
2016-03-21 13:59:42 +11:00
hiker
fcc2b6493b Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-21 12:13:27 +11:00
hiker
e1ce01b5d2 Removed mostly unnecessary default constructor. 2016-03-21 12:12:01 +11:00
Benau
7aad4835b9 Merge branch 'new_track_gui' 2016-03-21 08:54:49 +08:00
hiker
065edebc70 Merge pull request #2455 from tobbi/coverity_issues_2
Add missing unlock
2016-03-21 11:53:35 +11:00
Benau
a62145ed6e Merge remote-tracking branch 'origin/master' into new_track_gui 2016-03-21 08:48:54 +08:00
hiker
ca0f66e4f8 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-21 11:03:48 +11:00
hiker
1f4776abb3 Allow server gui to start selection. 2016-03-21 09:58:21 +11:00
Marianne Gagnon
e28b48c61b Fix previous commit 2016-03-20 18:51:05 -04:00
hiker
fa721409c0 Show connected players on server gui. 2016-03-21 09:50:29 +11:00
Marianne Gagnon
cbf1e4b5d7 Remove unused files, fixes #2458 2016-03-20 18:40:43 -04:00
hiker
05483396c2 Also show name of selected karts on waiting screen. 2016-03-21 09:39:17 +11:00
hiker
be7c7bfcbc Show Waiting screen on server. 2016-03-21 09:38:53 +11: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
4d42010f2a Add missed number of laps setting 2016-03-20 08:54:12 +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
a42ee39240 Merge remote-tracking branch 'origin/master' into random_arena_item 2016-03-19 08:58:25 +08:00
Marianne Gagnon
78abafb9df Attempt proper fix for #2453 2016-03-18 19:35:26 -04:00
hiker
97ac0a6f59 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-19 10:28:01 +11:00
hiker
d25f3cee25 Added time step size as parameter to each protocol's synchromous update
function (which is needed for interpolation later).
2016-03-19 10:24:44 +11:00
auriamg
616a34ea77 Merge pull request #2456 from tobbi/coverity_issues_3
Properly free memory for m_story_mode_status and m_achievements_status
2016-03-18 19:08:38 -04:00
hiker
10bb5caae3 Show lobby screen on interactive server in LAN mode. 2016-03-18 08:10:47 +11:00
Tobias Markus
8ae746f330 Properly free memory for m_story_mode_status and m_achievements_status 2016-03-17 15:48:24 +01:00
Tobias Markus
0775347431 Add missing unlock 2016-03-17 15:38:40 +01:00
hiker
4101d72d90 Avoid crashes when the server enters the lobby (somewhat temporary,
the server needs a different kind of lobby anyway).
2016-03-17 17:20:02 +11:00
hiker
b6bcf33ae0 Added end of race handling, so that clients and server shut
down properly and go back to the lobby.
2016-03-17 17:19:21 +11:00
Benau
5b7161710d Add GUI option in track info screen for random item location. 2016-03-17 12:16:19 +08:00
hiker
094a87eb94 Avoid NULL reference crash. 2016-03-17 10:00:03 +11:00
Benau
d2509baf5c Allow random items number and type for arena with navmesh.
Number and types are hard-coded for now.
2016-03-17 01:27:24 +08:00
hiker
970159d98f Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-16 22:47:34 +11:00
hiker
c6b22cdffb Fix crash when player is not logged in. See #2453 for more details. 2016-03-16 22:29:51 +11:00
hiker
90f82494f7 Cosmetic changes only. 2016-03-16 09:49:30 +11:00
auriamg
6f5d36f479 Merge pull request #2451 from egirsova/master
Update README
2016-03-14 20:00:56 -04:00
hiker
07048d62fe Removed indices used in reading network string, now all reading
is sequentially.
Merge branch 'network_string_sequential_read'
2016-03-15 10:34:19 +11:00
hiker
19222c25bc Merge remote-tracking branch 'origin/master' into network_string_sequential_read 2016-03-15 10:33:47 +11:00
hiker
3a3e8bb49e Create a dummy camera if the server is running with graphics. This
allows starting a server from the gui.
2016-03-15 09:53:26 +11:00
hiker
1ad41db6c9 Fixed reading code which ignored 2 bytes. 2016-03-15 00:04:00 +11:00
egirsova
8d312174d8 Update README.
There is no stk-code/src/ide folder. Users should simply follow the instructions in the wiki to build for Mac OS X
2016-03-13 16:10:02 -05:00
Benau
c48ce20091 Thanks leper for this fix 2016-03-14 00:43:00 +08:00
hiker
7783de8770 Fixed line ending style. 2016-03-13 16:37:19 +11:00
hiker
e267aa9dff Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-13 16:31:36 +11:00
hiker
54463e9d66 Save server password so that authentication works. 2016-03-13 16:30:24 +11:00
hiker
467953cfe6 Merge remote-tracking branch 'origin/master' into network_string_sequential_read 2016-03-13 16:08:21 +11:00
hiker
f2c26f06f1 Another refactoring of NetworkString, this time added support for sequential
reads, so that you don't need to specify the offset anymore (and no more
removeFromFront).
2016-03-13 13:49:43 +11:00
Benau
8a9168a024 Remove the hard-coded localized name in language.cpp 2016-03-13 10:25:26 +08:00
hiker
96bf567c2e Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-11 16:46:20 +11:00
hiker
655987b992 Removed NetworkPlayerProfile field from STKPeer (since if splitscreen will
be supported there will be no 1:1 relationship between peer and players
anymore). All voting related protocols were extended to include the
voting player's player id (sp in future split screen player can vote
individually - though atm they would all vote for the same thing).
2016-03-11 16:42:35 +11:00
Marianne Gagnon
5500a06ceb Tweak subsea challenge 2016-03-10 20:57:43 -05:00
Marianne Gagnon
d0499be4b9 Update protocol to include server difficulty and mode 2016-03-10 19:25:55 -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
hiker
fc38acbea4 Fixed waiting screen. 2016-03-10 09:29:53 +11:00
hiker
b4d4f770ca Fixed line endings. 2016-03-10 09:28:52 +11:00
hiker
69f128b62f Added some log messages about received events. 2016-03-09 21:22:53 +11:00
hiker
6d1e5dc8ae Fixed crashed caused by sending messages that have been read previously
(which were sent with incorrect length).
2016-03-09 21:21:50 +11:00
hiker
45b2fef88a Merge remote-tracking branch 'origin' into remove-event-processing-info 2016-03-09 16:50:51 +11:00
hiker
058c1554ac Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-09 16:47:13 +11:00
hiker
1923ba0ab4 Two bugfixes (thanks to Benau for debugging). 2016-03-09 16:38:06 +11:00
Marianne Gagnon
8ba337c343 Regenerate pot file, fixing transifex issue hopefully 2016-03-08 21:35:25 -05:00
hiker
f35b3d2670 Merge branch 'master' of github.com:supertuxkart/stk-code 2016-03-09 13:22:00 +11:00
hiker
6067b3b8fa Use new #supertuxkart channel instead of #stk. 2016-03-09 13:21:37 +11:00
hiker
67068db470 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-09 13:19:16 +11:00
hiker
603dfe7eee Minor code cleanup. 2016-03-09 13:18:46 +11:00
hiker
62a527a14b Fixed protocol. 2016-03-09 13:16:14 +11:00
hiker
f371a019c6 Fixed compiler warning. 2016-03-09 07:49:27 +11:00
hiker
087d491445 Removed EventProcessingInfo, and pre-computing of protocols that should
receive an event. Solves potential problem that an event might arrive at
a client before the destination protocol is up and running. Also improved
handling of (dis)connects, now only protocols that can handle a disconnect
event will receive them, hopefully reducing the number of crashes when
a client disconnects.
2016-03-09 07:46:33 +11:00
Benau
114732035f Fix log 2016-03-08 10:32:35 +08:00
Benau
88fb0a555e Use uniform spelling for SuperTux 2016-03-08 08:17:47 +08: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
hiker
1dc5c0b4af Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-07 12:14:05 +11:00
Benau
05081c3033 Fix keep translating online/login issue 2016-03-07 09:08:27 +08:00
hiker
7ff4cd8873 Merge branch 'refactor-network-string' 2016-03-07 12:04:17 +11:00
hiker
94dc236a75 Merge remote-tracking branch 'origin/master' into refactor-network-string 2016-03-07 12:03:09 +11:00
Marianne Gagnon
9500331716 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-06 20:01:48 -05:00
Marianne Gagnon
04999c35ee More work on networking UI 2016-03-06 20:01:40 -05:00
hiker
a462d4a81e Fixed compiler warnings. 2016-03-07 09:12:21 +11:00
hiker
9c71dc78d1 Merge remote-tracking branch 'origin/master' into refactor-network-string 2016-03-06 16:42:16 +11:00
hiker
f70dfb7d5d Fixed crashes (on VS at least) when the string printed contained
format characters.
2016-03-06 15:54:39 +11:00
Benau
2d1d912ee8 Fix #1841 2016-03-05 16:01:42 +08:00
Benau
e3cf054ea7 Fix #1835 2016-03-05 12:55:20 +08:00
Benau
6fd6dd8792 Remove hack 2016-03-05 10:04:05 +08:00
Benau
70d5114dd7 Display localized name instead of English translation 2016-03-05 09:49:03 +08:00
hiker
ab641b0dad Replaced the filename for packet log file in the UserConfig with a
flag to enable/disable this debug output in the file STDOUT.packets
(where stdout is the final set at startup).
2016-03-03 17:10:18 +11:00
hiker
4947881d10 Removed unnecessary #include in hpp file. 2016-03-03 16:42:46 +11:00
hiker
43b3684e12 Fixed memory leak. 2016-03-03 09:39:14 +11:00
hiker
5ddd577080 Removed incorrect warning messages. 2016-03-03 09:38:53 +11:00
hiker
e1892bc4fd Try to fix handling a kart finishing the race. 2016-03-02 16:58:41 +11:00
Marianne Gagnon
14c8ecddb5 Add waiting screen for networking 2016-03-01 18:58:51 -05:00
hiker
85f15d7221 Removed unnecessary broadcast functions. 2016-03-01 17:13:31 +11:00
hiker
b26c4fc372 Send the kart updates with proper token set. 2016-03-01 17:12:04 +11:00
hiker
c77522c07f Removed ProtocolManager::sendMessageExcept() function. 2016-03-01 16:50:45 +11:00
hiker
052e369df2 Removed unnecessary setting of token, use ProtocolManager sendExcept
instead of loop.
2016-03-01 16:45:42 +11:00
hiker
d9f607fc24 Merge branch 'refactor-network-string' of github.com:supertuxkart/stk-code into refactor-network-string 2016-03-01 11:56:49 +11:00
hiker
d086501035 Merge branch 'refactor-network-string' of https://github.com/supertuxkart/stk-code into refactor-network-string 2016-03-01 11:55:57 +11:00
hiker
e3c7033aa1 Fixed incorrect level of info message. 2016-03-01 11:54:09 +11:00
hiker
753868361f Removed many token settings and tests, which are now done in
Event and when sending the message.
2016-03-01 09:56:33 +11:00
hiker
1f53923c45 Fixed potentially incorrect code in getFloat; added memory leak check;
improved handling of m_current_offset; let the NetworkString autpmatically
add the size for the type and token, so the user code only needs to allocate
space for the real content.
2016-03-01 09:54:26 +11:00
Benau
96a10ce92c Update strings 2016-02-29 10:59:42 +08:00
hiker
b18712f8c2 Added some output when running unit tests. 2016-02-29 13:53:15 +11:00
Benau
4438664907 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-29 10:25:19 +08:00
hiker
390fee96da Try to fix linux release builds. 2016-02-29 11:40:02 +11:00
hiker
a6fbd019fb Fixed linux compilation. 2016-02-29 11:09:40 +11:00
hiker
00347d2743 Removed explicitly setting token (which is now done when sending
a message to a client).
2016-02-28 16:42:32 +11:00
hiker
6c022cec6b Use sendMessageToPeershangingToken instead of creating new messages
in a loop.
2016-02-28 16:41:54 +11:00
hiker
ceb831d852 Removed STKHost::sendMessage function. 2016-02-28 16:26:48 +11:00
hiker
4b9d9cfc92 Replaced Protocol::sendMessage (which was either a send or a broadcast
depending on if the caller is a client or server) with explicitly named
functions.
2016-02-28 16:18:08 +11:00
hiker
c9d3577a13 Removed unnecessary sendMessage function in ProtocolManager. 2016-02-28 15:57:41 +11:00
hiker
58505eeb88 Started to set token in the 'lower level' functions, removing the need
to set the token in each protocol. Started to remove some of the
unnecessary send* functions.
2016-02-28 15:54:43 +11:00
hiker
9a16595261 Renamed NewNetworkString to NetworkString. 2016-02-28 14:58:15 +11:00
hiker
1e49595c53 Further improved look of NetworkString log messages. Added unit testing. 2016-02-28 14:55:48 +11:00
hiker
be815e4234 Fixed various bugs caused by switching to new NetworkString class. 2016-02-26 16:38:59 +11:00
hiker
5c32cbe1be Fixed crash (getUInt takes m_current_offset into account, which made
the indices partially invalid).
2016-02-26 09:20:13 +11:00
hiker
8621437e07 Use NetworkString's log function. 2016-02-25 17:02:51 +11:00
hiker
2357e965b4 Fixed crash, and started to improve log output. 2016-02-25 17:00:08 +11:00
hiker
6f55877e94 Fixec various crashes. 2016-02-25 16:54:31 +11:00
Marianne Gagnon
ba4e9d1a79 Tweak default config as suggested in ticket #2438, it's not perfect but seems much better that what we had previously in most cases 2016-02-24 19:20:14 -05:00
hiker
03f4339cee Handle error in lan connection. 2016-02-25 09:49:45 +11:00
hiker
9d546d4980 Use BareNetworkString to correctly decode requests-for-servers. 2016-02-25 09:49:09 +11:00
hiker
1655a4889d Use BareNetworkString. 2016-02-25 09:48:47 +11:00
hiker
28bb228914 Added missing initialisation. 2016-02-25 09:46:17 +11:00
hiker
2e8ddb1c50 Added a new base class 'BareNetworkString' for NetworkString,
used it for some of the messages exchanged before the ProtocolManager
is started (i.e. establishment of initia connection).
2016-02-24 20:32:11 +11:00
hiker
98ba11d9ba Started to introduce new network string. It compiles, but certainly
does not work yet.
2016-02-23 16:29:57 +11:00
Benau
abdd32c070 Fix warning 2016-02-22 07:43:29 +08:00
Benau
8f1daabbe1 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-22 07:26:26 +08:00
auriamg
c0bfd46ee9 Merge pull request #2441 from tobbi/missing_override
Add forgotten override's where necessary
2016-02-21 18:18:25 -05:00
Benau
dafde30077 Fix crash when press save replay key when it's not initialized. 2016-02-21 15:13:32 +08:00
Tobias Markus
d8cce95b0e Add forgotten override's where necessary 2016-02-21 01:36:15 +01:00
Benau
abd9ed189c Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-19 08:43:11 +08:00
auriamg
91bd844dca Merge pull request #2439 from Odd0002/master
Update AngelScript to version 2.30.2
2016-02-18 18:37:03 -05:00
Odd0002
0289e93bcc Silence AngelScript warning as in 6af30b68f0 2016-02-18 09:50:49 -06:00
Odd0002
e69e96af19 Fixed cmake based on https://github.com/supertuxkart/stk-code/issues/2325 and the related commit 2016-02-17 23:48:59 -06:00
Odd0002
fdd6f36b46 Update angelscript to 2.30.2 2016-02-17 22:07:55 -06:00
Benau
64522d9d13 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-17 14:03:58 +08:00
Benau
c65b0aaae0 Save jumping event in replay file 2016-02-17 14:02:33 +08:00
Marianne Gagnon
1e0586dc40 Add missing files forgotten in previous commit 2016-02-16 18:52:54 -05: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
ee68b5ccce Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-16 10:55:53 +08:00
Benau
51bfc327d7 Make race end-able 2016-02-16 10:20:05 +08:00
Benau
71c1fadcd3 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-16 09:57:41 +08:00
hiker
05a1a8a785 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-02-16 12:37:43 +11:00
hiker
2f0a69525a Use kart id instead of kart name to identify kart that has collected an item. 2016-02-15 18:16:31 +11:00
Benau
c8ecb78ffa Remove useless header 2016-02-15 15:16:26 +08:00
hiker
132ecfe409 Created separate function for handling received collectedItem messages. 2016-02-15 18:00:09 +11:00
hiker
d15a234ace Let only the server decide when a kart finished the race. Notify
all clients if this happens.
2016-02-15 17:45:24 +11:00
Benau
a6412d7a07 Add ghost icon, use it in race setup screen 2016-02-15 09:28:36 +08:00
Benau
bd1380a240 Do not crash if used addon track not found in local STK 2016-02-15 01:19:53 +08:00
Benau
05093852bc Add sorting support in ghost replay selection screen 2016-02-15 01:12:13 +08:00
Benau
4ea6ea8ea6 Add confirm dialog when deleting replay file 2016-02-14 13:52:16 +08:00
Marianne Gagnon
52b3d533f5 Fix memory management issue 2016-02-13 21:18:03 -05:00
Benau
aa81925860 Don't crash if kart not found loaded by replay files 2016-02-14 09:25:04 +08:00
Benau
c46bccc6e3 Finished GUI 2016-02-13 11:55:42 +08:00
Benau
8a121ed32b Add Ghost replay GUI 2016-02-13 01:34:00 +08:00
Benau
5cd27f8f99 Seperate directory for replay files
It allows replay GUI to load them easier
2016-02-12 10:01:54 +08:00
Benau
a6c4a72e2c Make lap counting works for ghost kart
As no m_terrain_info->update in ghost kart update
2016-02-12 01:18:26 +08:00
hiker
1ad782e6a6 Added comments. 2016-02-11 17:24:55 +11: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
Benau
1278394740 More clean 2016-02-11 10:09:31 +08:00
Benau
80152d2989 Clean up 2016-02-11 10:05:40 +08:00
Benau
4daa752bb6 Don't hurt a kart when it's already hurt enough 2016-02-11 09:08:12 +08:00
Benau
3f89512b34 Remove most isGhostKart() hack when avoidable 2016-02-11 09:01:09 +08:00
Marianne Gagnon
fe6bbb80c4 Delete unused da_DK translation, closes #2435 2016-02-10 19:56:45 -05:00
hiker
7e6711e163 Renamged NetworkWorld to RaceEventManager (since this class is
not a 'world' in the sense our game modes are).
2016-02-11 09:03:51 +11: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
hiker
99bc5477a2 Use a password to authenticate the client that is allowed to
control a server (now the controlling client can reconnect in
case it gets disconnected, previously with only allowing the host
with id 1 to control, the server could not be controlled anymore).
2016-02-10 18:03:42 +11:00
Benau
5a9fdd7a8d Allow replay reverse track 2016-02-10 12:43:45 +08:00
Benau
61d6e572c0 Remove unnused file 2016-02-10 10:38:27 +08:00
hiker
bfced53aaf Started to add password support for a controlling a server. 2016-02-10 13:32:39 +11:00
Benau
0181ba0bc9 Add Ghost Controller 2016-02-10 10:27:13 +08:00
hiker
cebf395939 Only allow the first connected client to control the server. 2016-02-10 08:28:15 +11:00
hiker
ee320588d5 Merge remote-tracking branch 'origin/master' into support_nw_splitscreen 2016-02-09 17:40:59 +11:00
hiker
354770f564 Added 0 number of laps to configuration to test ending a race. 2016-02-09 13:38:25 +11:00
hiker
8f492d8480 Updated documentation. 2016-02-09 13:38:06 +11:00
hiker
f5a344ccb4 Fixed voting for laps and reverse. 2016-02-09 09:41:35 +11:00
Benau
bf080421a7 Allow showing speed of ghost karts in replay
Use when change camera target to ghost karts
2016-02-08 12:28:40 +08:00
Benau
b6b644ecb5 Clean up 2016-02-07 10:20:37 +08:00
Benau
af5b23e5c6 Fix potential crash 2016-02-07 00:56:14 +08:00
Benau
c3f589561c Initial work on supporting real race with ghost karts
To test, you need to pass --ghost to supertuxkart with choosing a
track that has replay recorded, you can record one with artist
debug mode.

TODO: correct position handling
2016-02-06 14:52:50 +08:00
hiker
52460d02de Made start/terminate/pause/unpause-Protocol private, so that now all
calls to those functions from the ProtocolManager event loop (which
avoids locking problems).
2016-02-05 16:28:58 +11:00
hiker
af6ecfec3a Removed unused function. 2016-02-05 16:15:58 +11:00
hiker
89979a46f5 Removed unused variables. 2016-02-05 16:09:31 +11:00
Benau
647f42e984 Update comment 2016-02-05 09:40:34 +08:00
Benau
0091c1555a Save nitro and zipper GFX in replay 2016-02-05 09:30:40 +08:00
hiker
2d0fd0260e Added file forgotten in previous commit. 2016-02-05 10:08:58 +11:00
hiker
6a9a8565d0 Replaced exit mutex with Synchronised. 2016-02-05 09:02:32 +11:00
hiker
89c972c316 Cosmetic changes only. 2016-02-05 08:33:35 +11:00
hiker
e392aa6ead Fixed syntax errors :( 2016-02-05 08:28:21 +11:00
hiker
0d488b916d Use Synchronised instead of mutex for next protocol id. 2016-02-05 08:24:28 +11:00
hiker
348a300c09 Use Synchronised for m_requests instead of separate mutex. 2016-02-05 08:19:26 +11:00
hiker
263e41ec1f The update messages are now handled in the main thread, which removes the
need for locking. Also only the last update event is handled, older events
are discarded.
2016-02-04 17:15:14 +11:00
hiker
4fa7a89963 Fixed (probably debug only) crash: evaluating the pointer arithmetic
left to right had invalid intermediate result (i>0; offset <0).
2016-02-04 16:56:11 +11:00
hiker
f580603c97 Cosmetic changes. 2016-02-04 16:55:42 +11:00
Benau
5810acb114 Fix memory leak 2016-02-04 10:11:14 +08:00
Benau
38eeddd4e8 No reference for int and float 2016-02-04 09:51:59 +08:00
Benau
4cbb31b8e5 Ghost kart replay fixes:
1. Allow saving steering, speed, suspension length

2. No more crashes when trying to replay
2016-02-04 08:17:02 +08:00
hiker
878760ed2d Fixed GameEventProtocol (e.g. collecting items). 2016-02-03 09:07:15 +11:00
hiker
f5897001d8 Properly lock data structure (I've seen data corruption, most likely
caused by not locking).
2016-02-03 09:05:26 +11:00
hiker
19053d8ac6 Removed unnecessary call. 2016-02-03 08:48:28 +11:00
hiker
cc017da1d6 Let only the server ping the clients (to reduce network traffic). Reduce
frequency of pings (since it appears that often esp. during loading
clients are busy loading which artificially increases latency).
2016-02-03 08:21:34 +11:00
hiker
4f12a9a66c Prevent usage of duplicated host ids (before if hosts A and B are connected,
then A disconnects and C connects, B and C would have the same host id).
2016-02-02 09:52:07 +11:00
hiker
ef8c04e117 Removed unnecessary lock. 2016-02-01 16:45:07 +11:00
hiker
d78c1b3272 Replaced array with scalar value, minor code cleanups. 2016-02-01 16:42:36 +11:00
Benau
87862c27ae Fix #2127 2016-01-31 10:16:12 +08:00
Marianne Gagnon
3de922bc19 Fix animated textures not working on animated meshes. FIxes #2432 2016-01-30 18:11:58 -05:00
Benau
40e193e415 Reset the ball if out of navmesh after 2 seconds
Plus some code clean up
2016-01-29 14:40:52 +08:00
hiker
ad21b6dfa2 Merge pull request #2375 from leyyin/travis-matrix
Add matrix configuration to travis file
2016-01-29 12:23:04 +11:00
hiker
17de128f09 Cosmetic changes only. 2016-01-29 08:18:34 +11:00
hiker
e81935df99 Added convenience functions that encode and decode Vec3s and Quats. 2016-01-29 08:14:13 +11:00
hiker
6039f63c0b Removed need m_self_kart from NetworkWorld, which is not necessary anymore. 2016-01-29 07:42:32 +11:00
hiker
06d1168948 Refactored to remove need for unique kart names. 2016-01-29 07:40:16 +11:00
Benau
cbc9353210 Completely brake the AI karts in goal phase. 2016-01-28 16:13:03 +08:00
hiker
497a018667 Cosmetic changes only. 2016-01-28 08:41:50 +11:00
hiker
2606c5230d Refactored ControllerEventsProtocol so that unique kart names
are not necessaruy anymore.
2016-01-28 08:05:48 +11:00
hiker
892e1b58d1 Protocols are now either synchronous or asynchronous. This avoids a problem
that in (rare) circumstances e.g. a message that is only handled synchronously
is deleted from the asynchronous thread (if the main thread is too slow and
a time out is reached).
2016-01-27 10:05:25 +11:00
hiker
e31ce6844e Partial fix for crash when disconnecting clients. 2016-01-27 07:40:25 +11:00
hiker
618248ef4d Added comments. 2016-01-27 07:39:53 +11:00
Daniel Butum
28394c36b1 Add matrix configuration to travis file 2016-01-26 18:01:54 +02:00
Benau
5c81a2a3e7 Seperate red and blue balls a bit in race gui
This make score like 10:10 a bit clearer
2016-01-25 12:51:43 +08:00
Benau
e8adf7f051 Remove bubblegum in soccer mode as suggested by auria 2016-01-25 12:50:20 +08:00
Benau
3674815e03 Missing reset() 2016-01-23 10:50:32 +08:00
Benau
2bc9362ac6 Add mini-skid for BattleAI when attacking targets 2016-01-23 10:34:20 +08:00
Benau
df9dc5ff34 Make AI really bends it like Beckham
Notice: AI will only try to skid to save the ball from being scored
when expert and supertux mode.
2016-01-22 22:01:22 +08:00
Benau
ea05f4b6ba Allow saving default time limit option too 2016-01-22 12:27:09 +08:00
Benau
99162e3d0f Fix wrong positioning of music description in soccer mode with time limit. 2016-01-22 12:01:01 +08:00
Benau
95f6f910b8 Allow saving selected team in single player soccer mode. 2016-01-22 11:32:06 +08:00
Benau
a7aedbe208 Remove unused PNG 2016-01-22 09:20:03 +08:00
Benau
1ee9979fe1 More soccer mode improvements:
1. Max 8 karts are supported now

2. Clearer starting position assignment in soccer world

3. Reset all karts to starting position after each goal
2016-01-21 15:28:11 +08:00
Benau
35ce3d8299 Add defense knowledge for AIs 2016-01-20 16:30:26 +08:00
Benau
1e7ac6e98b Avoid eating banana in a smarter way 2016-01-20 14:20:46 +08:00
Benau
93b6b96c2e Put animation settings in KartModel 2016-01-20 10:16:18 +08:00
Benau
3a3963bf8d Make STK soccer mode more like real match
1. Short win animation is shown in a kart if it scored correctly

2. Possible to identify own goal in result gui

Also player name is shown instead of kart name in result gui for all modes.
2016-01-19 16:21:58 +08:00
Benau
7831ef5ef5 Reverse logic for opposite goal 2016-01-19 16:21:30 +08:00
Benau
b7df193ed4 Add Red/Blue icon in soccer setup screen 2016-01-19 08:49:23 +08:00
hiker
560ff7cee4 Moved ActivePlayer out of Controller and into LocalPlayerController. 2016-01-18 16:47:48 +11:00
hiker
affc53fef4 Updated documentation. 2016-01-18 16:22:15 +11:00
Marianne Gagnon
7e93af7414 Forgotten file in previous commit 2016-01-17 21:31:23 -05:00
Marianne Gagnon
025c117d58 Tweak soccer setup screen to be clearer 2016-01-17 21:21:55 -05:00
Benau
6e2f1c98e1 Merge remote-tracking branch 'origin/master' into soccer_ai 2016-01-18 10:00:45 +08:00
Marianne Gagnon
0b5fdb6729 More work on billboards to render them properly, see #2427 2016-01-17 20:58:20 -05:00
Benau
d9a9900608 Merge remote-tracking branch 'origin/master' into soccer_ai 2016-01-18 09:54:23 +08:00
Benau
61113bbef9 Silence warning as auria suggested 2016-01-18 09:52:34 +08:00
Benau
606add8605 Use back billboard arrow 2016-01-18 09:50:55 +08:00
Marianne Gagnon
ea02f232dc Fix compositing of billboards, they were forced to be additive 2016-01-17 20:37:15 -05:00
hiker
a6386e1f20 Simplified and documented code. 2016-01-18 08:17:44 +11:00
hiker
73d8e18044 Fixed and simplified sendMessageToPeersChangingToken, avoiding
incorrect messages if more than one peer is connected.
2016-01-18 08:16:32 +11:00
Benau
51ce4c5cbd Use red/blue billboard text above karts in soccer world as Arthur suggested 2016-01-17 12:13:20 +08:00
Benau
ab61e55a6d Fix bugs in Race GUI 2016-01-17 12:11:09 +08: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
b45d926a00 Clean up and bug fixes 2016-01-16 09:14:19 +08:00
Benau
d328fc7133 Better team saving 2016-01-15 23:50:54 +08:00
Benau
82dca17f42 Friendly-fire in soccer mode 2016-01-15 21:49:54 +08:00
Benau
e296ebe4af Use white-black ball in minimap 2016-01-15 19:52:49 +08:00
Benau
7ef019f794 Use the checkPosition function for better angle handling in SkiddingAI 2016-01-15 18:35:21 +08:00
Benau
d14a39e0f7 Initial work on soccer AI, plus lots of code re-factor/clean up.
To test, you need to update stk-assets with the dummy soccer field.
In single player, you are limited to be in red team for now, so just
shoot the ball into the blue goal. Also max-goal is limited to 4.

Regarding AIs, the steering with ball logic is handled in
SoccerAI::correctBallPosition, max AI supported in single player
is limited to 5 by now.

The AI is not as good as Zidane or Ronaldo, but steering with ball
for human is not as easy as not normal driving anyway, so don't
laugh at the AIs. :)

TODO: Friendly-team firing, polish the soccer field.
2016-01-15 18:25:52 +08:00
hiker
b7870b2377 Fixed crash (when going back from track screen to kart screen). 2016-01-15 16:25:02 +11:00
hiker
d3a7c75a62 Replaced many uses of getPlayer with Controller::canGetAchievements.
Removed some unused variables.
2016-01-15 08:02:36 +11:00
hiker
45399fc43f Removed unused data. 2016-01-14 08:30:02 +11:00
hiker
846fd3f059 Started to support split screen by fixing and improving the handling
of local plauyer ids.
2016-01-14 08:20:14 +11:00
hiker
e70017a1a6 Code simplification. 2016-01-14 08:05:40 +11:00
hiker
b0571e419a Added documentation. 2016-01-13 17:03:01 +11:00
hiker
409862dbe2 Merge branch 'removeLocalPlayerInfo' 2016-01-12 13:15:36 +11:00
hiker
2c232bf400 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-01-12 13:15:09 +11:00
hiker
7b6ec4e916 Merge remote-tracking branch 'origin/master' into removeLocalPlayerInfo 2016-01-12 13:02:34 +11:00
hiker
e7dd7f4d1a Replaced setLocalKartInfo with setPlayerKart. Updated some docs. 2016-01-12 13:00:45 +11:00
hiker
6816b08af1 Made m_player private in Controller. 2016-01-11 17:35:24 +11:00
hiker
4d28bb484f Added host id which is used to determine local/remote players. 2016-01-11 17:08:06 +11:00
hiker
f0c5f43fe2 Removed setNumLocalPlayers (which is now part of setNumPlauers)<
fixed coding style in race manager.
2016-01-11 07:58:30 +11:00
Deve
87d474bd1a Fixed compilation.
The __try and __except are not available in mingw.
2016-01-08 20:48:39 +01:00
Deve
2da5efd983 Simplify code a bit 2016-01-08 20:20:03 +01:00
Deve
280ad614bb Fixed creating screenshots in menu screens 2016-01-08 20:20:03 +01:00
hiker
e46c47d5c9 Removed m_local_player_karts data structure in RaceManager. 2016-01-08 17:03:50 +11:00
Benau
283c1a7c37 Update supertuxkart desktop file to support searching with keywords 2016-01-08 09:34:13 +08:00
hiker
6ffe0cc995 Updated comments. 2016-01-07 17:11:14 +11:00
hiker
f5438c433c Removed unused variable. 2016-01-07 17:07:04 +11:00
hiker
a1b05dbb00 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-01-07 08:48:00 +11:00
hiker
f3851e44a9 Removed code duplication in StartGameProtocol. 2016-01-07 08:47:43 +11:00
hiker
7826a8a751 Removed compiler warnings. 2016-01-06 18:10:54 +11:00
hiker
eb30294259 Disable access to network races. 2016-01-06 18:01:46 +11:00
hiker
b8ed2025ed Merge remote-tracking branch 'origin/master' into refactor_networking 2016-01-06 17:53:45 +11:00
Marianne Gagnon
4eb5ee6e77 Fix crash due to goal checklines not initializing properly 2016-01-05 20:36:01 -05:00
hiker
efa0f0afc9 More docs, code cleanup. 2016-01-06 08:21:48 +11:00
hiker
c1560ddb02 Renamed getPlayerID() to getGlobalPlayerId(); started to refactor
StartGameProtocol.
2016-01-06 08:10:03 +11:00
hiker
801f6961cf Updaetd documentation. 2016-01-06 07:59:38 +11:00
hiker
7bb14cc1fc Minor code cleanup. 2016-01-05 17:32:46 +11:00
Benau
347c608867 Final clean, put every kart location in three strikes battle world 2016-01-05 13:15:50 +08:00
hiker
65a23c125a ADded comment. 2016-01-05 08:22:27 +11:00
Benau
405d31ecfc Better pointInPoly 2016-01-04 16:10:38 +08:00
Benau
87df259f48 Cleanup controller, plus better logic in updateKartNodes 2016-01-04 14:28:06 +08:00
Benau
0393eef825 Merge remote-tracking branch 'origin/win_lose_music' 2016-01-03 10:27:37 +08:00
Benau
d4e312885a Make SFX depends on race result too
Currently use gp_end for test
2016-01-03 10:19:51 +08:00
Marianne Gagnon
b1ef0bc40a Try to fix travis build 2016-01-02 20:57:46 -05:00
Marianne Gagnon
15b35b76ac Scripting : add ability to use delegates for timeouts (enabling complex timeouts) 2016-01-02 20:34:39 -05:00
Benau
37da8423f8 Fix #2417 2016-01-03 09:04:24 +08:00
Deve
bd9f435190 Fixed 64-bit windows compilation.
Broken in 53164e5cbe or somewhere around it.
2016-01-03 00:10:30 +01:00
Benau
2aaab61f93 Implement win or lose music for race result screen
TODO: Proper music file
2016-01-01 13:31:15 +08:00
Benau
9624b1ab28 Prevent crashes when invaild navmesh is used or no items in an arena 2015-12-31 09:34:37 +08: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
70aad3e265 Just rename a variable 2015-12-20 13:46:41 +01: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
Deve
f9c48a0fa2 Fixed compute shaders compilation for drivers which report only OpenGL 3.x 2015-12-20 13:46:41 +01:00
Deve
9eb6694d61 Check for arrays of arrays extension, which we use in compute shaders 2015-12-20 13:46:41 +01:00
Benau
4e5197e7c1 Different max number of AIs per arena
Now I make large arena like stadium to have max 8 player-slots,
should be very fun to play

Remember update stk-assets to test!
2015-12-20 16:28:01 +08:00
Benau
7031e1bf8c Merge remote-tracking branch 'origin/graph_cleanup' 2015-12-20 09:12:50 +08:00
Benau
fefeffad91 Further clean 2015-12-20 09:01:50 +08:00
auriamg
82032ca6c9 Merge pull request #2406 from devnexen/master
better alternative OSes handling + tiny C++ fix
2015-12-19 17:59:26 -05:00
Benau
3d409a9742 Fix comment 2015-12-20 01:13:51 +08:00
Benau
08b2e27ed9 More clean up 2015-12-19 16:23:18 +08:00
Benau
e4da6d4a99 Merge remote-tracking branch 'origin/master' into graph_cleanup 2015-12-19 16:23:11 +08:00
David Carlier
2841c0e165 better alternative OSes handling + tiny C++ fix 2015-12-19 07:05:45 +00:00
Benau
74c547cb1d Remove duplicated code, plus some more cleanup 2015-12-19 02:09:37 +08:00
Marianne Gagnon
94151dda60 Add forgotten file 2015-12-17 20:25:05 -05:00
hiker
c222ba2ebd Added documentation and minor cosmetic changes. 2015-12-16 18:31:03 +11:00
hiker
c9bf95079c Cosmetic changes only. 2015-12-16 08:22:30 +11:00
hiker
6280613e5c Avoid incorrect warning message in case of a disconnect. 2015-12-16 07:59:10 +11:00
hiker
07baf05b90 Fixed incorrect order in which protol ids were deleted. 2015-12-16 07:58:39 +11:00
hiker
68e37c902f Merge remote-tracking branch 'origin/master' into refactor_networking 2015-12-15 22:52:55 +11:00
hiker
430529ed58 Fixed non-windows compilation. 2015-12-15 09:14:51 +11:00
hiker
5c2f78b176 Refactored Local- and NetworkPlayerController to use a common base
class PlayerController.
2015-12-15 07:50:50 +11:00
hiker
dbd210d08c Renamed PlayerController into LocalPlayerController. 2015-12-10 17:54:29 +11:00
hiker
770d05f0de Fixed crash if more than one kart is connected to the server (since the
network kart screen will only show local karts now).
2015-12-10 17:37:28 +11:00
hiker
e0b3de17f6 Added new isLocalPlayerKart() function to controller, which is used
to detect when sfx and graphical effects should be shown. The isPlayerKart
funtion is used to detect a (local or remote) player, e.g. for rubber-banding
the AI, or finding the Xth player kart.
2015-12-10 17:35:31 +11:00
hiker
1969ee0b1f Set a name for each thread in VS. 2015-12-09 08:55:46 +11:00
hiker
1755f22663 Cosmetic changes only. 2015-12-09 00:13:35 +11:00
hiker
03594fcad9 Bugfix: the server would try to send a received kart action to the
server again.
2015-12-08 17:28:01 +11:00
hiker
34dad96017 Minor code cleanup. 2015-12-08 17:25:19 +11:00
hiker
786f9eb693 Fixed typoe (isclient vs isClient). 2015-12-08 17:24:10 +11:00
hiker
7fa062881d Removed unused variable. 2015-12-08 08:08:00 +11:00
hiker
e74ef461a4 Fixed crash (probably in debug mode only): iterator+i+o would
first compute and check iterator+i, and not iterator+(i+o), which
caused a crash.
2015-12-07 23:54:43 +11:00
hiker
27f1828c73 Fix crash (in case of result==false, index could be out of bounce). 2015-12-07 23:51:38 +11:00
hiker
7cc77f41f7 File missing in previous commit. 2015-12-07 23:50:21 +11:00
hiker
d8b417d536 Cosmetic changes; removed static variable. 2015-12-07 17:05:08 +11:00
hiker
9153439f68 Cosmetic changes only. 2015-12-04 18:07:43 +11:00
hiker
35d1059a39 Cosmetic changes only (coding style, comments). 2015-12-04 17:52:21 +11:00
hiker
97756dd337 Only show kart selection widgets for local (and this means atm only
one) player.
2015-12-04 08:12:29 +11:00
hiker
637202077f Automatically start game when all track votes have been received. 2015-12-04 08:00:51 +11:00
hiker
af3f72ae84 Automatically trigger computing the track data (based on votes)
once the game starts.
2015-12-03 17:56:16 +11:00
hiker
26155933f0 Set the local master on the server. 2015-12-03 17:54:24 +11:00
hiker
0983038d5c Fixed size of token. 2015-12-03 09:10:07 +11:00
hiker
9765c56a44 Enable voting for tracks. 2015-12-03 08:24:17 +11:00
hiker
4286f47a31 Fixed incorrect indices. 2015-12-03 08:23:52 +11:00
hiker
ee7097af35 Added some default settings for race mode and send them to the server.
Changed major and minor mode in protocols from 1-byte to int, since 1-byte
is too small to store the actual values.
2015-12-03 07:53:56 +11:00
hiker
03d857db3e Removed unnecessary code. 2015-12-02 08:17:03 +11:00
hiker
0f52f0bdd9 Fixed incorrect message id in kart selection update message. 2015-12-02 08:16:22 +11:00
hiker
dfa78eaef2 Fixed random token computation to use indeed all 32 bits. 2015-12-02 07:45:05 +11:00
hiker
6d272d8a5a Fixed crash when quicly exiting stk after refreshing the server list. 2015-12-01 23:25:04 +11:00
hiker
109288e0f5 Removed unused code. 2015-12-01 18:10:06 +11:00
hiker
76ddaeaef7 Force refresh of server list when exiting from the server info screen. 2015-12-01 17:47:03 +11:00
hiker
642c402dcf Fixed unconnecting from a server. 2015-12-01 17:43:43 +11:00
hiker
14390c2c5b Cosmetic changes. 2015-12-01 08:28:53 +11:00
hiker
c9a23bcbb7 Fixed disconnecting of a client. 2015-12-01 08:19:48 +11:00
hiker
bcfec98fa2 Removed all references to OnlineProfile, which makes LAN and WAN
server behave idential (and it also fixed potential memory leaks).
2015-12-01 07:57:42 +11:00
hiker
2e758a0641 Don't use #players as next player id - if a player gets disconnected,
the next player id would be duplicated.
2015-11-30 08:12:10 +11:00
hiker
18e5cd8d53 Enable refresh of server list after exiting a connection again. Also
removed deleting the joined server.
2015-11-28 12:45:03 +11:00
hiker
73e94e9824 Avoid race condition when a client exits in the lobby. 2015-11-28 12:33:01 +11:00
hiker
e2a6d1c33c Avoid crash (index could be -1). 2015-11-28 12:32:00 +11:00
hiker
09a32c2132 Fix various crashes when a client exits. 2015-11-27 23:05:32 +11:00
hiker
8d843a7317 Show the connected players in the player list of the gui. 2015-11-27 23:05:05 +11:00
hiker
0076a041c9 Used new decode/encodeString functions in other places, made getString private. 2015-11-27 08:55:21 +11:00
hiker
b092b47a58 Send the player's online or local (if not online) name to the server
and all clients.
2015-11-27 08:24:02 +11:00
hiker
801b390860 Removed linux compiler warnings. 2015-11-26 09:16:27 +11:00
hiker
517b0dabf9 Merge branch 'refactor_networking' of https://github.com/supertuxkart/stk-code into refactor_networking 2015-11-26 08:48:05 +11:00
hiker
f81bd5d0c5 Fixed names utf8ToWide and wideToUtf8; added convenience functions
taking std:;string and core::stringw as parameter (removed .c_str()
in many function calls).
2015-11-26 08:47:02 +11:00
hiker
2f126ab226 Moved NetworkPlayerProfile into its own file, added getter and
setters for it.
2015-11-26 07:41:37 +11:00
hiker
927969e720 Added new server state for 'selecting karts'. 2015-11-24 07:55:58 +11:00
hiker
078de5fe93 Server-side authorisation now implemented if client is on
same IP address.
2015-11-24 07:53:51 +11:00
hiker
981a4ab234 Fix crash when disconnecting. 2015-11-23 17:22:12 +11:00
hiker
3e9e9349c0 Removed commented out code. 2015-11-23 17:21:51 +11:00
hiker
07876a0899 Fixed linux compilation 2015-11-23 11:40:33 +11:00
hiker
064414afa3 Added server-side test to see if client is authorised to send commands. 2015-11-23 08:26:18 +11:00
hiker
da2671c6ee An 'authorised' client can now tell the server to select karts. 2015-11-23 08:08:23 +11:00
hiker
0f38d6fb8a Don't add same peer twice (which causes a crash when the peer disconnects etc) 2015-11-23 08:03:15 +11:00
hiker
f05b6f6dd7 Improved handling of cancelling server creation. 2015-11-21 12:21:50 +11: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
093283c5b0 Avoid crash if networking was selected, but not actually started. 2015-11-21 12:20:05 +11:00
hiker
e804fc281a Removed unnecessary stkgui file. 2015-11-21 12:15:02 +11:00
hiker
1700395dc2 Fixed crash when no votes for a category have been received. 2015-11-21 12:01:45 +11:00
hiker
68bcd4bde3 Cosmetic changes only. 2015-11-21 11:49:15 +11:00
hiker
10bed9a20d Used more names for protocol commands, and use switch instead of if's. 2015-11-21 10:39:56 +11:00
hiker
3ab66592cd Only minor cosmetic changes. 2015-11-20 17:02:47 +11:00
hiker
7a2c7125e5 Used enums instead of numbers for lobby protocol subcommands. 2015-11-20 16:41:54 +11:00
hiker
73e14a964a Cosmetic changes only. 2015-11-20 08:16:41 +11:00
hiker
c3e74d344f Add warning message in case of an unknown command, and do not send
it to the servrer (which typically just confuses it).
2015-11-20 08:07:31 +11:00
hiker
683f0fdc07 Fixed incorrect index. 2015-11-19 14:21:56 +11:00
hiker
b55b91edf1 Use const & for std::string, cosmetic changes. 2015-11-19 14:20:10 +11:00
hiker
2b687e1051 Avoid crash when voting. 2015-11-19 14:19:01 +11:00
hiker
e7cc868c85 Removed uneccesary vector copy. 2015-11-19 14:18:34 +11:00
hiker
4813637a37 Cosmetic changes only. 2015-11-19 09:21:28 +11:00
hiker
5994123b98 Fixed crash. 2015-11-19 09:21:03 +11:00
hiker
ba4ccd5621 Added command line option to start a LAN server. 2015-11-18 17:24:56 +11:00
hiker
e6c2620c90 Print 'hide address' only in WAN mode; remove commented out code. 2015-11-18 13:44:25 +11:00
hiker
90b92419f3 Avoid crash in case that a player is not logged in online. 2015-11-18 08:15:22 +11:00
hiker
17f588bcf2 Fixed storing of EnetAddresses in TransportAddress. 2015-11-18 08:14:58 +11:00
hiker
29e0b50e14 Removed friend declaration; fixed crash caused by deleting the
ENetPeer when deleting an (STK) Event.
2015-11-17 08:11:07 +11:00
hiker
0ed22d0d6e Fixed debug message. 2015-11-16 18:46:04 +11:00
hiker
980cdf835d Avoid crash when clicking on (empty) list while server list is being refreshed. 2015-11-16 18:44:14 +11:00
hiker
785b9a9130 Don't try to hide address in LAN networking, other minor fixes. 2015-11-16 18:43:46 +11:00
hiker
4a3c4c552e LAN clients now start to connect to the server. 2015-11-13 08:50:03 +11:00
hiker
af9018ea64 Moved Server and ServersManager into network directory. 2015-11-12 17:52:04 +11:00
hiker
6716dfce97 Removed unnecesary #include. 2015-11-12 12:04:36 +11:00
hiker
2e65b23539 Don't poll stk server if this is a LAN server. 2015-11-12 09:58:21 +11:00
hiker
5fc830825f Refactoring: Created a separate NetworkConfiguration class which stores
all information to create the STKHost.
2015-11-12 09:53:12 +11:00
hiker
51411a796a Minor refactoring of lan handling, added client's ip address and port
to the answer from the client (which can later be used when the
client requests a connection from a server).
2015-11-10 17:00:47 +11:00
hiker
833c20ceff Added comment. 2015-11-10 08:34:45 +11:00
hiker
8953547305 Store TransportAddress of server in servers data structure. Avoid
copying the currently connected server, instead avoid modifying the
server data structure while while a client is connected to a server.
2015-11-10 08:31:07 +11:00
hiker
3a9576f109 Removed unnecessary #include. 2015-11-10 08:11:03 +11:00
hiker
0074550f57 Fixed typo. 2015-11-10 08:09:05 +11:00
hiker
0a23198be1 Cosmetic changes only. 2015-11-10 08:08:41 +11:00
hiker
36ebe29649 Fixed typo. 2015-11-10 08:08:22 +11:00
hiker
cdbc5cf15d One more linux compilation fix. 2015-11-09 21:51:05 +11:00
hiker
d4856f6d64 Added missing #include for memcpy. 2015-11-09 21:38:18 +11:00
hiker
453ce8cf60 Added LAN server discovery. 2015-11-09 20:51:00 +11:00
hiker
9d9b83059d Fixed deadlock (when while handing a request another request was queued). 2015-11-07 00:19:16 +11:00
hiker
60f550e9d1 Fixed coding style, removed unnecessary #include in hpp file. 2015-11-06 16:50:58 +11:00
hiker
47a7bd1caf Print correct protocol name in 'has been terminated" message. 2015-11-06 16:32:18 +11:00
hiker
00843b8685 Fixed typos. 2015-11-06 16:30:34 +11:00
hiker
541509f29a Added new requestPause and requestUnpause commands for protocols,
minor code cleanups and improvements.
2015-11-06 16:11:12 +11:00
hiker
e14bc572b6 Fixed typo in comment (thanks to leyyin). 2015-11-05 23:35:37 +11:00
hiker
847a788a9c Removed server creation request (which is now down automatically
from STKHost).
2015-11-05 23:34:27 +11:00
hiker
bec317b9ed Added documentation to the table use and protocol between
game server/client and the stk server.
2015-11-05 08:03:06 +11:00
hiker
c99ad34cb0 Coding style changes. 2015-11-05 08:02:17 +11:00
hiker
73c59db858 Reverted to previous version of protocol (since it is not yet
supported by the server).
2015-11-05 08:01:37 +11:00
hiker
4fc46c510f Fixed too early release of objects, and some state changes in finite state machine. 2015-11-05 08:00:45 +11:00
hiker
b7b37b9ec9 Updated documentation. 2015-11-05 07:59:28 +11:00
hiker
35793d99c8 Create an STKHost client instance if a connection to client is
requested. The rest of the protocol is handled from STKHost.
2015-11-05 07:57:49 +11:00
hiker
f2aa1ddea6 Code cleanup. 2015-11-05 07:55:59 +11:00
hiker
bdf34edc00 Removed --client command line option (since this command needs a
server id to work).
2015-11-05 07:54:58 +11:00
hiker
dc80fb1c11 Updated docs. 2015-11-02 16:24:05 +11:00
hiker
eab07b31dd Hide RefreshRequest class. 2015-11-02 16:14:38 +11:00
hiker
6946306c4c Fixed memory leak (thanks to CruzR). 2015-11-02 10:55:17 +11:00
hiker
7c51be7724 Removed need for m_fake_refrehs, some coding style improvements. 2015-11-02 09:16:39 +11:00
hiker
c0817d29d3 Minor coding style update. 2015-11-02 09:16:09 +11:00
hiker
d7d2115abd Removed setupClient (which is now done in the constructor). 2015-11-02 09:14:35 +11:00
hiker
0b62d2f82b Created two different constructors for STKHost - one for server, one for client. 2015-11-02 08:11:51 +11:00
hiker
6add49b065 Allow WAN server creation from GUI. 2015-11-01 23:42:24 +11:00
hiker
f05ee47e2b Moved lan/wan setting to static functions in STKHost. 2015-11-01 22:16:57 +11:00
hiker
15e3ac021f Fix ending STK when no STKHost exists. 2015-11-01 21:28:39 +11:00
hiker
1334a467e3 Don't start a STKHost if neither client nor server is requested. 2015-11-01 19:45:28 +11:00
hiker
4aea491ed0 Merge remote-tracking branch 'origin/master' into refactor_networking 2015-10-31 11:41:43 +11:00
hiker
f2ae36fc65 Simplified ConnectToPeer (no more fsm). 2015-10-31 11:40:41 +11:00
hiker
8585afb713 Minor code cleanup. 2015-10-30 17:00:57 +11:00
hiker
94bc18df52 Removed ShowPublicAddress protocol, instead submit blocking
request in ConnectToServer.
2015-10-30 16:45:43 +11:00
hiker
dd289dc1cd Removed polling for GetPublicAddress with callback. 2015-10-29 18:58:18 +11:00
hiker
ef310a5666 Renamed types.hpp to transport_address.hpp. 2015-10-29 18:39:01 +11:00
hiker
83154ae3a7 Converted the CallbackObject to actually call a function. This
means that if protocol A starts protocol B and needs a result from B,
previously B would set a (potential private) variable in A. Now
B calls a callback in A, where the result can be set.
2015-10-29 18:27:55 +11:00
hiker
966d31dc45 Cosmetic changes, removed unused and unimplemented 'stop protocol' support. 2015-10-28 17:22:09 +11:00
hiker
cf9ce6674c Removed unused class. 2015-10-28 17:08:01 +11:00
hiker
5df6c225ef Cosmetic changes only. 2015-10-28 08:57:05 +11:00
hiker
e919b97037 Removed unnecessary getProtocolState functions. 2015-10-28 08:24:05 +11:00
hiker
2909e42a25 Minor code cleanup for ConnectToPeer handling. 2015-10-28 08:21:35 +11:00
hiker
7e202d94a8 Removed hardcoded maximum number of players. 2015-10-28 08:03:05 +11:00
hiker
60bbfe3ab3 Remved StartServer protocol, and used executeNow() in ServerLobby instead. 2015-10-28 08:01:46 +11:00
hiker
e212276dd2 Move enet initialisation into STKHost. 2015-10-27 16:58:40 +11:00
hiker
10f8f6b3a5 Removed unnecessary function, added some docs. 2015-10-27 16:46:26 +11:00
hiker
f7f12d5431 Renmated ServerConsole to NetworkConsole. 2015-10-27 16:38:22 +11:00
hiker
c511fc48af Added leak checking. 2015-10-27 08:44:28 +11:00
hiker
b47b8bd196 Removed empty file. 2015-10-27 08:25:52 +11:00
hiker
6297d8c65d Removed NetworkManager and ClientNetworkManager. 2015-10-27 08:23:59 +11:00
hiker
7d04cc78de Fixed printing of type name. 2015-10-27 00:26:14 +11:00
hiker
90b8db9993 Start to remove ClientNetworkManager. 2015-10-27 00:23:20 +11:00
hiker
a58f408a99 Merge branch 'refactor_networking' of https://github.com/supertuxkart/stk-code into refactor_networking 2015-10-26 21:31:11 +11:00
hiker
1e9afd473d Removed isClient/isServer from NetworkManager. 2015-10-26 21:30:41 +11:00
hiker
5564239773 Removed NetworkManager::run(). 2015-10-26 18:33:23 +11:00
hiker
b788aa6e95 Removed NetworkManager::isConnectedTO 2015-10-26 18:31:32 +11:00
hiker
d45d5a1051 Fixed type name debug print. 2015-10-26 18:29:28 +11:00
hiker
334780b5d7 Moved sendPacket from NetworkManager to STKHost. 2015-10-26 18:26:53 +11:00
hiker
51d39879b4 Moved NetworkManager::connect and STKPeer::connextTo functions into STKHost. 2015-10-26 18:01:07 +11:00
hiker
0bd2b48ea0 Removed sendPacket function and destructor. 2015-10-26 17:55:19 +11:00
hiker
cf51d2f0e0 Added missing object deletions. 2015-10-26 17:54:19 +11:00
hiker
4c0a195fdd Moved handling of peers from NetworkManager to STKHost. 2015-10-26 08:33:07 +11:00
hiker
c273e709eb Fixed linux compilation. 2015-10-26 08:25:43 +11:00
hiker
f610573295 Removed unnecessary function. 2015-10-25 20:28:35 +11:00
hiker
85cca69113 Moved GameSetup handling from NetworkManager to STKHost. 2015-10-25 00:19:30 +11:00
hiker
34f0d1b349 Moved public address data from NetworkManager to STKHost. 2015-10-24 23:30:34 +11:00
hiker
350f434c37 Started to refactor network code. 2015-10-24 12:39:17 +11:00
543 changed files with 83628 additions and 141350 deletions

View File

@@ -3,50 +3,51 @@
# Configuration manual:
# http://docs.travis-ci.com/user/build-configuration/
#
sudo: false
language: cpp
compiler:
- gcc
# - clang
#branches:
# only:
# - master
before_install:
# Update repos
- sudo apt-get update -qq
# Install dependencies
- sudo apt-get install build-essential libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev
# Install mesa from an other repo (a newer version is required). Quantal is not supported anymore, saucy is only supported till July 2014,
# so we try to use trusty (precise which is what traiv uses a too old mesa version which doesn't link)
- sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted"
- sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32
- sudo apt-get update -qq
- sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev libglew-dev cmake
- clang
matrix:
fast_finish: true
env:
matrix:
- BUILD_TYPE="Debug"
- BUILD_TYPE="Release"
addons:
apt:
packages:
- build-essential
- libogg-dev
- libvorbis-dev
- libopenal-dev
- libxxf86vm-dev
- libcurl4-openssl-dev
- libfribidi-dev
- libbluetooth-dev
- libgl1-mesa-dev
- libglu1-mesa-dev
- libglew-dev
- cmake
before_script:
- export THREADS=`nproc`
# Unfortunately using all threads crashes g++: "g++: internal compiler error: Killed (program cc1plus)"
- export THREADS=4
- export THREADS=$((`nproc` + 1))
- echo "THREADS = $THREADS"
- free -mt
script:
# First a debug build:
- mkdir build-debug
- cd build-debug
- cmake .. -DCMAKE_BUILD_TYPE=Debug -DCHECK_ASSETS=off
- make VERBOSE=1 -j $THREADS
# Then a release build:
- cd ..
- mkdir build-release
- cd build-release
- cmake .. -DCMAKE_BUILD_TYPE=Release -DCHECK_ASSETS=off
- mkdir "build"
- cd "build"
- cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCHECK_ASSETS=off
- make VERBOSE=1 -j $THREADS
notifications:
irc:
channels:
- "irc.freenode.org#stk"
- "irc.freenode.org#supertuxkart"
skip_join: false
use_notice: true
template:

View File

@@ -1,4 +1,19 @@
## SupertTuxKart 0.9.1
## SuperTuxKart 0.9.2
* Ghost replay races by Benau
* Battle mode AI by Benau
* Soccer mode AI by Benau
* New icy soccer field by samuncle and Benau
* New subsea track by samuncle
* New volcano track by Ponzino
* TTF font rendering by Benau
* Kart properties refactor by Flakebi
* Scripting work under the hood
* Work on the track editor by mhp
* Tweak to challenges
* New farm track song by 0zone0ne and Krobonil
* Bugfixes
## SuperTuxKart 0.9.1
* Many bug fixes
* Started to use scripting in tracks
* Significant audio performance improvements

View File

@@ -1,6 +1,6 @@
# root CMakeLists for the SuperTuxKart project
project(SuperTuxKart)
set(PROJECT_VERSION "0.9.1")
set(PROJECT_VERSION "0.9.2")
cmake_minimum_required(VERSION 2.8.4)
if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))
@@ -68,6 +68,7 @@ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
# Build glew library
add_definitions(-DGLEW_NO_GLU)
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
@@ -117,8 +118,8 @@ endif()
include_directories(${STK_SOURCE_DIR})
if(APPLE)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch i386")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch i386 -F/Library/Frameworks")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch x86_64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -F/Library/Frameworks")
elseif(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") # Enable multi-processor compilation (faster)
endif()
@@ -215,7 +216,7 @@ endif()
# Set some compiler options
if(UNIX OR MINGW)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-function")
endif()
if(MINGW AND CMAKE_BUILD_TYPE MATCHES Release)
@@ -258,7 +259,7 @@ endif()
add_definitions(-DHAVE_OGGVORBIS)
if(WIN32)
configure_file("${STK_SOURCE_DIR}/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc")
configure_file("${STK_SOURCE_DIR}/../tools/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc")
endif()
# Provides list of source and header files (STK_SOURCES and STK_HEADERS)
@@ -365,12 +366,17 @@ if(UNIX AND NOT APPLE)
endif()
endif()
# FreeBSD does not search in /usr/local/lib, but at least Freetype is installed there :(
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib")
endif()
if(APPLE)
# In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has
# unix-style installs of Vorbis/Ogg/OpenAL/etc. they will be picked up over our frameworks. This is blocking when I make releases :
# the mac I use to make STK releases does have other installs of vorbis/ogg/etc. which aren't compatible with STK, so letting
# CMake pick the library it wants essentially means I can't build.
set_target_properties(supertuxkart PROPERTIES LINK_FLAGS "-arch i386 -F/Library/Frameworks -framework OpenAL -framework Ogg -framework Vorbis")
set_target_properties(supertuxkart PROPERTIES LINK_FLAGS "-arch x86_64 -F/Library/Frameworks -framework OpenAL -framework Ogg -framework Vorbis")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/Library/Frameworks/OpenAL.framework/Versions/A/Headers")
endif()

View File

@@ -1,6 +1,7 @@
# SuperTuxKart Installation Instructions
Note: If you obtained this source code from Github, you also need to download the game assets from Sourceforge using SVN.
Note: If you obtained this source code from Github, you also need to download
the game assets from Sourceforge using SVN.
`svn checkout https://svn.code.sf.net/p/supertuxkart/code/stk-assets stk-assets`
@@ -16,6 +17,7 @@ First, make sure that you have the following packages installed:
* OpenAL (recommended: openal-soft-devel)
* Ogg (libogg-dev)
* Vorbis (libvorbis-dev)
* Freetype (libfreetype6-dev)
* libcurl (libcurl-devel)
* libbluetooth (bluez-devel)
* libpng (libpng-devel)
@@ -25,8 +27,10 @@ First, make sure that you have the following packages installed:
Ubuntu command:
```
sudo apt-get install autoconf automake build-essential cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev \
libgl1-mesa-dev libglu1-mesa-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev libxrandr-dev
sudo apt-get install build-essential cmake libbluetooth-dev \
libcurl4-gnutls-dev libfreetype6-dev libfribidi-dev libgl1-mesa-dev \
libjpeg-dev libogg-dev libopenal-dev libpng-dev libvorbis-dev libxrandr-dev \
mesa-common-dev pkg-config zlib1g-dev
```
Unpack the files from the tarball like this:

View File

@@ -41,8 +41,6 @@ this has been done (check with the forum for details).
### Mac OS X
The latest information about compilation on Mac are on our wiki:
<http://supertuxkart.sourceforge.net/Building_and_packaging_on_OSX>
The Xcode project file is in `/src/ide/Xcode/`, but it still
requires that all dependencies are installed as explained on the wiki.
### UNIX
See [`INSTALL.md`](INSTALL.md) for details.

Binary file not shown.

View File

@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.8.1</string>
<string>0.9.2-rc1</string>
<key>CFBundleSignature</key>
<string>SPTK</string>
<key>CFBundleVersion</key>
<string>0.8.1</string>
<string>0.9.2-rc1</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSMinimumSystemVersion</key>

View File

@@ -1,19 +1,19 @@
<?xml version="1.0"?>
<challenge version="2">
<track id="subsea" laps="2"/>
<track id="abyss" laps="3"/>
<mode major="single" minor="quickrace"/>
<requirements trophies="0"/>
<hard>
<karts number="5"/>
<requirements position="1" time="205"/>
<requirements position="1" time="160"/>
</hard>
<medium>
<karts number="4"/>
<requirements time="225"/>
<requirements time="185"/>
</medium>
<easy>
<karts number="4"/>
<requirements time="290"/>
<requirements time="270"/>
</easy>
</challenge>

View File

@@ -2,7 +2,7 @@
<challenge version="2">
<track id="cocoa_temple" laps="3"/>
<mode major="single" minor="quickrace"/>
<requirements trophies="15"/>
<requirements trophies="5"/>
<hard>
<karts number="5"/>

View File

@@ -0,0 +1,19 @@
<?xml version="1.0"?>
<challenge version="2">
<track id="volcano_island" laps="2"/>
<mode major="single" minor="quickrace"/>
<requirements trophies="15"/>
<hard>
<karts number="5"/>
<requirements position="1"/>
</hard>
<medium>
<karts number="4"/>
<requirements position="1"/>
</medium>
<easy>
<karts number="4"/>
<requirements position="1"/>
</easy>
</challenge>

View File

@@ -4,7 +4,7 @@
<track id="sandtrack" laps="3" reverse="false" />
<track id="farm" laps="3" reverse="false" />
<track id="olivermath" laps="4" reverse="false" />
<track id="subsea" laps="2" reverse="false" />
<track id="abyss" laps="3" reverse="false" />
<track id="scotland" laps="3" reverse="false" />
</supertuxkart_grand_prix>

View File

@@ -5,7 +5,7 @@
<track id="greenvalley" laps="2" reverse="false" />
<track id="mansion" laps="3" reverse="false" />
<track id="stk_enterprise" laps="3" reverse="false" />
<track id="city" laps="2" reverse="false" />
<track id="volcano_island" laps="2" reverse="false" />
</supertuxkart_grand_prix>

View File

@@ -4,20 +4,24 @@
<card is="Intel(R) HD Graphics 3000" os="windows" disable="AdvancedPipeline"/>
<card is="Intel(R) HD Graphics 3000" os="windows" disable="FramebufferSRGBWorking"/>
<card contains="Intel" os="osx" disable="GI"/>
<card contains="Intel" os="linux" version="<12.0" disable="FramebufferSRGBCapable"/>
<card contains="Intel" disable="TextureCompressionS3TC"/>
<card contains="Intel" os="linux" version="<11.2" disable="ComputeShader"/>
<card contains="Intel" os="linux" version="<11.2" disable="GeometryShader"/>
<card contains="Intel" os="linux" version="<16.0" disable="FramebufferSRGBCapable"/>
<card contains="Intel" os="linux" version="<11.2" disable="TextureCompressionS3TC"/>
<card contains="Intel" os="windows" disable="TextureCompressionS3TC"/>
<card contains="Intel" os="osx" disable="TextureCompressionS3TC"/>
<card contains="Intel" os="windows" disable="HighDefinitionTextures"/>
<card contains="NVIDIA" os="windows" version="<344.65" disable="BufferStorage"/>
<card contains="NVIDIA" os="linux" version="<343.22" disable="BufferStorage"/>
<card contains="NVIDIA" disable="ShaderAtomicCounters"/>
<card contains="Mesa" os="linux" version="<10.3" disable="BufferStorage"/>
<card contains="Mesa" os="linux" version="<10.3" disable="DriverRecentEnough"/>
<card contains="Mesa" os="linux" version="<10.6" disable="GeometryShader4"/>
<card contains="Mesa" os="linux" disable="TextureCompressionS3TC"/>
<card contains="Mesa" os="linux" version="<11.2" disable="GeometryShader"/>
<card contains="Mesa" os="linux" version="<11.2" disable="TextureCompressionS3TC"/>
<card contains="Gallium" os="linux" version="<10.3" disable="BufferStorage"/>
<card contains="Gallium" os="linux" version="<10.3" disable="DriverRecentEnough"/>
<card contains="Gallium" os="linux" version="<10.6" disable="GeometryShader4"/>
<card contains="Gallium" os="linux" disable="TextureCompressionS3TC"/>
<card contains="Gallium" os="linux" version="<11.2" disable="GeometryShader"/>
<card contains="Gallium" os="linux" version="<11.2" disable="TextureCompressionS3TC"/>
<!-- On osx radeon appears to have different version numbers, e.g.
1.32.20 -->
<card contains="Radeon" os="linux" version="<14.300" disable="DriverRecentEnough"/>

View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<div x="5%" y="5%" width="90%" height="90%" layout="vertical-row">
<div x="5%" y="0%" width="90%" proportion="6" layout="horizontal-row">
<div width="40%" height="100%" layout="vertical-row">
<icon id="icon" align="center" width="100%" icon="gui/loading.png" />
</div>
<div width="60%" height="50%" layout="vertical-row">
<label id="name" width="100%" text_align="left"/>
</div>
</div>
<div width="90%" align="center" layout="vertical-row" height="fit">
<div width="100%" height="fit" layout="horizontal-row" >
<checkbox width="fit" id="record-race" I18N="Ghost replay info action" text_align="left"/>
<spacer width="10"/>
<label proportion="1" id="record-race-text" height="100%" text_align="left" I18N="Ghost replay info action" text="Record the race for ghost replay"/>
</div>
<div width="100%" height="fit" layout="horizontal-row" >
<checkbox width="fit" id="watch-only" I18N="Ghost replay info action" text_align="left"/>
<spacer width="10"/>
<label proportion="1" id="watch-only-text" height="100%" text_align="left" I18N="Ghost replay info action" text="Watch replay only"/>
</div>
</div>
<div width="80%" proportion="5" align="center">
<buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
<icon-button id="start" width="128" height="128"
icon="gui/green_check.png"
I18N="Ghost replay info screen action" text="Start Race" />
<icon-button id="remove" width="128" height="128"
icon="gui/remove.png"
I18N="Ghost replay info action" text="Remove" />
<icon-button id="back" width="128" height="128"
icon="gui/back.png"
I18N="Ghost replay info action" text="Back" />
</buttonbar>
</div>
</div>
</stkgui>

View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<div x="0%" y="1%" width="100%" height="98%" layout="vertical-row" >
<div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
<icon-button id="back" height="100%" icon="gui/back.png"/>
<header text_align="center" proportion="1" I18N="In the ghost replay selection screen" text="Ghost Replay Selection" align="center"/>
<icon-button id="reload" height="90%" icon="gui/restart.png"/>
</div>
<box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
<list id="replay_list" x="0" y="0" width="100%" height="100%"/>
</box>
<div width="99%" align="center" layout="vertical-row" height="fit">
<div width="100%" height="fit" layout="horizontal-row" >
<checkbox width="fit" id="replay_difficulty_toggle" text_align="left"/>
<spacer width="10"/>
<label proportion="1" height="100%" text_align="left" I18N="In the ghost replay selection screen" text="Only show replays matching the current difficulty"/>
</div>
</div>
<spacer width="100%" height="1%" />
<button x="1%" id="record-ghost" I18N="In the ghost replay selection screen" text="Record ghost replay"/>
</div>
</stkgui>

View File

@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<div x="2%" y="2%" width="96%" height="96%" layout="horizontal-row">
<button id="continue" width="250" align="bottom" text="Continue"/>
<spacer width="20"/>
<button id="save" width="250" align="bottom" text="Save Grand Prix"/>
<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
<spacer proportion="1"/>
<button id="save" width="450" align="center" text="Save Grand Prix"/>
<spacer height="20"/>
<button id="continue" width="450" align="center" text="Continue"/>
</div>
</stkgui>

View File

@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<div x="2%" y="2%" width="96%" height="96%" layout="horizontal-row">
<button id="continue" width="250" align="bottom" text="Continue"/>
<spacer width="20"/>
<button id="save" width="250" align="bottom" text="Save Grand Prix"/>
<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
<spacer proportion="1"/>
<button id="save" width="450" align="center" text="Save Grand Prix"/>
<spacer height="20"/>
<button id="continue" width="450" align="center" text="Continue"/>
</div>
</stkgui>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
data/gui/mode_ghost.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -17,6 +17,42 @@
<label proportion="1" text_align="left" I18N="In the server creation screen" text="Max. number of players"/>
<gauge id="max_players" proportion="1" min_value="2" max_value="12"/>
</div>
<spacer height="20" width="20"/>
<div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the server creation screen" text="Password (optional)"/>
<textbox proportion="1" id="password" I18N="In the server creation screen"/>
</div>
<spacer height="20" width="20"/>
<label width="100%" height="fit" text_align="left" I18N="In the server creation screen" text="Difficulty"/>
<!--<gauge id="difficulty" proportion="1" min_value="1" max_value="4"/>-->
<ribbon id="difficulty" height="135" width="90%" align="center">
<icon-button id="novice" width="128" height="128" icon="gui/difficulty_easy.png"
I18N="Difficulty" text="Novice"/>
<icon-button id="intermediate" width="128" height="128" icon="gui/difficulty_medium.png"
I18N="Difficulty" text="Intermediate"/>
<icon-button id="expert" width="128" height="128" icon="gui/difficulty_hard.png"
I18N="Difficulty" text="Expert"/>
<icon-button id="best" width="128" height="128" icon="gui/difficulty_best.png"
I18N="Difficulty" text="SuperTux"/>
</ribbon>
<spacer height="20" width="20"/>
<label width="100%" height="fit" text_align="left" I18N="In the server creation screen" text="Game mode"/>
<ribbon id="gamemode" height="135" width="50%" align="center">
<icon-button id="normal" width="128" height="128" icon="gui/mode_normal.png"
I18N="Multiplayer game mode" text="Normal Race"/>
<icon-button id="timetrial" width="128" height="128" icon="gui/mode_tt.png"
I18N="Multiplayer game mode" text="Time Trial"/>
</ribbon>
<!--
<scrollable_toolbar id="gamemode" height="135" width="90%" label_location="bottom" align="center"
child_width="135" child_height="135" />
-->
</div>
<label id="info" proportion="1" width="100%" align="center" text_align="center" word_wrap="true" text=""/>

View File

@@ -10,6 +10,14 @@
<label proportion="1" text_align="left" I18N="In the networking lobby" text="Server name:"/>
<label proportion="2" text_align="left" id="server_name" text=""/>
</div>
<div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the networking lobby" text="Difficulty:"/>
<label proportion="2" text_align="left" id="server_difficulty" text=""/>
</div>
<div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the networking lobby" text="Game mode:"/>
<label proportion="2" text_align="left" id="server_game_mode" text=""/>
</div>
</box>
<spacer width="20" height="20"/>
<box proportion="1" height="100%" layout="vertical-row">
@@ -25,7 +33,11 @@
</box>
<spacer width="20" height="20"/>
<box id="actions" proportion="1" height="100%" layout="vertical-row">
<label I18N="In networking lobby" word_wrap="true" text="actions" align="center" text-align="center"/>
<!-- <label I18N="In networking lobby" word_wrap="true" text="actions" align="center" text-align="center"/>
-->
<icon-button id="start" width="64" height="64" icon="gui/green_check.png" align="center"
I18N="In the network lobby" text="Start Race"/>
</box>
</div>
</div>

View File

@@ -1,63 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<div x="0" y="0" width="100%" height="fit" layout="vertical-row">
<button id="user-id" width="20%" height="fit" align="right"/>
</div>
<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
<header text_align="center" width="80%" align="center" I18N="In the online multiplayer screen" text="Online Multiplayer"/>
<spacer height="5%" width="25"/>
<box width="100%" height="38%" padding="10" layout="vertical-row">
<bright width="100%" text="Local Networking" align="center" text_align="left" />
<buttonbar id="lan" proportion="2" width="90%" align="center">
<icon-button id="find_lan_server" width="128" height="128"
icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
I18N="In the online multiplayer screen" text="Find Server"/>
<icon-button id="create_lan_server" width="128" height="128"
icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
I18N="In the online multiplayer screen" text="Create Server"/>
<icon-button id="manage_user" width="128" height="128"
icon="gui/options_players.png"
I18N="In the online multiplayer screen" text="Users"/>
</buttonbar>
</box>
<spacer height="5%" width="25"/>
<box width="100%" height="38%" padding="10" layout="vertical-row">
<bright width="100%" text="Global Networking" align="center" text_align="left" />
<buttonbar id="menu_top_row" proportion="2" width="90%" align="center">
<icon-button id="find_wan_server" width="128" height="128"
icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
I18N="In the online multiplayer screen" text="Find Server"/>
<icon-button id="create_wan_server" width="128" height="128"
icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
I18N="In the online multiplayer screen" text="Create Server"/>
<icon-button id="quick_wan_play" width="128" height="128"
icon="gui/online/menu_quick_play.png" focus_icon="gui/online/menu_quick_play_hover.png"
I18N="In the online multiplayer screen" text="Quick Play"/>
</buttonbar>
</box>
<bottombar x="2%" width="96%" height="10%" layout="horizontal-row">
<label text_align="left" align="center" height="100%" id="online_status" proportion="1" text=""/>
<spacer width="10" height="10" />
<buttonbar id="menu_bottomrow" x="0" y="0" width="12%" height="100%" align="center">
<icon-button id="profile" width="64" height="64" icon="gui/green_check.png" extend_label="50"
I18N="In the online multiplayer screen" text="Profile" label_location="hover"/>
<icon-button id="sign_out" width="64" height="64" icon="gui/main_quit.png" extend_label="70"
I18N="In the online multiplayer screen" text="Log Out" label_location="hover"/>
</buttonbar>
</bottombar>
</div>
<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
</stkgui>

View File

@@ -9,6 +9,9 @@
<spacer height="25" width="10"/>
<tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
<!--
<icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png"/>
-->
<icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"
I18N="Section in the profile screen" text="Achievements"/>
<icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png"/>

View File

@@ -9,6 +9,7 @@
<spacer height="25" width="10"/>
<tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
<!--<icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png"/>-->
<icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
<icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png"
I18N="Section in the profile screen" text="Friends"/>

View File

@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
<div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
<header id="title" text_align="center" width="80%" align="center" text="..."/>
<spacer height="25" width="10"/>
<tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
<icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png" I18N="Section in the profile screen" text="Servers"/>
<icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
<icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
<icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png" />
</tabs>
<box proportion="1" width="100%" layout="vertical-row">
<div x="1%" y="2%" width="98%" height="96%" layout="vertical-row" >
<spacer height="5%" width="25"/>
<box width="100%" proportion="1" padding="10" layout="vertical-row">
<bright width="100%" text="Local Networking" align="center" text_align="left" />
<buttonbar id="lan" proportion="2" width="90%" align="center">
<icon-button id="find_lan_server" width="128" height="128"
icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
I18N="In the online multiplayer screen" text="Find Server"/>
<icon-button id="create_lan_server" width="128" height="128"
icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
I18N="In the online multiplayer screen" text="Create Server"/>
<!--
<icon-button id="manage_user" width="128" height="128"
icon="gui/options_players.png"
I18N="In the online multiplayer screen" text="Users"/>
-->
</buttonbar>
</box>
<spacer height="5%" width="25"/>
<box width="100%" proportion="1" padding="10" layout="vertical-row">
<bright width="100%" text="Global Networking" align="center" text_align="left" />
<buttonbar id="wan" proportion="2" width="90%" align="center">
<icon-button id="find_wan_server" width="128" height="128"
icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
I18N="In the online multiplayer screen" text="Find Server"/>
<icon-button id="create_wan_server" width="128" height="128"
icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
I18N="In the online multiplayer screen" text="Create Server"/>
<icon-button id="quick_wan_play" width="128" height="128"
icon="gui/online/menu_quick_play.png" focus_icon="gui/online/menu_quick_play_hover.png"
I18N="In the online multiplayer screen" text="Quick Play"/>
</buttonbar>
</box>
</div>
</box>
</div>
</stkgui>

View File

@@ -8,6 +8,7 @@
<spacer height="25" width="10"/>
<tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
<!--<icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png"/>-->
<icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
<icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
<icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"

View File

@@ -8,10 +8,24 @@
<spacer height="20" width="50"/>
<div width="80%" align="center" layout="vertical-row" height="fit" >
<!--
<div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the server info dialog" text="Name"/>
<label id="name" proportion="2" text_align="left" text=""/>
</div>
-->
<div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the networking lobby" text="Server name:"/>
<label proportion="2" text_align="left" id="server_name" text=""/>
</div>
<div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the networking lobby" text="Difficulty:"/>
<label proportion="2" text_align="left" id="server_difficulty" text=""/>
</div>
<div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the networking lobby" text="Game mode:"/>
<label proportion="2" text_align="left" id="server_game_mode" text=""/>
</div>
</div>
<spacer height="20" width="50"/>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
<header id="title" width="96%" height="fit" text_align="center" I18N="Networking screen" text="Waiting for the others..."/>
<spacer height="40" width="50"/>
<label proportion="1" width="100%" text_align="left" id="lblDetails"/>
</div>
</stkgui>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -6,38 +6,39 @@
<header width="80%" text="Race Setup" align="center" text_align="center" />
<spacer height="25" width="25"/>
<spacer height="10" width="25"/>
<div layout="horizontal-row" width="fit" height="35" align="left">
<bright proportion="1" height="100%"
I18N="In soccer setup screen" text="Number of goals to win" text_align="left" />
<spacer width="50" height="25"/>
<spacer width="10" height="25"/>
<spinner id="goalamount" width="200" height="90%" min_value="1" max_value="10"/>
</div>
<div layout="horizontal-row" width="fit" height="35" align="left">
<bright proportion="1" height="100%"
I18N="In soccer setup screen" text="Maximum time (min.)" text_align="left" />
<spacer width="50" height ="25"/>
<spacer width="10" height ="25"/>
<spinner id="timeamount" width="200" height="90%" min_value="1" max_value="15"/>
</div>
<div layout="horizontal-row" width="fit" height="35" align="left">
<bright proportion="1" height="100%"
I18N="In soccer setup screen" text="Game type (Goals limit / Time limit)" text_align="left" />
<spacer width="50" height="25"/>
<spacer width="10" height="25"/>
<checkbox id="time_enabled"/>
</div>
<spacer height="40" width="25"/>
<spacer height="10" width="25"/>
<bright height="15" width="25" I18N="In soccer setup screen" text="Use left/right to choose your team and press fire" text_align="center" align="center" />
<bubble height="fit" width="100%" id="lblLeftRight" I18N="In soccer setup screen" text="Use left/right to choose your team and press fire" word_wrap="true" text_align="center"/>
<div id="central_div" layout="horizontal-row" width="100%" proportion="1" align="center">
<roundedbox y="5%" width="100%" layout="horizontal-row" height="100%">
<roundedbox y="5%" width="100%" layout="horizontal-row" height="95%">
<!-- Content is added programmatically -->
</roundedbox>
<header id="vs" text="VS"/> <!-- Layout is done programmatically -->
<icon id="red_team" I18N="In soccer setup screen" text="Red Team" icon="gui/soccer_ball_red.png" width="font" height="font"/> <!-- Layout is done programmatically -->
<icon id="blue_team" I18N="In soccer setup screen" text="Blue Team" icon="gui/soccer_ball_blue.png" width="font" height="font"/>
</div>
<button id="continue" I18N="In soccer setup screen" text="Continue" align="center" width="60%"/>

View File

@@ -3,9 +3,9 @@
<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
<header id="name" height="5%" width="80%" align="center" text_align="center"/>
<header id="name" height="7%" width="80%" align="center" text_align="center"/>
<spacer width="1" height="5%"/>
<spacer width="1" height="1%"/>
<box width="100%" height="40%" padding="10" layout="horizontal-row">
<!-- Left pane -->
@@ -40,14 +40,17 @@
<label id="highscore3" proportion="1" text="(Empty)"/>
</div>
<spacer width="1" height="10%"/>
<spacer width="1" height="2%"/>
<label id="author" width="100%" text_align="center" word_wrap="true"/>
<spacer width="1" height="10%"/>
<label id="max-arena-players" width="100%" text_align="center" word_wrap="true"/>
</div>
</box>
<spacer width="1" height="5%"/>
<box width="100%" height="25%" padding="15" layout="vertical-row">
<spacer width="1" height="1%"/>
<box width="100%" height="33%" padding="15" layout="vertical-row">
<div width="100%" height="fit" layout="horizontal-row" >
<label id="lap-text" proportion="1" I18N="In the track info screen" text="Number of laps" text_align="right"/>
<spacer width="40"/>
@@ -67,17 +70,26 @@
</div>
<spacer height="10"/>
<div width="100%" height="fit" layout="horizontal-row" >
<label id="reverse-text" proportion="1" I18N="In the track info screen" text="Drive in reverse" text_align="right"/>
<label id="option-text" proportion="1" I18N="In the track info screen" text_align="right"/>
<spacer width="40"/>
<div proportion="1" height="fit" layout="horizontal-row">
<div width="50%" height="fit" text-align="center" layout="vertical-row" >
<checkbox id="reverse" align="center"/>
<checkbox id="option" align="center"/>
</div>
</div>
</div>
<spacer width="1" height="2%"/>
<div width="100%" height="fit" layout="horizontal-row" >
<label id="record-race-text" proportion="1" I18N="In the track info screen" text="Record the race for ghost replay" text_align="right"/>
<spacer width="40"/>
<div proportion="1" height="fit" layout="horizontal-row">
<div width="50%" height="fit" text-align="center" layout="vertical-row" >
<checkbox id="record" align="center"/>
</div>
</div>
</div>
<spacer width="1" height="1%"/>
</box>
<spacer width="1" height="5%"/>
<spacer width="1" height="1%"/>
<buttonbar id="buttons" height="15%" width="100%" align="center">
<icon-button id="start" width="64" height="64" icon="gui/green_check.png"
I18N="In the track info screen" text="Start Race"/>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View File

@@ -3,16 +3,7 @@
<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
<div x="1%" y="1%" width="98%" height="96%" layout="vertical-row" >
<header width="80%" I18N="In the track selection screen" text="Grand Prix"
align="center" text_align="center" />
<box width="100%" height="195" padding="0">
<scrollable_toolbar id="gps" height="175" y="10" x="10" width="98%" align="center" label_location="each"
square_items="true" child_width="175" child_height="120" />
</box>
<header width="100%" I18N="In the track selection screen" text="All Tracks"
<header width="80%" I18N="In the track selection screen" text="All Tracks"
align="center" text_align="center" />
<box proportion="1" width="100%" layout="vertical-row" padding="1">

View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
<div x="1%" y="1%" width="98%" height="96%" layout="vertical-row" >
<header width="80%" I18N="In the track and grand prix selection screen" text="Grand Prix"
align="center" text_align="center" />
<box width="100%" height="195" padding="0">
<scrollable_toolbar id="gps" height="175" y="10" x="10" width="98%" align="center" label_location="each"
square_items="true" child_width="175" child_height="120" />
</box>
<header width="100%" I18N="In the track and grand prix selection screen" text="All Tracks"
align="center" text_align="center" />
<box proportion="1" width="100%" layout="vertical-row" padding="1">
<ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
label_location="bottom" align="center" max_rows="4"
child_width="160" child_height="120" />
<spacer width="20" height="13" />
</box>
<!-- Populated dynamically at runtime -->
<tabs width="100%" height="25" id="trackgroups"> </tabs>
<spacer width="100%" height="2%" />
</div>
</stkgui>

View File

@@ -13,7 +13,7 @@
square_items="true" child_width="128" child_height="128" />
<spacer height="15" width="10"/>
<div width="90%" align="center" layout="vertical-row" height="fit">
<div width="90%" align="center" layout="vertical-row" proportion="1">
<div width="100%" height="fit" layout="horizontal-row" >
<checkbox width="fit" id="online" I18N="In the user screen" text_align="left"/>
<spacer width="10"/>
@@ -44,23 +44,29 @@
I18N="In the user screen" text="Password"/>
<textbox id="password" proportion="2" height="fit" I18N="In the user screen"/>
</div>
<spacer height="20" width="20"/>
<label id="message" width="100%" text_align="center"/>
</div>
<div width="80%" align="center" layout="vertical-row" height="fit">
<label id="message" width="80%" align="center" text_align="left"/>
</div>
<spacer width="20" height="25"/>
<buttonbar id="options" width="90%" height="13%" align="bottom">
<icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
I18N="In the user screen" text="OK" label_location="bottom"/>
<icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"
I18N="In the user screen" text="Add user" label_location="bottom"/>
<icon-button id="delete" width="64" height="64" icon="gui/remove.png"
I18N="In the user screen" text="Delete" label_location="bottom"/>
<icon-button id="rename" width="64" height="64" icon="gui/rename.png"
I18N="In the user screen" text="Rename" label_location="bottom"/>
<icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
I18N="In the user screen" text="Cancel" label_location="bottom"/>
</buttonbar>
<spacer width="20" proportion="1"/>
<div width="90%" align="center" layout="vertical-row" height="fit">
<buttonbar id="options" width="100%" height="80" align="center">
<icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
I18N="In the user screen" text="OK" label_location="bottom"/>
<icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"
I18N="In the user screen" text="Add user" label_location="bottom"/>
<icon-button id="delete" width="64" height="64" icon="gui/remove.png"
I18N="In the user screen" text="Delete" label_location="bottom"/>
<icon-button id="rename" width="64" height="64" icon="gui/rename.png"
I18N="In the user screen" text="Rename" label_location="bottom"/>
<icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
I18N="In the user screen" text="Cancel" label_location="bottom"/>
</buttonbar>
</div>
<spacer width="20" height="25"/>
</box>
<spacer width="20" height="15"/>
</div>

View File

@@ -187,7 +187,7 @@
max: maximum leaning (i.e. when steering as much as possible at highest
speed), in degrees.
speed: Speed with which the leaning changes (in degree/second). -->
<lean max="8.6" speed="5.0" />
<lean max="6.6" speed="15.0" />
<!-- ********** Items ********** -->

231
data/localized_name.txt Normal file
View File

@@ -0,0 +1,231 @@
aa=ʿAfár af
af=Afrikaans
af_ZA=0
am=ኣማርኛ
ar=العربية
ar_AR=0
ar_OM=0
ar_SA=0
ar_SY=0
ar_TN=0
as=অসমীয়া
ast=Asturianu
ay=aymar aru
az=Azərbaycanca
az_IR=0
be=Беларуская мова
bg=български
bg_BG=0
bn=বাংলা
bn_BD=0
bn_IN=0
bo=བོད་སྐད་
br=brezhoneg
bs=Bosanski
bs_BA=0
bs_BS=0
ca_ES=0
ca=0
cmn=0
co=corsu
cs=Čeština
cs_CZ=Čeština (Česká Republika)
cy=Welsh
cy_GB=Welsh (Great Britain)
cz=Unknown language
da=Dansk
da_DK=Dansk (Danmark)
de=Deutsch
de_AT=Deutsch (Österreich)
de_CH=Deutsch (Schweiz)
de_DE=Deutsch (Deutschland)
dk=Unknown language
dz=རྫོང་ཁ
el=ελληνικά
el_GR=0
en=English
en_AU=English (Australia)
en_CA=English (Canada)
en_GB=English (Great Britain)
en_US=English (United States)
en_ZA=English (South Africa)
en_US=English
eo=Esperanto
es=Español
es_AR=0
es_CL=0
es_CO=0
es_CR=0
es_DO=0
es_EC=0
es_ES=0
es_GT=0
es_HN=0
es_LA=0
es_MX=0
es_NI=0
es_PA=0
es_PE=0
es_PR=0
es_SV=0
es_UY=0
es_VE=0
et=eesti keel
et_EE=0
et_ET=0
eu=euskara
eu_ES=0
fa=فارسى
fa_AF=0
fa_IR=0
fi=suomi
fi_FI=0
fo=Føroyskt
fo_FO=0
fr=Français
fr_CA=Français (Canada)
fr_CH=Français (Suisse)
fr_FR=Français (France)
fr_LU=Français (Luxembourg)
fy=Frysk
ga=Gaeilge
gd=Gàidhlig
gl=Galego
gl_ES=0
gn=Avañe'ẽ
gu=ગુજરાતી
gv=Gaelg
ha=حَوْسَ
he=עברית
he_IL=0
hi=हिन्दी
hr=Hrvatski
hr_HR=0
hu=magyar
hu_HU=0
hy=Հայերեն
ia=Interlingua
id=Bahasa Indonesia
id_ID=0
is=Íslenska
is_IS=0
it=Italiano
it_CH=0
it_IT=0
iu=ᐃᓄᒃᑎᑐᑦ/inuktitut
ja=日本語
ja_JP=0
ka=ქართული
kk=Қазақша
kl=Kalaallisut
km=ភាសាខ្មែរ
km_KH=0
kn=ಕನ್ನಡ
ko=한국어
ko_KR=0
ku=Kurdî
kw=Kernowek
ky=кыргызча
la=Latina
lo=ລາວ
lt=Lietuvių
lt=0
lv=Latviešu
lv_LV=0
jbo=La .lojban.
mg=Malagasy
mi=Māori
mk=Македонски
mk_MK=0
ml=മലയാളം
mn=Монгол
mr=मराठी
ms=Bahasa Melayu
ms_MY=0
mt=Malti
my=မြန်မာဘာသာ
my_MM=0
nb=0
nb_NO=0
ne=0
nl=Nederlands
nl_BE=0
nl_NL=0
nn=Norsk nynorsk
nn_NO=0
no=Norsk bokmål
no_NO=0
no_NY=0
nr=0
oc=Occitan
om=Oromoo
or=ଓଡ଼ିଆ
os=0
pa=ਪੰਜਾਬੀ
pl=Polski
pl_PL=0
ps=پښتو
pt=Português
pt_BR=0
pt_PT=0
qu=Runa Simi
rm=Rumantsch
ro=Română
ro_RO=0
ru=Русский
ru_RU=0
rw=Kinyarwanda
sa=0
sd=0
se=Sámegiella
se_NO=0
si=0
sk=Slovenčina
sk_SK=0
sl=Slovenščina
sl_SI=0
sl_SL=0
sm=0
so=0
sp=0
sq=Shqip
sq_AL=0
sr=Српски
sr_YU=0
ss=0
st=0
sv=Svenska
sv_SE=0
sv_SV=0
sw=0
ta=தமிழ்
te=0
tg=0
th=ไทย
th_TH=0
ti=0
tk=0
tl=0
to=0
tr=Türkçe
tr_TR=0
ts=0
tt=Татарча
ug=0
uk=Українська
uk_UA=0
ur=اردو
ur_PK=0
uz=0
vi=Tiếng Việt
vi_VN=0
wa=0
wo=0
xh=0
yi=ייִדיש
yo=0
zh=中文
zh_CN=中文(简体)
zh_HK=中文(香港)
zh_TW=中文(繁體)
zu=0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More