Commit Graph

509 Commits

Author SHA1 Message Date
hiker
f0c5f43fe2 Removed setNumLocalPlayers (which is now part of setNumPlauers)<
fixed coding style in race manager.
2016-01-11 07:58:30 +11:00
hiker
e46c47d5c9 Removed m_local_player_karts data structure in RaceManager. 2016-01-08 17:03:50 +11:00
hiker
68e37c902f Merge remote-tracking branch 'origin/master' into refactor_networking 2015-12-15 22:52:55 +11:00
Benau
2644b0458b Merge remote-tracking branch 'origin/master' into battleAI 2015-12-08 10:09:35 +08:00
auriamg
f0fafc2651 Merge pull request #2245 from Flakebi/kart-properties
Kart properties
2015-12-07 18:44:14 -05:00
Benau
8a0cbea933 Merge remote-tracking branch 'origin/master' into battleAI 2015-12-05 16:27:06 +08:00
deve
94d5c19b7f Fixed compiler warnings.
The winsock2.h header should be always included before windows.h header (or we should define WIN32_LEAN_AND_MEAN). It's because windows.h header includes also winsock.h header and there is possible conflict between winsock and winsock2.

I didn't test in on Visual Studio yet. I hope there is no WIN32_LEAN_AND_MEAN redefinition errors...
2015-12-03 14:59:54 +01:00
Flakebi
ffa85d2206 Merge remote-tracking branch 'upstream/master' into kart-properties 2015-11-21 23:03:58 +01:00
hiker
093283c5b0 Avoid crash if networking was selected, but not actually started. 2015-11-21 12:20:05 +11:00
hiker
ba4ccd5621 Added command line option to start a LAN server. 2015-11-18 17:24:56 +11:00
Benau
f4b723de82 Merge remote-tracking branch 'origin/battleAI' into battleAI 2015-11-15 12:29:01 +08:00
hiker
af9018ea64 Moved Server and ServersManager into network directory. 2015-11-12 17:52:04 +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
bdf34edc00 Removed --client command line option (since this command needs a
server id to work).
2015-11-05 07:54:58 +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
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
6297d8c65d Removed NetworkManager and ClientNetworkManager. 2015-10-27 08:23:59 +11:00
hiker
90b8db9993 Start to remove ClientNetworkManager. 2015-10-27 00:23:20 +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
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
350f434c37 Started to refactor network code. 2015-10-24 12:39:17 +11:00
hiker
4833659085 Added --stdout= command line option to change the name of
the stdout.log file.
2015-10-22 11:51:18 +11:00
Marianne Gagnon
06fb6d4eb2 Delete old fonts and related code 2015-10-18 20:15:05 -04:00
Deve
6318e8c8f8 Fixed compiler warnings 2015-10-04 16:54:14 +02:00
Flakebi
5e6e85ab79 Merge branch master into kart-properties 2015-10-03 15:20:06 +02:00
hiker
449e754849 Fixed #2327. 2015-09-29 07:58:24 +10:00
hiker
da848a4c72 Accept --difficulty as well as --mode. 2015-08-31 17:09:51 +10:00
Flakebi
b51eadae28 Merge branch 'master' into kart-properties 2015-08-16 16:45:47 +02:00
hiker
78c592e4e5 Added a file with a 'unique filename' with version number which is used by STK
to detect that stk is reading the right data files (and therefore avoids #2073,
in which stk finds the wrong data directory).
2015-07-31 22:06:21 +10:00
Flakebi
5d36b95c95 Merge remote-tracking branch 'upstream/master' into kart-properties
Conflicts:
	data/stk_config.xml
	sources.cmake
	src/karts/kart.cpp
	src/karts/kart.hpp
	src/karts/kart_properties.cpp
	src/karts/kart_properties.hpp
	src/tracks/track.cpp
2015-07-29 02:48:43 +02:00
Marianne Gagnon
4356dfde0c Document missing command-line option, fixes #2095 2015-07-25 20:06:42 -04:00
Flakebi
eb19bf571e Load and combine characteristics 2015-07-11 15:38:52 +02:00
hiker
369ed86380 Added 'behind kart' camera which helps debugging graphical
vs physical chassis position issues.
2015-07-02 16:39:13 +10:00
Marianne Gagnon
be81a7fd11 Increase size of popup, text was truncated at least in french 2015-06-23 18:46:36 -04:00
Deve
199cda80b1 Merge pull request #2101 from konstin/fix_2095
add --log to --help message; fixes 2095
2015-05-08 10:32:05 +02:00
Nado
1a395efbfd
Fix #2102.
Moving output modifier and early exit options (--help, --version,
--log, etc) earlier in the execution so nothing useless is printed.
2015-04-23 20:13:37 +02:00
konstin
adceb35812 add --log to --help message 2015-04-23 17:40:20 +02:00
hiker
8d07d26c25 Updated (c) year to include 2015. 2015-03-30 11:42:50 +11:00
hiker
17039141e4 Fix #2051 by keeping a copy of the timer in the SktTimer class. 2015-03-28 01:35:17 +11:00
hiker
3d4509b863 Add a log statement about outdated drivers or opengl version to
the log file (even if the popup for those issues is disabled).
2015-03-27 11:53:25 +11:00
hiker
a560aafa50 Merge branch 'fix_non_hd_option' 2015-03-27 09:33:07 +11:00
hiker
27dec2fbf8 Added attribute to irrlicht's driver to enable automatic resize
of images that are too big. This is then used to automatically
resize any textures (except fonts, background screen) to be
automatically resized to 512x512 if they are bigger.
2015-03-26 11:28:22 +11:00
Deve
5828dddde8 Allow to disable popup messages about too old drivers in config.xml 2015-03-25 18:53:09 +01:00
Marianne Gagnon
3157051560 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-03-11 20:28:53 -04:00
Marianne Gagnon
ad68d9a866 Warn if OpenGL is too old 2015-03-11 20:28:35 -04:00
hiker
41a67d4250 Added privacy notice to 'enable internet' dialog; used redirecting
URLs for privacy and terms&conditions.
2015-03-12 10:33:42 +11:00
hiker
f542aea53d Fixed line endings style. 2015-02-27 22:33:03 +11:00