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

1228 Commits

Author SHA1 Message Date
Benau
fdcb4dac8d Fix assertion when no spare tire karts 2016-10-09 17:41:20 +08:00
Benau
fb0f4fca3c Allow BattleAI to collect lives 2016-10-09 13:24:00 +08: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
8889654d96 Move STA function out of world 2016-10-08 09:41:02 +08:00
Benau
71662df159 Improve spawn formula 2016-10-07 21:49:05 +08:00
Benau
b055fa573d Try to fix hangs when firstly spawn STA 2016-10-07 15:29:36 +08:00
Benau
91af45337f Pre-add spare tire karts probably 2016-10-07 14:39:39 +08:00
Benau
a91af96637 Initial work on spare tire kart in battle mode 
Some values are hard-coded for now
 2016-10-05 16:18:39 +08:00
hiker
8949e89809 Merge remote-tracking branch 'origin/master' into rewind 
Fixed conflicts.
 2016-10-05 08:21:10 +11:00
hiker
9cf88ef874 Merge remote-tracking branch 'origin/master' into rewind. 
Fixed conflicts.
 2016-10-04 08:15:40 +11:00
Benau
c22714951c Missed reset before update TrackSector 2016-09-30 00:42:04 +08:00
Benau
32f87fa8a9 Fix wrong doxygen comments 2016-09-29 10:19:18 +08:00
Benau
100c23b3c0 Move TrackSector to WorldWithRank 2016-09-28 13:48:32 +08:00
Benau
3d89d5adc6 Make OverWorld be derived from World 2016-09-28 11:24:04 +08:00
Benau
7867a30276 Allow auto-rescue for ArenaAI if off road for some times 2016-09-28 09:59:33 +08:00
Benau
e26920e479 Improved skidding when closing to item or kart as target 2016-09-27 15:30:31 +08:00
hiker
74f521980a Fixed time handling to be in synch between history and rewind. 2016-09-23 07:56:21 +10:00
hiker
1651d28a4c In case of history replay update dt earlier so that World is updated 
with the replay dt value.
 2016-09-21 17:31:24 +10:00
Benau
36eca8bc55 Avoid setting gravity in btKart 2016-09-19 11:18:16 +08:00
Benau
eeac5668d9 Rename QuadGraph to DriveGraph, make it use the new Graph interface 2016-09-17 14:30:28 +08:00
Benau
606a5401d3 Allow starting position on an upside down surface in arena 
Todo: referee and make btKart cast ray at correct normal
 2016-09-17 09:53:44 +08:00
Benau
1491236e84 Allow TrackSector to use with new graph class 2016-09-15 15:47:17 +08:00
Benau
ba047a4f99 Keep flying karts parallel to the ground in the physics, not outside 
Like 44da1fb4f2, but takes terrain
into account
 2016-09-11 15:35:42 +08:00
Benau
7cfd9752d0 Fix restarting the race when karts are up-side-down 2016-09-10 11:11:52 +08:00
Benau
fde9ccd53e Move updateTerrainInfo to a better location 2016-09-10 11:09:52 +08:00
Benau
ceb92f9b4a Try to completely fix rescue issue 2016-09-10 01:20:11 +08:00
Benau
505b50da0c Make getNode return pointer. (easier with dynamic_cast later) 2016-09-09 16:14:28 +08:00
hiker
a563266988 Made the KartRewinder to be a kart (which gives it easier access to 
some of the kart attributes that need to be saved).
 2016-09-05 08:00:21 +10:00
Benau
23a49d5245 Merge remote-tracking branch 'origin/master' into walldriving 2016-09-04 11:56:28 +08:00
Benau
21dc569f70 Start to clean up quad and graph node 2016-09-04 11:56:03 +08:00
LoadingPleaseWait
3dc13eb071 Fix CPU marker typo 2016-08-31 15:36:15 -05:00
hiker
2a06036fb7 Changed order in which rendering and various updates are done, which 
results in the physics reacting one frame earlier to user input.
 2016-08-31 16:31:59 +10:00
Benau
35ce9a39ce Merge branch 'master' into walldriving 2016-08-26 15:36:57 +08:00
Benau
6b0fe9dd89 Clean up: 
Try to use forward enum declaration for KartRenderType

