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
