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

13796 Commits

Author SHA1 Message Date
Benau
8daebe06e1 Allow creating wan server in command line 
It can only be used with a saved online player, also fix a weird
crash if server failed to create (wan is NULL)
 2018-02-20 15:11:58 +08:00
Benau
22c755a328 Show protocol name when it is terminated (easier for debugging) 2018-02-20 13:33:43 +08:00
Benau
14b401b54e Use std atomic for server state 2018-02-20 11:14:57 +08:00
Benau
04a6f6d08b Warn user about multiple instance of STK server 2018-02-20 10:11:09 +08:00
Benau
3223d05c6c Merge remote-tracking branch 'origin/master' into network_improvements 2018-02-20 00:14:29 +08:00
Benau
4ab823cfbc Move lan network socket to thread main loop, fixed leaking of it too 
Also call enet_deinitialize when destroy STKHost
 2018-02-19 11:36:32 +08:00
Benau
e393e3d4f0 With shared_ptr protocol is not leakable 2018-02-18 14:50:06 +08:00
Benau
e52ab5888c Don't crash when close STK window directly 2018-02-18 14:13:24 +08:00
Benau
c5b986e874 Allow going back to online menu if server connection is lost 2018-02-18 14:06:17 +08:00
Benau
6fd7fb0e0e Allow reconnecting to lan servers as many time as possible 2018-02-18 13:24:29 +08:00
Benau
0a5c1a69c7 Use shared_ptr for protocol to avoid leaking 
With weak_ptr it's also possible to auto clear LobbyProtocol when
STKHost is shutdown
 2018-02-18 12:39:05 +08:00
Benau
bcf8e4e5fe Allow shutdown STKHost from dialog 2018-02-17 16:25:53 +08:00
Benau
4c1cc50955 Don't pause timer in network as it breaks rewind 
Also remove the unneed protocol manager checking
 2018-02-17 15:38:56 +08:00
