Commit Graph

18388 Commits

Author SHA1 Message Date
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
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
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
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
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
Benau
baff519a21 Use the correct vertex color for rubber band 2018-02-01 11:28:38 +08:00
Benau
e06fabde96 Clean up alpha test and unlit shader
Remove 1 wrong line in alpha test shader
2018-02-01 11:26:58 +08:00
Benau
4dd6f75998 Rename wrong profiler item 2018-01-31 10:31:25 +08:00
Deve
50ad5eed33 Try to fix VS build 2018-01-30 23:44:55 +01:00
Deve
4529189048 Upgrade enet 2018-01-30 23:10:30 +01:00
Deve
fc15a33a39 Add an option to use system enet.
Atm. use it only on linux, because there is no need to spam with cmake warnings on other platforms.
Also fallback to built-in enet if system enet is not found.
2018-01-30 22:57:40 +01:00
Igor Gnatenko
810df68f9c Unbundle ENet
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
2018-01-30 22:29:38 +01: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
Deve
853084e75a Fixed mingw compilation 2018-01-29 22:14:43 +01:00
Deve
3345fa6e51 Try to fix travis.
It reverts commit:
https://sourceforge.net/p/angelscript/code/2278/

It looks that it's impossible to detect "real" clang version using compiler definitions, so that we can't check if std::is_trivially_default_constructible is available.

I mean that clang 4.0 on my machine is "newer" than clang 5.0 on travis, because it tries to use gcc 4.8 headers:

/usr/lib/gcc/*x86_64-linux-gnu/4.8*/../../../../include/c++/4.8/type_traits:1211:12:
note: 'has_trivial_default_constructor' declared here
    struct has_trivial_default_constructor

At this stage we can just disable AS_CAN_USE_CPP11 for clang. It was disabled for clang before our angelscript upgrade, so that it's not worse than before.

Note that I don't use clang and I don't really know what are our requirements (for example for Mac OS build). Feel free to revert it after travis upgrade.
2018-01-29 20:48:15 +01:00
Magne Djupvik
748a65c013 Made Old Mine Expert challenge a bit more challenging. 2018-01-29 18:51:43 +01:00
Magne Djupvik
6ac36f8117 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2018-01-29 16:53:26 +01:00
Magne Djupvik
b5d2ce4850 Added back 5 seconds to challenges after feedback. 2018-01-29 16:52:18 +01:00
Deve
1979298b06 Use pkgconfig only on linux 2018-01-28 21:39:21 +01:00
Benau
f0c03b317e Use std::make_tuple instead of list initialization 2018-01-29 00:08:28 +08:00
Magne Djupvik
ad2665c641 Made Northern Resort and Blackhill Mansion Expert challenges more difficult. 2018-01-28 15:17:27 +01:00
Benau
11f9b74e13 Don't use out variable in vertex shader 2018-01-28 15:28:20 +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
0003b39d31 Install appdata file in correct directory.
As reported on Debian:
https://lintian.debian.org/tags/appstream-metadata-in-legacy-location.html
2018-01-26 22:33:37 +01:00
Deve
8cd6f61e44 Restore information about license 2018-01-26 22:18:22 +01:00