ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,215 Commits 9 Branches 28 Tags 433 MiB
cc92ee6ef3
Commit Graph

11888 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
fefeffad91 Further clean 2015-12-20 09:01:50 +08: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
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
Benau
12e4c76a6f Add minimap for battle mode when it has a navigation mesh 
TODO: update battle island arena to use only 4 vertices per poly
 2015-12-15 02:32:01 +08:00
Deve
e6068923b4 Give more light in kart selection screen 2015-12-14 19:23:27 +01:00
Deve
153fabb502 Fixed a crash on start with legacy pipeline 2015-12-14 19:03:10 +01:00
Deve
bddfa43da4 One more tweak. 
glGetFramebufferAttachmentParameteriv function is available in OpenGL 3.0 and newer.
 2015-12-14 18:56:08 +01:00
deve
5f46863a19 Display pop-up message when fatal error occured on windows. 
The reason to do it is that in release mode we don't receive any message in console. This causes that the game sometimes doesn't start and you have no idea why (for example missing supertuxkart.git file etc.).
 2015-12-14 12:25:04 +01:00
deve
4531b15d5c Check for sRGB workaround only if needed. 
This fixes the crash for old OpenGL 2.1 drivers
 2015-12-14 11:35:42 +01:00
Benau
9d1c9fac5a Merge remote-tracking branch 'origin/master' into i18n 2015-12-14 03:00:07 +08:00
Benau
7fccddb734 Show "Fribidized" user name and enable input for it 2015-12-14 02:56:42 +08:00
Benau
f0abbad937 Fix plural forms 2015-12-14 02:56:16 +08:00
Deve
306ace7fd2 Keep consistency with log label in irr driver 2015-12-11 19:18:14 +01:00
Deve
7dd7f76e87 Check if we really need to re-create the device by checking if framebuffer is sRGB or not. 2015-12-11 19:18:14 +01:00
Deve
80d36208f1 Added ugly hack, which forces srgb-capable framebuffer creation for intel drivers on linux 2015-12-11 19:18:14 +01:00
Deve
0216fd9697 Request sRGB-capable visual during creating OpenGL context. 
We need it for proper working. When it's not available, then function glEnable(GL_FRAMEBUFFER_SRGB) doesn't take any effect, and then displayed image is too dark.

It doesn't solve the issue that the screen is too dark for intel graphics cards on linux, because the driver ignores this request. But still, this is the proper way to do it and it may avoid similar issues in future.

Actually we should detect that the visual is not srgb-capable, and in this case maybe make some gamma correction or filter it on our side to get similar effect.
 2015-12-11 19:18:14 +01:00
Benau
93b1b11b99 Merge remote-tracking branch 'origin/master' into i18n 2015-12-11 09:27:15 +08:00
Benau
8f6a529531 Complete fix to arena selection menu (handle random arenas) 2015-12-10 15:49:47 +08: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
Benau
cebefcf374 Fix some gui interface bugs: 
1. Fix credits fading effect

2. Display have many no of (addons mostly) arenas are hidden due to
   missing of navigation mesh

3. Fix wrong size of kart stats bar
 2015-12-10 10:25:52 +08:00
Benau
ca6da8c537 Make AI smarter 
1. Correct fire angle for bowling

2. When swapper is used, follow a closest kart instead.
 2015-12-10 01:21:01 +08:00
