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

495 Commits

Author SHA1 Message Date
Fantasmos
cb1a2b1e25 Rename m_num_karts to be more appropriate, removed redundant variables I've made 2017-10-28 12:51:49 +11:00
hiker
5af4ea35a7 Fixed 64-bit related compiler warnings. 2017-04-07 23:43:01 +10:00
hiker
668fdd3b49 Fixed some 64-bit related compiler warnings. 2017-04-07 23:25:52 +10:00
hiker
cd149ab5d7 Moved m_track out of World into a static m_track in Track. Makes 
world smaller and removes a few dependencies on World.
 2016-12-13 07:53:33 +11:00
hiker
62da83317e Fixedc compilation, renamed LobbyRoomProtocol to LobbyProtocol. 2016-11-23 18:39:59 +11:00
hiker
09eae7e25f Removed StartGameProtocol, and added the necessary states to the 
Lobby rooms. Added documentation of the FSM for the ServerLobby.
 2016-11-22 17:57:15 +11:00
Benau
6b8156c254 Pre-spawn spare tire karts on random nodes in graph 
Don't use the item location, as it can be remembered by players
 2016-10-09 11:17:36 +08:00
Benau
357567ae8d Move spare tire num info to race_manager 
It allows this info to be get more easily
 2016-10-09 09:50:26 +08:00
Benau
71359a087d Add heart billboard with red kart for spare tire karts 2016-10-08 14:29:28 +08:00
Benau
91af45337f Pre-add spare tire karts probably 2016-10-07 14:39:39 +08:00
Benau
a0b02659f7 Don't use num of karts from world, as it includes spare tire karts 2016-10-05 16:42:37 +08:00
hiker
74f521980a Fixed time handling to be in synch between history and rewind. 2016-09-23 07:56:21 +10:00
hiker
457cb700d2 Make rewind work with history replay (when replaying kart controls), 
which allows to have reproducible test cases.
 2016-09-13 09:58:42 +10:00
hiker
7c899c943c Refactored KartControl to use setters/getters instead of 
just public variables.
 2016-08-15 17:26:07 +10:00
Benau
a94fc6c1c3 Fix goal target not updated when going back 
Also fix some unitialized value issue
 2016-05-18 00:50:29 +08:00
hiker
c92f369cdd Allow 0 laps GP in artist debug mode. 2016-05-06 16:47:05 +10:00
Benau
dff5f8d459 Allow auto recreation of ghost replay file lists after recording. 2016-03-25 16:11:32 +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
Marianne Gagnon
90f0c12393 More work on networking UI 2016-03-10 18:48:40 -05:00
Benau
71c1fadcd3 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-16 09:57:41 +08:00
Benau
a6412d7a07 Add ghost icon, use it in race setup screen 2016-02-15 09:28:36 +08:00
Benau
8a121ed32b Add Ghost replay GUI 2016-02-13 01:34:00 +08:00
Benau
3f89512b34 Remove most isGhostKart() hack when avoidable 2016-02-11 09:01:09 +08: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
Benau
5a9fdd7a8d Allow replay reverse track 2016-02-10 12:43:45 +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
Benau
e8adf7f051 Remove bubblegum in soccer mode as suggested by auria 2016-01-25 12:50:20 +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
e7dd7f4d1a Replaced setLocalKartInfo with setPlayerKart. Updated some docs. 2016-01-12 13:00:45 +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
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
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
2644b0458b Merge remote-tracking branch 'origin/master' into battleAI 2015-12-08 10:09:35 +08: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
hiker
35d1059a39 Cosmetic changes only (coding style, comments). 2015-12-04 17:52:21 +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
2f126ab226 Moved NetworkPlayerProfile into its own file, added getter and 
setters for it.
 2015-11-26 07:41:37 +11: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
Nado
97de0cbc34 Fixing clang only warnings 2015-11-17 11:42:28 +01: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
15e3ac021f Fix ending STK when no STKHost exists. 2015-11-01 21:28:39 +11:00
Deve
8bfe048f0f Remember race type in saved GP. 
Continue standard race as follow the leader and vice versa doesn't have a sense.
 2015-10-21 22:42:59 +02:00
