Commit Graph

18626 Commits

Author SHA1 Message Date
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
Deve
a18351c052 Some fixes for gamepad buttons 2018-02-08 22:34:53 +01: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
Deve
5e8343a068 Add basic gamepad support for android 2018-02-08 01:24:35 +01: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
samuncle
704fe3e32a Fix a bug in the emissive contribution. Now there is a bigger range of value for bloom 2018-02-06 23:15:21 +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
Deve
a755dae85f One more fix for android tv 2018-02-06 22:35:46 +01:00
Deve
8fd52cd8e3 Fixed android compilation with different sdk version 2018-02-06 22:35:46 +01: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
Deve
8742420c23 Allow to navigate with dpad 2018-02-05 22:54:50 +01: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
Deve
14c7d757ad More work for android TV.
If you want to make better banner, then you are welcome!
2018-02-05 22:11:09 +01: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
12723239a7 Use higher target sdk version for android.
It should help STK on Android TV and it still works for me on Android 4.4 under emulator.
2018-02-04 22:37:02 +01: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
Deve
48cde3e041 Try to create 32bit visual for gles if 24bit failed.
People need it for Odroid boards.
2018-02-02 22:15:31 +01:00
Benau
a2052b77b9 Remove unneeded flat out
We can share the same uniform name, esp flat out is not working
for my adreno 306 in android 5.0
2018-02-03 00:21:59 +08:00
Benau
e3483fccbe Unroll the skinned mesh shader for loop
This give some fps improvement for adreno 306 in android 5.0
2018-02-02 21:59:13 +08:00
Benau
e4c827176a Remove flat for hue_change
It causes bad rendering in adreno 306 in android 5.0
2018-02-02 21:17:24 +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
Deve
8771c77689 Allow to use dependencies for vs and mingw without changing the names every time.
Now there are:
- dependencies-vs
- dependencies-vs-64bit
- dependencies-mingw
- dependencies-mingw64

And if it's not found, then fallback to:
- dependencies
- dependencies-64bit

So that if you use only one compiler, then you can just still use "dependencies" or "dependencies-64bit".

And I didn't restrict it to WIN32 only, because in theory it should be possible to put there openglrecorder for linux build.
2018-02-01 21:36:28 +01: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