Benau
11c4b41f13 More menu fix 2015-12-09 12:42:13 +08:00
hiker
1969ee0b1f Set a name for each thread in VS. 2015-12-09 08:55:46 +11:00
Benau
aac5a368b8 Avoid invaild Ai karts number during switching game modes 2015-12-09 01:27:02 +08:00
hiker
1755f22663 Cosmetic changes only. 2015-12-09 00:13:35 +11:00
Benau
140a229f71 Fix swatter issue 2015-12-08 16:47:42 +08: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
Benau
c789b1a8df Fix compile error 2015-12-08 10:46:01 +08: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
hiker
7fa062881d Removed unused variable. 2015-12-08 08:08:00 +11:00
Benau
152dddc110 Fix potential hang after end race in temple arena 2015-12-08 00:44:28 +08: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
Benau
21c38a6c0b Make swatter disappear after one hit in 3 strikes battle 2015-12-07 16:24:11 +08:00
hiker
d8b417d536 Cosmetic changes; removed static variable. 2015-12-07 17:05:08 +11:00
Marianne Gagnon
ae916fced6 Add warning when animated texture not found 2015-12-06 20:14:55 -05:00
Benau
ba706f4476 Make swatter works better 2015-12-07 02:27:21 +08:00
Benau
b92395533e Fix infinite loop 2015-12-06 14:43:07 +08:00
Benau
239412327a Fix crashes when a kart has no wheels 2015-12-06 13:51:38 +08:00
Marianne Gagnon
cfc6ccf5ea Add missing copyright 2015-12-05 21:47:50 -05:00
Marianne Gagnon
27290b4ffb More work on scripting Property animator 2015-12-05 20:45:37 -05:00
Marianne Gagnon
840bc3df64 Make more properties animatable + fix build (oops, forgot files in previous commit) 2015-12-05 20:03:11 -05:00
Marianne Gagnon
2252495fdc Scripting refactor : add new property animator helper, transfer light animations to this new animator class. Can be used in the future to animate more properties 2015-12-05 19:42:06 -05:00
Benau
8a0cbea933 Merge remote-tracking branch 'origin/master' into battleAI 2015-12-05 16:27:06 +08:00
Benau
ed41b7c805 Proper fix for reverse and unstuck 2015-12-05 16:21:12 +08:00
Flakebi
f63c4af8be
Fix crash 2015-12-04 21:19:15 +01:00
Benau
9ad438b945 Try to fix too fast reverse and unstuck issue 2015-12-04 16:32:33 +08: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
Deve
8980a32c20 Added profiler marker to keep consistency with other effects 2015-12-03 19:31:13 +01:00
Deve
9b3908cc62 Some lightning improvements: 
- move OpenGL-related code to graphics directory, as it should be
- solve issue with applying effect multiple times in multiplayer mode
- remove old already disabled opengl code
 2015-12-03 19:25:40 +01: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
deve
0bd15acb93 Fixed compiler warning. 
gcc complains that std::auto_ptr is deprecated.
 2015-12-03 14:51:26 +01:00
deve
dbdf9db377 Fixed cygwin compilation. 
Unfortunately it doesn't support std::to_string function, even on relatively new gcc (tested with version 4.9.2).
 2015-12-03 14:38:57 +01:00
Benau
ab428dc8cf Different AI intelligence per difficulties 2015-12-03 16:13:39 +08: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
Flakebi
c5277edc54
Change suspension-travel that was changed in master meanwhile 2015-12-03 02:15:58 +01: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
Flakebi
dbecbc3840
Assign KartProperties to a variable instead of fetching it every time 2015-12-02 19:40:28 +01:00
Benau
b5d4610f45 Better navmesh handling 2015-12-02 10:41:32 +08:00
Benau
084a4ee844 Fix crashes when no navmesh 
User should have no way to start with ai in battle mode,
when the arena has no navmesh.

Unless artist debug mode or more than 1 human players.
 2015-12-02 10:08:03 +08: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
Benau
c910c19827 Backwards firing and hard u-turn for backward node 
TODO:
correct unstuck and perfect angle fire?
 2015-12-01 09:27:49 +08: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
Flakebi
12a1227f20
Merge branch 'upstream/master' into kart-properties 2015-11-29 22:21:08 +01:00
Flakebi
ba3bc326eb
Minor refinements 2015-11-29 22:21:03 +01: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
Flakebi
aea68a2c14
Remove characteristics from kart 2015-11-29 04:08:12 +01:00
Flakebi
9fbe72b3c5
Move getter from characteristics to properties 2015-11-29 04:08:12 +01: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
896d55816f Removed linux compiler warnings. 2015-11-26 09:13:57 +11:00
hiker
5c0f71ad07 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:56:03 +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
Marianne Gagnon
8ca0fea6fa Fix audio listener positionning code crash 2015-11-23 19:05:51 -05:00
Marianne Gagnon
c806c1de49 Clear status text in register screen, fixes #2361 2015-11-23 19:04:24 -05: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
Flakebi
6e36c223b9 Hold one kart properties object per player 2015-11-23 01:19:00 +01: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
Deve
8a0927f574 Fixed minor inconsistency in video settings dialog. 
Regression since 9b562d31f4
 2015-11-22 15:33:46 +01:00
Benau
aa9220772f Merge remote-tracking branch 'origin/master' into battleAI 2015-11-22 15:01:41 +08:00
Benau
e1f1461488 Fix some bugs and copyright year 2015-11-22 15:01:22 +08:00
Flakebi
79c962dd79 Remove skidding properties and use characteristics instead 2015-11-22 00:40:11 +01:00
Flakebi
2f1d08edbd Add enabled property to skid characteristics 2015-11-21 23:27:00 +01:00
Flakebi
b4904b182f Fix merge 2015-11-21 23:15:54 +01:00
Flakebi
ffa85d2206 Merge remote-tracking branch 'upstream/master' into kart-properties 2015-11-21 23:03:58 +01:00
Flakebi
4778460f6c Apply script 2015-11-21 23:02:16 +01:00
Benau
62f5be0d9d First playable version of battle AI 
TODO:
backwards firing
better handling to obstacles
ai karts number selection
win/lose screen handling

