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

19321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benau
e28fbdd019 Increase vote timeout to 20 second, and offer a way to end vote early 
After half voting time and all entries in voting table has > 50%
agreement out of current connected peers, go on
 2018-05-11 10:37:31 +08:00
hiker
d88ce3b3b6 Removed unused code, coding style fixes. 2018-05-11 09:41:46 +10:00
hiker
b77a76dd8c The ItemManager must be updated even if no event is received (to 
rewind item states to the rewind time).
 2018-05-10 23:25:04 +10:00
hiker
5f8dc7b641 Added debug comment to let the server not connect any items 
(--> client predictions wrong, useful for debugging).
 2018-05-10 23:24:07 +10:00
hiker
ff6d5119b4 CLients now predict item (predictions are not synched with server, 
so the item will chance once the server update is received atm).
 2018-05-10 23:23:23 +10:00
hiker
8f2b991e6a Code cleanup. 2018-05-10 09:31:21 +10:00
Deve
15f79b0f95 Add key binding for azerty layout 2018-05-09 21:11:24 +02:00
hiker
4e37c1388b Item collection on a client now works, though it is not predicted yet. 
Other things (dropping bubble gum, switch, synchronised banana collection)
still do be done.
 2018-05-10 01:09:23 +10:00
hiker
031eb461a3 Removed debug output. 2018-05-10 01:07:41 +10:00
hiker
c98df155a6 Change item visibility always in Item::updateGraphics, which (except 
for listener) makes it unnecessary to call collect for Item (only
for ItemState).
 2018-05-10 01:05:38 +10:00
hiker
85eb59c6af
Merge pull request #3232 from STK-helper/MiniMap 
Increase minimap size and reduce its aliasing
 2018-05-09 15:39:19 +10:00
Deve
fe42da5b04 Avoid conflicts with key codes when fallback keycode is used 2018-05-08 21:59:11 +02:00
Deve
78d9f2065c Add some key names for azerty layout 2018-05-08 21:22:46 +02:00
hiker
e1530267f3 Fixed compilation error and some warnings. 2018-05-09 00:48:20 +10:00
hiker
3f96ba2b93 Added nitro amount to state. 2018-05-08 20:51:35 +10:00
hiker
9d60112e65 Started to implement proper item handling: the server now sends 
updates of all collected items to the clients as part of a state.
A client confirms the received states. Once all clients have
confirmed a certain event, that event is deleted on the server
and not sent anymore. WIP, item collection kind of works, but only
because of kart state updates which include attachment (but not
e.g. nitro).
 2018-05-08 19:12:06 +10:00
hiker
356680b182 Removed debug prints. 2018-05-08 18:41:37 +10:00
Alayan-stk-2
473732b952
Add comment to clarify a if/else 2018-05-07 02:34:52 +02:00
Deve
20507424ee Don't draw spinner widget gauge for negative values 2018-05-06 23:06:27 +02:00
Alayan-stk-2
20d36b6f1b Fix #3175 (#3243) 2018-05-06 22:26:21 +02:00
Alayan-stk-2
11c31bf205
Merge pull request #11 from supertuxkart/master 
Update fork
 2018-05-06 03:48:12 +02:00
Alayan-stk-2
267dfde46f Fix #3197 (#3238) 
* Add parameters for negative sound in nitro challenge

* Fix #3197
 2018-05-05 20:33:12 -04:00
Alayan-stk-2
7ee3d6576e
Use the new config options for display 2018-05-05 22:18:02 +02:00
Alayan-stk-2
086cc024e4
Add AI and player icon sizes as configurable 2018-05-05 22:12:05 +02:00
Alayan-stk-2
6ec7799a1d
Read minimap parameters 2018-05-05 22:06:21 +02:00
Alayan-stk-2
206bd0170a
New minimap stk_config parameters 2018-05-05 22:05:29 +02:00
Alayan-stk-2
bdf4c62abc
Add config option for minimap size 2018-05-05 21:25:31 +02:00
Alayan-stk-2
bc569b9e04
Display the minimap during the start countdown 
So the players (especially those not familiar with the tracks) can take a look at it before starting to race.
 2018-05-05 21:09:33 +02:00