Benau
372753f505 Use atomic flag to start / stop listening thread 2018-02-17 11:40:48 +08:00
Benau
cfeadf335c Move some code to header 2018-02-17 10:51:33 +08:00
Benau
c5788a2c90 Move the cleaning of events to destructor of protocol manager 
So that the last one who deletes it can clear all the remaining data
properly (ie if it's STKHost listening thread)

Remove the assert in async update thread as it may not be true for
the first thread creation
 2018-02-16 00:48:27 +08:00
Benau
05f7c014dd Create a prototype for thread-safe protocol manager 
Using weak and shared_ptr, if !lock(), than it was atomtically
destroyed
 2018-02-15 16:47:04 +08:00
Benau
3d8efcdfa1 Use >= for counter in case of some peer disconnect in between for completing race end 2018-02-15 15:33:18 +08:00
Benau
fa2a8bccd3 Reset available karts and tracks each selection 2018-02-15 14:07:58 +08:00
Benau
20a2bc3bbb Terminate controller and game event protocols when exit result screen 2018-02-15 13:28:28 +08:00
Benau
e7d3658a53 Merge remote-tracking branch 'origin/network_improvements' into game_protocol 2018-02-15 10:36:14 +08:00
hiker
c0333fe0f7 Bugfix: TimeInfo objects were missing for substeps, resulting in 
very stuttering game play.
 2018-02-15 10:06:13 +11:00
Deve
959f33223e Enable multitouch gui only if touchscreen is available 2018-02-14 22:28:55 +01:00
Benau
469f7d2fc5 Drop player if he has incompatible karts / tracks 2018-02-14 12:23:05 +08:00
auria.mg
e26239e364 Improve the input sensing text to be a bit clearer 2018-02-13 20:35:07 -05:00
hiker
4bd7848431 Removed duplicated update of the ProtocolManager, and only 
update it when STKHost exists (otherwise STK will crash since
ProtocolManager can get called when it does not exist).
 2018-02-14 09:27:13 +11:00
hiker
2a30f75b78 Avoid crash that can happen if the first DT is large and event 
happens during that time.
 2018-02-14 09:20:45 +11:00
hiker
df5adbc320 Fixed comment. 2018-02-14 09:20:27 +11:00
Benau
8a1ef31f4a Allow remove unusable karts or tracks in network game 2018-02-14 01:57:05 +08:00
Benau
46416781fa Make it possible to restart race after going back to lobby 
At the moment the token is reset by client after each restart
 2018-02-13 15:20:55 +08:00
auria.mg
196b5a2bbe Minor ajustments to kart color screen, make kart slightly bigger, make XML cleaner 2018-02-12 20:22:35 -05:00
auria.mg
ceeb79f3a4 Restore accidentally removed resolution ajustment in kart color selection screen 2018-02-12 20:16:31 -05:00
auria.mg
2830dabfc1 Improve kart color selection screen, fixes #3122 2018-02-12 20:08:51 -05:00
hiker
26401972d2 Merge branch 'fix-timestep' into game_protocol 2018-02-13 08:41:49 +11:00
Deve
4cc57dd754 Fixed a crash when logging long messages 2018-02-12 21:31:32 +01:00
hiker
000b613b8b Fixed compiler warnings. 2018-02-12 18:10:52 +11:00
hiker
4ce66e754b Fixed compiler warnings. 2018-02-12 18:07:51 +11:00
hiker
fa20e4f866 Only issue sfx commands once per rendered frame (during the last 
substep).
 2018-02-12 18:01:05 +11:00
hiker
c7bc47f2e3 Fixed world update to be fixed at the physics frame rate. 2018-02-12 09:54:46 +11:00
hiker
4d03fbd1fb Made the physics time step size configurable in the config file. 2018-02-12 08:23:06 +11:00
Benau
971db902a8 Fix queries stop working after changing resolution 2018-02-11 15:06:35 +08:00
Benau
0e3398a46b Use eglGetProcAddress for debug function 2018-02-11 14:56:43 +08:00
Benau
7ebc33bcaa Fix server only build 2018-02-11 02:03:09 +08:00
Benau
b42c540eed Allow to save current GPU query string to apitrace 2018-02-11 01:53:30 +08:00
hiker
37d81be033 Made the physics time step size configurable in the config file. 2018-02-10 17:55:45 +11:00
hiker
4f54fb7898 Avoid crash in history replay (dirty workaround), 2018-02-10 17:51:12 +11:00
hiker
52e9330212 Removed debug output. 2018-02-10 17:34:10 +11:00
Benau
3290321c5d PlayerController can become EndController anytime 2018-02-09 18:00:19 +08:00
Benau
366313d29d Avoid an unknown value from attachment rewind 2018-02-09 17:59:48 +08:00
hiker
434a9c5dcc Fixed compiler warnings. 2018-02-09 16:14:38 +11:00
hiker
4d75042f3b Fixed compiler warnings. 2018-02-09 16:12:44 +11:00
hiker
113e3c0c09 Merge branch 'game_protocol' of github.com:supertuxkart/stk-code into game_protocol 2018-02-09 16:09:39 +11:00
hiker
8eddff3e34 Merge branch 'speed-cap-to-physics' into game_protocol 2018-02-09 16:03:58 +11:00
hiker
b3243a3589 Merge branch 'speed-cap-to-physics' 2018-02-09 09:38:34 +11:00
hiker
6c0f97261a Fixed missing startup boost, improved maths to only use 
velocity in the current plane for boosting.
 2018-02-09 09:15:23 +11:00
Benau
9a5ce54c4f Merge remote-tracking branch 'origin/master' into game_protocol 2018-02-09 00:53:02 +08:00
Benau
7210992e3d Prevent local player == 0 when in network mode 2018-02-09 00:49:55 +08:00
Benau
19c705f27c Make wrong way message always centered, fix #3115 2018-02-08 13:15:22 +08:00
Ben Krajancic
d96b6b92ce Split screen regression fixes (#3116) 
* Fix lapcount

* Fix selection box color

* Fix messages on screen

* Fix scaling

* Fix for icons

* Styling fixes

* fix style issue

* Fix calls

* Final call fix
 2018-02-07 18:52:53 -05:00
Benau
0e5b7b532c Further boost stk by writing 1 less framebuffer attachment 
Now we can get determine the background color by depth, so
the alpha tricks in diffuse color fbo is not necessary

And using rgba8 to pack normal doesn't seem to cause visual glitches.
 2018-02-07 12:49:45 +08:00
hiker
777435fb35 Merge branch 'master' of github.com:supertuxkart/stk-code 2018-02-07 09:58:22 +11:00
Deve
f101c9e366 Fixed android compilation 2018-02-06 23:17:34 +01:00
hiker
c37f2887c1 Fixed compiler warnings and coding style issues. 2018-02-07 08:54:15 +11:00
hiker
3788a3d90d Merge remote-tracking branch 'origin/master' into speed-cap-to-physics 2018-02-07 08:36:48 +11:00
hiker
a72ed7ef30 Merge branch 'master' of github.com:supertuxkart/stk-code 2018-02-07 08:34:51 +11:00
hiker
1f7350822c Added buffer flushing if a history replay is aborted. Don't print 
data to stdout when using buffering (since it slows down flushing).
 2018-02-07 08:32:22 +11:00
hiker
5a07739786 Prevented a crash when aborting STK (audio thread is not shut down 
in this case, but is getting deleted - but the audio thread might
still try to insert an update event during that time).
 2018-02-07 08:22:19 +11:00
Ben Krajancic
0f3518e71b Unlimited Split-Screen (#3104) 
* Initial SplitScreen

All are upside down and player 1, 5 player does 6 even...

* Working version of splitscreen

* black screen fix

* te fix

* Update race_gui.cpp

* Change item

* wrong way fix and refactorings

* Fix icon scale, cleaning code for lap count

* Remove tabs

* Add settings option

* Fix FOV

Right now the FOV gradually  decreases when going from 1,2,3,4 players. Then after 4 players it wont drop any lower. This behaviour can easily be replaced in the future

* Prevent overflow

* Unlimited splitscreen

* Space out duplicate skins across additional players

* Update stk_config.cpp

* Update irr_driver.cpp

* Update options_screen_ui.cpp

* Update irr_driver.cpp

* Update options_screen_ui.cpp

* Update race_gui.cpp

* Update irr_driver.cpp

* Fix for empty pixels at edges

* Fix referring to template not int

* Fix compile errors

* Progress towards fixing selection screen

* Begin process for selections

* Fix selection screen for >4 people

Important GUI changes included

* Disable changing rows/cols ingame

* fix sp related crash

* Styling fixes
 2018-02-05 20:01:32 -05:00
hiker
2e3e594967 Merge remote-tracking branch 'origin/master' into speed-cap-to-physics 2018-02-06 11:27:02 +11:00
Ben Krajancic
0c171bfc8d Better rescue (#3106) 
* Half of the rescue animation is now placing the kart back down

* Bit of cleaning

* Single Camera Cut

* Update rescue_animation.hpp

* Update rescue_animation.cpp

* progress to fixes

* potential fix

* broken implementation

* Latest attempt

* Instant camera snap when placing the kart down

* style cleanups

* Fix BACKSLASH

HYEH
 2018-02-05 19:04:00 -05:00
hiker
d5938a2447 Replaced old zipper handling in physics with minSpeed setting. 2018-02-06 08:51:17 +11:00
hiker
1c2fdc1c14 Fixed compiler warnings. 2018-02-06 08:29:18 +11:00
hiker
884e966ab9 Added capability to handle setting the maximum speed first to 0, and then 
later to a higher value (which happens in overworld, which sets max speed
to 0, but the value got later overwritten with the normal supertuxkart max_speed
handling.
 2018-02-05 16:11:19 +11:00
hiker
baa0677b1a Handle max- and min-speed capping in phyiscs (which is frame rate 
independent).
 2018-02-05 15:57:40 +11:00
hiker
55159fbdcd Prevented a crash when aborting STK (audio thread is not shut down 
in this case, but is getting deleted - but the audio thread might
still try to insert an update event during that time).
 2018-02-05 09:39:40 +11:00
Deve
ff884852d7 Don't hardcode stk data dir on android 2018-02-03 22:18:42 +01:00
Benau
01c2680f73 Fix runtime typo 2018-02-04 01:07:42 +08:00
Benau
ac8294abdb Clean up debug visualization 
Allow toggle (triangle) normal / (bi)tangent / wireframe separately
 2018-02-03 13:14:15 +08:00
Benau
9d9502e99c Move glBindVertexArray(0) to a better place for deferred enabled 2018-02-03 11:27:53 +08:00
Benau
e81e16c6da Fix possible vao crash 
Some bindbuffer later will invalidate the previous bound vao
 2018-02-02 13:41:11 +08:00
Benau
b26e62322f Fix polycount without artist debug mode 2018-02-02 12:08:36 +08:00
hiker
c201483f5b Merge branch 'master' of github.com:supertuxkart/stk-code 2018-02-02 13:09:15 +11:00
hiker
f29da60ac4 Coding style fixes. 2018-02-02 09:45:15 +11:00
hiker
59f28d3746 Fixed line ending style. 2018-02-02 09:16:34 +11:00
Benau
a137665916 Fix god rays in split screen 
Also use rgba8 fbo for the glowing of sun
 2018-02-01 15:39:06 +08:00
Benau
dbb82fea94 Clear default framebuffer when drawing from our rtt for first cam 
Also remove unused IReferenceCounted in post processing
 2018-02-01 13:46:42 +08:00
Benau
baff519a21 Use the correct vertex color for rubber band 2018-02-01 11:28:38 +08:00
Benau
4dd6f75998 Rename wrong profiler item 2018-01-31 10:31:25 +08:00
leper
47dc4bdbaa Remove enet modifications. Fixes #21. 2018-01-30 22:06:07 +01:00
Benau
154ad8d0db Fix skybox blending with light scatter 2018-01-31 01:31:12 +08:00
Benau
af6b075450 Clear stencil buffer when possible 2018-01-30 14:49:26 +08:00
Benau
9399db6eba Split glow to avoid re-bind color framebuffer 2018-01-30 14:25:50 +08:00
Benau
9e57bfb73f Split point light scatter so it can be combined together 2018-01-30 13:42:50 +08:00
Benau
9ebcdc5af3 Set DeviceManager assign more to ASSIGN in network kart selection 
Because input manager use this to determine backspace functionality
(for rescue in game or leave a screen)

This will be reset to NO_ASSIGN when you go back to main menu screen
 2018-01-29 14:50:29 +08:00
Benau
f0c03b317e Use std::make_tuple instead of list initialization 2018-01-29 00:08:28 +08:00
Benau
9737c2f950 Further clean up framebuffer 
Avoid using hdr framebuffer in displace and glow

Also remove stencil test in mlaa (in the pass no stencil buffer
exists in FBO_MLAA* anyway)
 2018-01-28 15:10:17 +08:00
Benau
ccc83a28f2 Clean up rtts and framebuffers 
Use rgba framebuffer for tonemap and later, don't create
unnecessary rtts.
 2018-01-28 14:07:03 +08:00
Ben Krajancic
f6f051e85b Consistent split screen (#3105) 
* Splitscreen positions are now consistent across rounds

* Fix tabs

* Remove unnecessary comments
 2018-01-27 19:27:17 -05:00
Deve
8cd6f61e44 Restore information about license 2018-01-26 22:18:22 +01:00
Deve
0532a41ab3 Convert tabs to spaces 2018-01-26 22:03:04 +01:00