NoCopy for RenderInfo
 2016-08-18 11:15:05 +08:00
hiker
a15c9529a5 Merge remote-tracking branch 'origin/master' into rewind 2016-08-01 08:18:38 +10:00
Benau
8c38e9e79b Merge remote-tracking branch 'origin/fix_timer' 2016-07-25 14:46:58 +08:00
hiker
d6a62a85b7 Removed unnecessary #include. 2016-07-22 09:58:10 +10:00
Benau
1d6c7fa60f Remove vector int in RenderInfo 2016-07-15 12:31:00 +08:00
auria.mg
1463cf9344 Fix uninitialized variables, fixes #2567 2016-07-12 19:39:44 -04:00
Benau
b903baf226 Fix crash sound only working once if the timer counts backwards 2016-07-08 23:43:12 +08:00
hiker
b2a62c222c Merge branch 'camera-refactor' 2016-07-08 06:47:32 +10:00
Benau
5bb2a5cf7e Allow changing kart color on-the-fly 2016-06-30 09:30:52 +08:00
Benau
22e5c0909c Allow setting color without copying the mesh 2016-06-28 14:55:48 +08:00
Benau
f1dd7ce06e Remove the arrows in soccer mode if using glsl 2016-06-26 07:53:59 +08:00
Benau
7e806fe86f Merge remote-tracking branch 'origin/master' into render_kart_driver_differently 2016-06-25 16:31:08 +08:00
Benau
2f217fd55b Allow render red or blue karts in soccer mode using shader 2016-06-25 16:29:54 +08:00
auria.mg
f90703beb6 Move hardcoded cutscene FOV to a config file 2016-06-23 19:10:56 -04:00
Michael Murphey
c849aa3b8d More information in race result GUI (#2516) 
* More information in race result GUI

* Fix extra race result GUI information

* Rename displayHighScores()

* Use race_manager->hasModeLaps() and fix clang compile error

* Don't initialize best_lap_time unless the mode has laps
 2016-06-15 19:36:37 -04:00
Benau
d1d591ca34 Fix compiler warning 2016-06-11 15:58:17 +08:00
Benau
023dbe1968 More statistics in soccer mode profiling 2016-06-11 15:31:58 +08:00
Benau
bbc61480a4 Fix missing white-space 2016-06-10 21:11:55 +08:00
Benau
eaf1486d9c Remove misleading-FPS info in soccer mode profiling 
As it will increase with the total polycount of the soccer field.
Now just use total frame elapsed to estimate AI performance.
 2016-06-10 20:52:38 +08:00
Benau
d234954e14 Call enterRaceOverState from base class for 3SB too 2016-06-08 08:40:33 +08:00
Benau
315ea69020 Call enterRaceOverState from base class in soccer world 
Even when profiling
 2016-06-07 10:15:07 +08:00
Benau
c66df6082d Remove not too useful angle calculation 
Fix a bug in reverse position returned
 2016-06-01 08:21:35 +08:00
Benau
0c254dfa5d Try to make AI work like zidane 2016-05-26 08:24:45 +08:00
Benau
63a3b50bb7 More details on profiling 2016-05-24 15:50:34 +08:00
Benau
02779e39a9 Merge remote-tracking branch 'origin/advanced_soccer_ai' into arena_ai_profiling 2016-05-21 11:41:02 +08:00
Benau
ae18983655 Fix wrong colon 2016-05-21 11:31:43 +08:00
Benau
390f45a9d1 Fix crashes in arena profiling mode 
Notice: you need to merge arena_ai_profiling into here to test
 2016-05-21 01:11:37 +08:00
Benau
0f9438d824 Use math formula to determine overtake position 2016-05-21 00:37:11 +08: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
Benau
de8d172c07 Improvements in soccer mode with minimap 
1. Larger ball

2. Draw goal line of two teams in minimap
 2016-05-17 16:01:27 +08:00
Benau
d2f26fe70d First playable advanced soccer ai 2016-05-16 15:24:05 +08:00
Benau
748051871c Get rid of two more member values 2016-05-16 07:54:03 +08:00
Benau
b5345c8b31 Remove unneeded memeber 2016-05-16 07:19:18 +08:00
Benau
7e8ca70bc6 First version of advanced soccer ai ⚽ 2016-05-16 00:46:06 +08:00
auria.mg
8fa902a748 Another attempt at fixing camera roll in cutscenes, hopefully the right one this time. See #2483 2016-05-11 20:18:07 -04:00
auria.mg
b84b28b3a7 Undo previous "bugfix", it doesn't work 2016-05-11 19:45:42 -04:00
auria.mg
dc885fbf05 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-05-11 19:35:08 -04:00
auria.mg
17f96ac9ef Fix camera roll in cutscenes 2016-05-11 19:35:00 -04:00
Benau
9624d27f59 Try to fix lost control for soccer ai 2016-05-10 08:53:33 +08:00
Benau
bb01c83d6e Auto-balance the number of AIs 
If there are uneven the number of human players in each team
 2016-05-08 08:08:57 +08:00
Benau
bbde4659c1 Allow arena ai profiling 2016-05-05 16:25:54 +08: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
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
Antonius Riha
d4f1f28070 Support disabling race intro and start sounds 2016-05-02 11:32:04 +02: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
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
hiker
d1f611197f Fixed reset of cameras, and switching to debug views. 2016-04-19 09:40:14 +10:00
hiker
7d0953ad83 Merge branch 'master' into rewind 2016-04-12 17:36:56 +10:00
Benau
d914e1eea3 Make game playable when start racing 2016-04-08 15:44:50 +08:00
Benau
6dc05a1ec7 Merge remote-tracking branch 'origin/master' into walldriving 2016-04-08 13:42:58 +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
Benau
224bd277b3 Better function name 2016-04-03 13:59:10 +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
dff5f8d459 Allow auto recreation of ghost replay file lists after recording. 2016-03-25 16:11:32 +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
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
Benau
8f1daabbe1 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-22 07:26:26 +08:00
Tobias Markus
d8cce95b0e Add forgotten override's where necessary 2016-02-21 01:36:15 +01:00
Benau
71c1fadcd3 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-16 09:57:41 +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
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
Benau
80152d2989 Clean up 2016-02-11 10:05:40 +08:00
Benau
3f89512b34 Remove most isGhostKart() hack when avoidable 2016-02-11 09:01:09 +08: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
ee320588d5 Merge remote-tracking branch 'origin/master' into support_nw_splitscreen 2016-02-09 17:40:59 +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
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
38eeddd4e8 No reference for int and float 2016-02-04 09:51:59 +08: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
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
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
hiker
560ff7cee4 Moved ActivePlayer out of Controller and into LocalPlayerController. 2016-01-18 16:47:48 +11:00
Benau
606add8605 Use back billboard arrow 2016-01-18 09:50:55 +08: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
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
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
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
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
f5438c433c Removed unused variable. 2016-01-07 17:07:04 +11:00
hiker
b8ed2025ed Merge remote-tracking branch 'origin/master' into refactor_networking 2016-01-06 17:53:45 +11:00
Benau
347c608867 Final clean, put every kart location in three strikes battle world 2016-01-05 13:15:50 +08:00
Benau
87df259f48 Cleanup controller, plus better logic in updateKartNodes 2016-01-04 14:28:06 +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
hiker
68e37c902f Merge remote-tracking branch 'origin/master' into refactor_networking 2015-12-15 22:52:55 +11:00
hiker
dbd210d08c Renamed PlayerController into LocalPlayerController. 2015-12-10 17:54:29 +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
Benau
152dddc110 Fix potential hang after end race in temple arena 2015-12-08 00:44:28 +08: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
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
Flakebi
aea68a2c14
Remove characteristics from kart 2015-11-29 04:08:12 +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
ffa85d2206 Merge remote-tracking branch 'upstream/master' into kart-properties 2015-11-21 23:03:58 +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
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
5fc830825f Refactoring: Created a separate NetworkConfiguration class which stores 
all information to create the STKHost.
 2015-11-12 09:53:12 +11:00
hiker
4aea491ed0 Merge remote-tracking branch 'origin/master' into refactor_networking 2015-10-31 11:41:43 +11:00
hiker
6297d8c65d Removed NetworkManager and ClientNetworkManager. 2015-10-27 08:23:59 +11:00
hiker
1e9afd473d Removed isClient/isServer from NetworkManager. 2015-10-26 21:30:41 +11:00
Marianne Gagnon
f9f9b660d3 Rename profiler marker to clarify what it measures 2015-10-25 21:21:05 -04:00
Flakebi
5e6e85ab79 Merge branch master into kart-properties 2015-10-03 15:20:06 +02:00
hiker
267e6963c2 Fixed #2294 (crash when kart is off road and not on material). 2015-08-26 17:15:59 +10:00
Flakebi
586724c855 Merge branch 'master' into kart-properties 
Conflicts:
	src/karts/kart.cpp
 2015-08-19 12:03:43 +02:00
hiker
6139d689d7 Fix #2176 - rank jump on Northern Resort: this was fixed by not 
adjusting the distance a kart has travelled on the road if the
kart is flying and over a reset texture (previously stk would fine
a quad way ahead of the kart, and a much greater distance along
track, which caused the kart to be ahead for a few frames, before
it was rescued and reset to its original position).
 2015-08-19 13:05:01 +10:00
Flakebi
80a649fc2d Merge branch 'master' into test 
Conflicts:
	src/utils/string_utils.hpp
	src/utils/translation.cpp
 2015-08-17 00:22:02 +02:00
Flakebi
b51eadae28 Merge branch 'master' into kart-properties 2015-08-16 16:45:47 +02:00
Marianne Gagnon
6529381acd Fix rescue code in tutorial mode, fixes #2279 2015-08-10 19:01:58 -04:00
Marianne Gagnon
d488c043d1 Continue work on scripting, fixing #2268. Use this as an opportunity to clean up a lot of old hardcoded overworld code, and replace it with cleaner scripting. Make sure to update SVN and the exporter (other commits in SVN coming soon) 2015-08-09 21:38:01 -04:00
hiker
a81366c414 Removed rescue-code duplication in battle mode and soccer mode. 2015-07-31 16:27:52 +10:00
hiker
25c1880c18 Fixed rescue in soccer mode (which would previously used World's 
moveKartAfterRescue, not its own custom function).
 2015-07-31 07:49:54 +10:00
hiker
7799e9835d Added a getStartTransform function to World. Use this to change 
the start position of the non-leader karts in a FTL race, so that
those karts now start at the end of all start positions, and not
directly behind the leader.
 2015-07-30 17:12:48 +10:00
hiker
b18d0275fd Display a finish (survival) time in FTL result screen. 2015-07-29 17:27:43 +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
hiker
3f468b254c Removed unused/duplicated code, use World::setKartPosition instead 
of Kart::setPosition (since this will keep an index array up-to-date).
 2015-07-29 07:59:46 +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
hiker
622d0821cf Fixed rescue (which my previous commit broke). 2015-07-24 21:38:35 +10:00
Marianne Gagnon
5c27769ceb Fix uninitialized variable use, fixes #2179 2015-07-23 19:52:30 -04:00
Marianne Gagnon
3cb57358a3 Fix #2242 2015-07-16 19:38:34 -04:00
Marianne Gagnon
77fac34e41 More cleanup to remove hardcoded things in favor of scripting, and start work to allow for more action trigger shapes (work in progress) 2015-07-13 20:27:16 -04:00
Flakebi
9fc6f84545 Switch from properties to characteristics 2015-07-11 19:22:27 +02:00
Flakebi
1ceab872b1 Remove PlayerDifficulty class 2015-07-11 16:16:40 +02:00
Marianne Gagnon
b73469caf1 Extend scripting API with random and timeout functions 2015-06-21 19:44:22 -04:00
Marianne Gagnon
32edaa25fe Adjust load and cleanup sequence for scripts, enabling scripts in library objects 2015-06-09 20:24:17 -04:00
Flakebi
4b55526525 Clean more stuff for the new insertValues 2015-04-24 01:58:19 +02:00
hiker
8d07d26c25 Updated (c) year to include 2015. 2015-03-30 11:42:50 +11:00
Flakebi
06c8089dfc Fribidize more strings 2015-03-30 01:22:57 +02:00
hiker
58d9853542 Added debug name to tires dropped in battle mode. 2015-02-26 09:36:08 +11:00
hiker
4e88cb6753 Fixed #1978 (by removing unnecessary stopMusic in World, which actually 
stops the menu music, not the tutorial music. It's unnecessary since
startMusic (main menu) later will first stop currently running music.
 2015-02-12 16:56:25 +11:00
hiker
ec598d6f41 Start music properly in thread, avoid starting track music more than once. 2015-02-10 17:07:46 +11:00
Flakebi
f86a92286c Set the music before updating to fix -N too 2015-02-09 01:56:56 +01:00
Flakebi
4abe3ce327 Make music and sound work with fast starts, fixes #1291 2015-02-09 01:22:47 +01:00
hiker
ca2b5335dc Removed hopefully unnecessary string copy. 2015-02-08 22:22:06 +11:00
hiker
33cb6d9356 Merge branch 'clang-fix' of https://github.com/Flakebi/stk-code into Flakebi-clang-fix 2015-02-08 22:12:39 +11:00
Flakebi
31d4c34fbb Improve clang bugfix 2015-02-05 15:18:57 +01:00
Flakebi
38f0e31a48 Fix clang build, freeing memory too early 2015-02-05 02:58:55 +01:00
hiker
eb37092643 Moved all remaining music commands to be handled by sfx thread. 2015-02-04 17:08:22 +11:00
hiker
b9a7c11dab Removed unnecessary #includes. 2015-02-03 14:30:18 +11:00
Vincent Lejeune
8798eda41b Remove hardware skinning files 2015-01-11 00:59:09 +01:00
Flakebi
fbba008a1a Restore ancient behaviour 2014-12-22 23:12:20 +01:00
Flakebi
57958aba36 Merge branch 'upstream/master' into fixes 2014-12-19 23:02:41 +01:00
hiker
3c6204732e Switch to fast music immediatley on lastp lap, and not only 
when 30 seconds are left.
 2014-12-10 17:02:39 +11:00
Flakebi
abc8394801 Fix two little glitches in intro and outro scenes 2014-11-27 15:20:12 +01:00
Marianne Gagnon
229a43a692 Preserve "startedFromOverworld" flag value properly. Fixes #1683 2014-11-17 19:07:37 -05:00
Flakebi
be999895b4 Remove some unused code 2014-11-17 00:08:47 +01:00
Vincent Lejeune
d5330a8f39 Fix VS2013 "dereferencing null ptr" static analysis error 2014-11-16 04:40:19 +01:00
Flakebi
abf7bacfea Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	src/graphics/stkmesh.cpp
	src/states_screens/kart_selection.cpp
 2014-10-31 16:47:34 +01:00
hiker
f7d767e57b Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-28 09:47:28 +11:00
Marianne Gagnon
139f20b39d Merge remote-tracking branch 'sachith/ScriptEngine' 
Conflicts:
	CMakeLists.txt
	sources.cmake
	src/io/file_manager.cpp
	src/io/file_manager.hpp
	src/modes/world.hpp
	src/tracks/track.hpp
	src/tracks/track_object_presentation.cpp
 2014-10-27 18:43:09 -04:00
hiker
9e9ce47a2b Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-28 09:02:35 +11:00
Marianne Gagnon
32c5d79e26 World : do not self-destruct until everything completely done 2014-10-26 19:05:07 -04: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
hiker
ec908d85c6 Split GamepadDevice and KeyboarDevice from input_device into their 
own files. Renamed InputManager::getDeviceList() to getDeviceManager().
 2014-10-25 23:09:00 +11:00
Marianne Gagnon
047c6fc760 Add debug name to meshes and mesh buffers, helps debugging 2014-10-24 19:25:24 -04: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
hiker
9dff5a7990 Fix potential memory overwrite in soccer mode when using one player 
only (artist debug mode).
 2014-10-20 23:01:31 +11:00
hiker
e4e0724cb9 Removed unnecessary stop of music (music will stop anyway once the 
buffer is finished, but if music is completely threaded it might
just keep on playing).
 2014-10-16 17:03:13 +11:00
hiker
bba7156aff Handle the setting of the listener position in the sfx thread. 2014-10-15 23:42:59 +11:00
hiker
665f146923 Moved SFXStatus enum to SFXBase. 2014-10-14 08:05:04 +11:00
hiker
bfe84612fa Let all SFX commands be handled by the sfx manager thread (otherwise 
events could be handled in the wrong order, e.g. a delete from the
main thread before the play in the manager thread, resulting in a crash).
Should fix #1511 and #1604.
 2014-10-13 08:26:45 +11:00
Flakebi
dc78c35b50 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/karts/kart.cpp
 2014-10-05 12:10:39 +02:00
Vincent Lejeune
b56901bacd Fix minimap halo second time it is rendered. 2014-10-04 01:42:25 +02:00
Flakebi
47da30dd24 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-30 19:22:18 +02:00
Deve
d0e30c15a5 Reset counter when game is restarted 2014-09-29 21:56:32 +02:00
Deve
1c97476369 Display wrong way message after a delay. 2014-09-29 20:21:05 +02: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
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
hiker
86b351fbf4 Turn sfx_manager into a singleton. 2014-09-17 21:38:21 +10:00
Flakebi
9bcc76127f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-17 13:20:09 +02:00
Marianne Gagnon
3536e13c49 Tweak fade-in/fade-out times in cutscenes and remove hardcoded values 2014-09-14 19:06:19 -04:00
Vincent Lejeune
349a64ae8d Revert "Use a parallel loop for IA" 
This reverts commit 8e333afa99.
 2014-09-13 01:32:40 +02:00
Vincent Lejeune
d480c52f8c Revert "Try to put IA in its own thread" 
This reverts commit 2a60a84155.
 2014-09-12 23:22:54 +02:00
Vincent Lejeune
2a60a84155 Try to put IA in its own thread 2014-09-12 23:04:40 +02:00
Vincent Lejeune
8e333afa99 Use a parallel loop for IA 
It sighltly helps decreasing stuttering in some area of chocolate.
 2014-09-12 19:10:22 +02:00
Sachith Hasaranga Seneviratne
b6a9e5be9c Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-09-10 17:15:01 +05:30
Flakebi
9c911a2891 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-09 12:07:34 +02:00
Marianne Gagnon
5ac75b915a Find better names for markers 2014-09-07 18:56:21 -04:00
Marianne Gagnon
01d114329f Add profiler markers in race update 2014-09-07 18:54:36 -04:00
Sachith Hasaranga Seneviratne
118db58a02 Merged Master 2014-09-07 11:28:15 +05:30
Flakebi
a31ec772ff Replace accidently placed tabs 2014-09-02 03:57:48 +02:00
Flakebi
48323d4456 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-02 03:57:21 +02:00
Deve
57240124ba Rename rain class to weather 2014-09-01 20:18:06 +02:00
Deve
7d0dec5c49 Handle lightning and sound in weather property 2014-09-01 20:18:06 +02:00
Flakebi
dc4a30202f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-01 11:31:26 +02:00
Deve
47b46558f2 A bit better formatting in world status 2014-08-30 18:37:57 +02:00
Deve
507d9566a0 Don't start rain sound too early 2014-08-30 18:37:57 +02:00
Deve
d8f61e336e Move creating rain to world class because now it doesn't depend on cameras. 2014-08-30 18:37:57 +02:00
hiker
84e78d884a Merge remote-tracking branch 'origin/master' into no_floating 
Conflicts:
	src/karts/kart.cpp
 2014-08-22 12:23:55 +10:00
Marianne Gagnon
c8b50c67ef Fix leak 2014-08-20 20:38:05 -04:00
hiker
210a8e7ae9 Set the graphical suspension depending on physical suspension (capped). 
Adjusted graphical chassis to be 0.1 higher to have similar look at previously
and avoid graphical chassis going into terrain,
 2014-08-20 22:19:26 +10:00
nixt
1f435142db Merge remote-tracking branch 'upstream/master' into walldriving 2014-08-02 02:36:35 +05:30
Sachith Hasaranga Seneviratne
c3a774fcc9 Merged master 2014-08-01 18:40:05 +05:30
nixt
f40fb50386 Fix "Wrong Direction" message 2014-08-01 04:01:28 +05:30
nixt
fbf002bfc6 Disable debug messages 2014-07-31 18:15:37 +05:30
Marianne Gagnon
3db9b867a6 In artist debug mode, fast-track race start even more, tired of waiting after thunderbird to test 2014-07-28 19:16:32 -04:00
Vincent Lejeune
bd7babe11f Rename cpp2011.h 2014-07-29 00:35:43 +02:00