auria.mg
f44fbbfdfb Fix code style 2018-05-04 18:50:47 -04:00
hiker
eb647124e8 Split the item update into update and updateGraphics() parts. 2018-05-04 16:41:03 +10:00
hiker
c7c061c7c1 Bugfix: all items were counted as easter eggs :) 2018-05-04 16:36:56 +10:00
hiker
3e518968b3 Added a generic collectedItem() virtual function to world 
instead of a special case of easter eggs only.
 2018-05-04 10:29:44 +10:00
hiker
10ce48b86f Moved notification of easter egg collectoin from Item to ItemManager. 2018-05-04 09:48:54 +10:00
hiker
5ba79bddd7 Removed m_confirmed, renamed m_disappear_counter to m_used_up_counter. 2018-05-04 09:31:50 +10:00
hiker
9392354663 Split Item into two classes: ItemState which contains the non-graphical 
and changing properties (e.g. collected,item type etc), and Item (using
ItemState as base class) which contains graphical and constant values.
 2018-05-04 01:01:15 +10:00
Qwerty Chouskie
b5067a935e Final? 2018-05-02 22:35:36 -07:00
Qwerty Chouskie
173702cca1 "skid0" effect 2018-05-02 22:23:16 -07:00
Qwerty Chouskie
ded672ea0d Remove no-longer-needed code 
It doesn't compile with this anymore, and the issue it fixed seems gone anyways.
 2018-05-02 18:39:47 -07:00
Qwerty Chouskie
b0c061290f Merge branch 'master' of https://github.com/supertuxkart/stk-code 2018-05-02 18:09:13 -07:00
hiker
7e9e258b17 Merge remote-tracking branch 'origin/move-handleMaterialSFX' 2018-05-03 10:23:51 +10:00
auria.mg
c6c005ded4 Revert "jgh" 
This reverts commit e1a1196a9f8f7ea8b1ba7101581f7077bafeddaf.
 2018-05-02 19:35:41 -04:00
auria.mg
e1a1196a9f jgh 2018-05-02 19:35:04 -04:00
Alayan-stk-2
74a77ed5ef
Cast width and height as floats before checking the ratio 2018-05-02 20:33:08 +02:00
Alayan-stk-2
d6c2cccccd
Reduce minimap size in splitscreen multiplayer 
It won't work very well with 8 players, but still slightly better than when it was always 100.
 2018-05-02 20:07:10 +02:00
Alayan-stk-2
bed03b2a43
Make minimap size 1.8 higher 
This factor has been chosen because :
1) It allows the toplist to be able to still display 10 karts (maximum number reached in story mode or in networking (currently 12 but will be 8-10 for release according to Benau))
2) This size should fit nicely in the android GUI.

Otherwise, there is still some margin before it hinders view in 4:3 resolutions.
 2018-05-02 19:40:00 +02:00
Alayan-stk-2
3d17e68c4e
Get a larger minimap texture to significantly reduce aliasing 2018-05-02 19:13:09 +02:00
Benau
a5b234ceef Reset player action in pause menu for network, fix #3230 2018-05-02 15:37:47 +08:00
Benau
f5035a00ea Allow showing paused dialog in network now it doesn't pause timer 2018-05-02 13:17:23 +08:00
Alayan-stk-2
022dd3e302 Fix handicap values (#3231) 
* Fix handicap values for slipstreaming

* Change bugged handicap value and double-effect values

* Add skidding to handicap, remove explosions
 2018-05-01 21:14:53 -04:00
Alayan-stk-2
179e825e60
Merge pull request #10 from supertuxkart/master 
Update fork
 2018-05-01 23:56:10 +02:00