Please use a better navmesh to test
 2015-11-21 15:58:03 +08:00
hiker
f05b6f6dd7 Improved handling of cancelling server creation. 2015-11-21 12:21:50 +11:00
hiker
093283c5b0 Avoid crash if networking was selected, but not actually started. 2015-11-21 12:20:05 +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
Nado
d66a70b250 Fixing some -Wunused-variable 2015-11-17 11:42:28 +01:00
Nado
97de0cbc34 Fixing clang only warnings 2015-11-17 11:42:28 +01:00
Marianne Gagnon
708608177a Fix audio listener positionning issue 2015-11-16 19:13:28 -05: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
Benau
f4b723de82 Merge remote-tracking branch 'origin/battleAI' into battleAI 2015-11-15 12:29:01 +08:00
Benau
2b0e3b8828 Reverse type and state 2015-11-14 10:38:14 +08:00
Benau
962fe919d2 Color the text (mainly border including title and billboard) base on current skin 2015-11-14 01:06:28 +08:00
hiker
4a3c4c552e LAN clients now start to connect to the server. 2015-11-13 08:50:03 +11:00
Benau
7cf4d662ee Allow configurable fonts file names in stk-config 2015-11-13 02:25:52 +08: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
8b916a7565 Fixed sfx not playing at right location (e.g. bridge in Green Valley). 2015-11-11 23:14:00 +11:00
Marianne Gagnon
6afc34c06b Try to fix audio potential issues 2015-11-10 21:31:38 -05: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
Marianne Gagnon
bf14e49ea4 Create OpenAL sound sources asychronously 2015-11-09 19:22:06 -05:00
Marianne Gagnon
86d18c0c3e Merge branch '2360_fix_attempt' 2015-11-09 18:15:02 -05: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
Marianne Gagnon
b1803b8dff Apply fix by Benau 2015-11-07 21:48:12 -05:00
Marianne Gagnon
35316c447d Merge remote-tracking branch 'Benau/ftcleanup#2' 2015-11-07 21:37:47 -05:00
Benau
09a6b9b502 Remove unneeded variable 2015-11-08 10:34:48 +08:00
Benau
cee7cf0b37 Implement better error detection 2015-11-08 10:24:31 +08:00
Benau
0b5a916980 Remove unused header 
Also fix some spacing
 2015-11-08 01:36:40 +08:00
Benau
09101e923c More clean up freetype-related code 
1. Remove useless get font properties class

2. Pre-set the face dpi

3. Make all freetype related code to have a better coding style
 2015-11-07 16:24:31 +08: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
Elderme
8d91ab5105 merge with master 2015-11-04 21:24:25 +01:00
Marianne Gagnon
78fd0e373f #2360 fix attempt 2015-11-03 19:15:55 -05:00
Deve
795f3148dc Revert "Added default precision qualifier in fragment shaders" 
This reverts commit c23da9e855.
 2015-11-02 18:20:07 +01:00
Elderme
b70fa22d23 Define default precision in fragment shaders after #extension 2015-11-02 18:14:01 +01: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
auriamg
08e3a9ea13 Merge pull request #2367 from CruzR/memory_leaks 
Fix a couple of memory leaks.
 2015-11-01 20:15:16 -05:00
auriamg
9d456c5459 Merge pull request #2365 from Elderme/shader_precision 
Add default precision qualifier in fragment shaders
 2015-11-01 20:02:18 -05:00
Thomas Glamsch
a5a9b9f6c1 Fix a memory leak in PhysicalObject::init(). 2015-11-02 01:43:54 +01: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
0d84239cd2 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-11-01 19:46:00 +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
auriamg
4762658a88 Merge pull request #2364 from Benau/freetype_cleanup 
Clean up freetype code
 2015-10-30 20:33:51 -04:00
Deve
8a288f05ff Implement lightning effect using shaders 2015-10-31 01:00:48 +01:00
Elderme
c23da9e855 Added default precision qualifier in fragment shaders 2015-10-30 22:05:08 +01:00
Benau
b9b2b538fa Clean up freetype code 
1. Remove all ifdef of freetype

2. Require freetype in CMake

3. Clean up declaration

4. Add leak check

5. Make script language display better in title
 2015-10-30 18:08:02 +08: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
Marianne Gagnon
66909086fd Scripting : allow smoothly animating lights 2015-10-27 19:08:12 -04:00
Marianne Gagnon
953c29089e Scripting : start adding features to control light objects 2015-10-27 18:33:54 -04: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
d2e6a10026 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-10-27 15:00:13 +11:00
hiker
c5b8c3e3e9 Try to improve performance for sfx (#2154). 2015-10-27 14:59:20 +11:00