Marianne Gagnon
35b15a9e7a Fixed corrupted text introduce with recent change of how translations are handled 2015-08-18 19:08:23 -04:00
Flakebi
eef55b04f8 Fix the merge 2015-08-17 00:31:55 +02:00
deve
e1f61040e5 Use unique_ptr instead of auto_ptr 2015-08-06 13:54:29 +02:00
Marianne Gagnon
bd85f51779 Improve memory management in GP manager, fixes #2261 2015-08-04 19:26:12 -04:00
hiker
9e75d28eeb Write the reverse flag into history files. 2015-08-05 08:15:31 +10:00
hiker
4f4a1c0373 Added support for reverse mode in history files. 2015-08-04 17:14:36 +10:00
hiker
8d0cad3cb8 Use proper call instead of hard coded constant. 2015-08-03 15:44:44 +10:00
hiker
a852cf94fb Don't save random GPs (which can not be continued anyway), and allow only 
one saved data set (for each GP and difficulty). Previously saved 'random'
GPs (which can't be continued anyway) are deleted now, cleaning up the
config.xml file.
 2015-08-03 15:10:36 +10:00
hiker
5efb44a430 Fixed scores in FTL GPs. All score handling is now done by the World, 
not race manager (which removes if tests).
 2015-07-28 09:39:00 +10:00
Flakebi
a311281aa7 Fix Random Grand Prix being reversed 2015-05-06 20:39:40 +02:00
Flakebi
af88b4a16f Fix translation issues with grand-prixs 2015-04-26 23:31:57 +02:00
hiker
8d07d26c25 Updated (c) year to include 2015. 2015-03-30 11:42:50 +11:00
hiker
06ca68275e Fixed typo. 2015-03-13 10:12:43 +11:00
Deve
57ab9e5ac5 Remove saved GPs only in offline mode during starting new race 2015-01-07 21:19:04 +01:00
Deve
2d9e38f7f6 Display continue button only if next track isn't first available in GP. 
Fixed a crash.
 2015-01-07 21:15:53 +01:00
Deve
b726b59427 Remove all saved data for specified GP during start new race. 
Generally it shouldn't happen because the rule is one save per one GP, but it is possible with old config.xml files.
 2015-01-07 18:41:52 +01:00
Deve
cd9bd36520 Don't create new GP save when it's already created 2015-01-07 18:32:32 +01:00
Marc Coll Carrillo
a9193e09fd Unify random GP's ID and translatable name in a single place 2014-12-30 13:19:24 +01:00
Marc Coll Carrillo
9e6cd2a958 Fix translation problems in random GP screen 2014-12-30 13:19:10 +01:00
hiker
006a7f95c9 Cherrypicked pull request #1743 (cppcheck performance fixes). 2014-12-01 15:14:27 +11:00
hiker
63250237a4 Fixed linux compilation. 2014-11-27 23:27:27 +11:00
hiker
020c129691 Specify the replay buffer size as time value (i.e. how many seconds), 
not how many frames.
 2014-11-27 16:15:53 +11:00
hiker
aac261d873 Use proper format (instead of casting unsigned to int). 2014-11-25 14:02:34 +11:00
Tobias Markus
22c22b864a Fix further issues 2014-11-20 23:15:05 +01:00
Tobias Markus
61ccfaac77 Fix errors in src/ that cppcheck yielded with the default configuration 2014-11-20 22:01:46 +01:00
Marianne Gagnon
229a43a692 Preserve "startedFromOverworld" flag value properly. Fixes #1683 2014-11-17 19:07:37 -05:00
Flakebi
9dd86c8332 Don't handicap AIs 2014-11-04 23:57:33 +01:00
Deve
6d07189474 Don't allow doubled tracks in random GP. 
Otherwise track number limit wouldn't have sense.
 2014-11-04 20:27:01 +01:00
Deve
66a1ff2b2b Don't allow to run locked tracks in random GPs 2014-11-04 20:10:36 +01:00
Flakebi
46f3fa5f74 Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	data/gui/options_ui.stkgui
	src/graphics/stkmesh.cpp
	src/states_screens/options_screen_ui.cpp
 2014-10-26 17:47:29 +01:00
Flakebi
690e632e1b Move handicap to ui options and to the player name spinner 2014-10-26 16:56:50 +01:00
Deve
321f0e7078 Remove saved GP when we start new race. 
Avoid a crash. Saved GP was deleted, but was not NULL. And in other place we have if(m_saved_gp != NULL) check, which was true for deleted object.
 2014-10-20 23:46:25 +02:00
konstin
4647a50acb Save GP on abort 2014-10-20 23:46:25 +02:00
konstin
f65ad8f84f Save GP reverse Type; close #1137 2014-10-20 23:46:25 +02:00
konstin
035fc599ee fix ordering of the karts and maybe some more 2014-10-20 23:46:25 +02:00
konstin
ae24c6b40f only one saved GP per GP-ident 
Conflicts:
	src/graphics/glwrap.cpp
 2014-10-20 23:46:25 +02:00
Flakebi
57afd1d585 Merge remote-tracking branch 'origin/master' into perPlayerDifficulties, this time the right branch... 
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/graphics/glwrap.cpp
	src/graphics/weather.cpp
	src/states_screens/user_screen.cpp
 2014-10-20 22:36:54 +02:00
Flakebi
069853b11f Fix #1153 Cleanup logging code 2014-10-07 20:54:54 +02:00
Flakebi
47da30dd24 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-30 19:22:18 +02:00
hiker
dfc3756f5d Fixed compiler warning. 2014-09-27 19:25:45 +10:00
Flakebi
2cf9707294 Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	src/states_screens/kart_selection.cpp
I hope I got everything
 2014-09-24 17:58:12 +02:00
Marc Coll Carrillo
9c56d66c2d Minor corrections (a couple of warnings, unused headers...) 2014-09-23 22:23:24 +02:00
hiker
53f05e868d Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-23 20:18:09 +10:00
Deve
cfa4d455b0 Merge pull request #1547 from marcoll/master 
Fix issues with the new "reverse grand prix" feature and user defined GPs
 2014-09-23 10:59:43 +02:00
hiker
aa64f31f83 Added Screen::push() function to shorten the calls to pushScreen(). 2014-09-23 16:43:50 +10:00
hiker
c28728d903 Removed more compiler warnings for 64 bit windows compilation. 2014-09-23 16:23:22 +10:00
hiker
ad20635cce Applied patch for #600 (support 64 bit compilation on windows). 2014-09-23 14:41:32 +10:00
Marc Coll Carrillo
bbbe0ddf8d Fix issues with the new "reverse grand prix" feature and user defined GPs 2014-09-19 23:25:03 +02:00
Marc Coll Carrillo
5cf3ad220f Some improvements to the GP editor: 
- GP are now classified into groups, just like tracks: standard, user defined, and add-ons
    - allow empty GPs to be loaded by the GP manager, so that they can appear
      on the GP editor (but not on the track selection screen)
    - enable/disable buttons depending on the available options
    - provide some feedback after pushing the "save" button
    - some minor bug corrections and improvements
 2014-09-13 10:40:27 +02:00
Flakebi
5858c05e74 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-05 22:46:17 +02:00
hiker
709583ead5 Removed Random GP dialog. 2014-09-03 17:01:36 +10:00
hiker
0a0609d91f Added GrandPrixData::isRandomGP. 2014-09-03 08:24:11 +10:00
hiker
ae01eaf595 Use track->isRaceTrack(). 2014-09-03 08:16:52 +10:00
hiker
ccdc90f029 Removed while loop with a 'random' abort condition - while it works 
it could result in STK hanging if a broken random generator should be
used.
 2014-09-03 08:08:41 +10:00
hiker
c8724632e8 Bugfix: only allow races (i.e. no arenas, or cut scenes) in an 
'all tracks' random GP.
 2014-09-02 16:40:26 +10:00
Flakebi
a31ec772ff Replace accidently placed tabs 2014-09-02 03:57:48 +02:00
hiker
7dbfc151bf Added random GP functionality into gp_info screen. Changed GPData 
in GPInfoScreen from a pointer to be an object, while this adds
some coping of this object, it removes potential memory leaks.
 2014-09-02 09:32:12 +10:00
Flakebi
e2089fcea6 Switch per player difficulty to player config 2014-09-02 01:18:58 +02:00
Flakebi
dc4a30202f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-01 11:31:26 +02:00
hiker
76767141f7 Removed old track info dialog, fixed crashes in track info screen 
(caused when making some spinners etc. visible).
 2014-08-25 22:20:42 +10:00
konstin
a2d76dd098 Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp 2014-07-31 10:57:11 +02:00
hiker
a81f21a27a Applied konstin's bugfix for an editor crash. 2014-07-31 09:28:42 +10:00
konstin
e7d3ab4be2 fix compilation 2014-07-30 16:17:40 +02:00
konstin
5a43fecdd0 Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp 2014-07-30 13:59:41 +02:00
Flakebi
a84094e55e Add difficulty to karts 2014-07-29 22:54:42 +02:00
Flakebi
71f8766cb1 Add per-player difficulty 2014-07-28 18:32:39 +02:00
hiker
fbf5bf4166 Changed default number of laps to be 3 (and not the number of laps 
used last time), which seems to be a better default. Some minor
cosmetic changes.
 2014-07-24 17:43:11 +10:00
hiker
9267e2d304 Merge branch 'lapnumber' of https://github.com/konstin/stk-code into konstin-lapnumber 2014-07-24 16:48:03 +10:00
konstin
eae71b3df9 remove C++11 2014-07-24 08:41:45 +02:00
konstin
eb5e148aa7 resolve conflict 2014-07-23 21:52:53 +02:00
konstin
7978c25fc5 more improvements 2014-07-23 21:49:53 +02:00
konstin
02d21053fc begining with grand_prix_cutscene.cpp (first compiling prototype) 2014-07-23 15:28:57 +02:00
Flakebi
4fe34007cd Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-07-23 15:18:46 +02:00
Flakebi
0195d95bad Adding basic gui for per-player difficulties 2014-07-23 15:18:40 +02:00
Flakebi
55090a0566 Unify log output 2014-07-22 12:54:11 +02:00
konstin
ea56f66d83 Revert "unify separators" 
This reverts commit ad641eff67.
 2014-07-16 15:46:52 +02:00
konstin
0ec2cd6dc1 Merge branch 'master' of https://github.com/supertuxkart/stk-code into asdf 2014-07-16 15:16:11 +02:00
hiker
649848cac2 Mostly cosmetic changes (renamed variables, added comments). Changed 
'random' constructor of GrandPrixData into a function so that there
is no need to create a new GPData objects and then copy it.
 2014-07-16 08:11:09 +10:00
konstin
ad641eff67 unify separators 2014-07-15 17:15:42 +02:00
konstin
a7c6eb3853 close #1263 2014-07-15 15:57:33 +02:00
konstin
02f2488502 add default_number_of_laps 2014-07-15 15:46:17 +02:00
hiker
ab57903f9f Try to convert m_gp from a GPData pointer to a GP object, compiles, but 
crashes.
 2014-07-14 23:08:46 +10:00
hiker
f24a000f78 Merge branch 'm_random_gp' of https://github.com/konstin/stk-code into konstin-m_random_gp 2014-07-14 14:54:59 +10:00
konstin
eb0120fb77 fix #1395 2014-07-08 18:37:02 +02:00
konstin
240f0ec6b7 remove m_random_gp 2014-07-08 18:34:54 +02:00
konstin
8cac64f39f check if reverse is available; fix #1396 2014-07-08 16:47:56 +02:00
hiker
7ec2bae8e7 Minor style changes. 2014-07-08 14:41:59 +10:00
hiker
32707b8f88 Changed m_grand_prix of RaceManager to be an object (and not a pointer to 
an object) anymore, which fixes a memory leak (and I also reverted my quick
fix from last night de7ceb0c2d to fix a crash,
which now not necessary anymore.
 2014-07-08 13:20:53 +10:00
hiker
de7ceb0c2d Quick fix to avoid crash at end of race, full fix to follow later ;) 2014-07-07 23:31:43 +10:00
hiker
cab0b2d833 Fixed compiler warning. 2014-07-07 16:53:42 +10:00
konstin
3679bf4617 adding a comment; fix #930 2014-06-05 18:59:16 +02:00
konstin
ce661a4dd4 add a reverse spinner 2014-06-02 16:56:59 +02:00
konstin
03768db82a avoid duplicate tracks 2014-05-31 22:32:55 +02:00
konstin
6521e3d496 fix crash due to a dangling pointer 2014-05-31 17:28:20 +02:00
konstin
b7b116634d solving merge conflicts with upstream 2014-05-31 15:28:52 +02:00
konstin
2534abeed2 trying to merge upstream 2014-05-31 15:11:05 +02:00
konstin
02677b38c2 Refactoring, renaming and cleaning-up 2014-05-30 20:26:44 +02:00
hiker
b18d7e75ac Rewrote insertionSort to only require operator< (no >), 
and removed the unnecessary operators.
 2014-05-28 21:41:07 +10:00
konstin
feeab733e4 more intellegent track adding and removing 2014-05-27 20:49:02 +02:00
konstin
aab6a1fcb6 adding sliders to dialogue 2014-05-23 22:55:25 +02:00
konstin
0fdfe16a93 first try for a Random GP generator 2014-05-18 15:27:57 +02:00
konstin
b3247ef215 Merge branch 'master' of https://github.com/supertuxkart/stk-code into devel 2014-05-17 17:14:29 +02:00
Marianne Gagnon
4ff8b813fa Create RTTs only when loading a track 2014-05-16 19:30:39 -04:00