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

18626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Deve
0532a41ab3 Convert tabs to spaces 2018-01-26 22:03:04 +01:00
Deve
5aaf3a9c39 Comment out unused wayland code to avoid compilation errors with clang 2018-01-26 21:41:39 +01:00
Deve
4802c4d11c Avoid cmake warning 2018-01-26 21:20:33 +01:00
Igor Gnatenko
aec7ca0ce9 libs: update angelscript to 2.32.0 
Fixes: https://github.com/supertuxkart/stk-code/issues/2528
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
 2018-01-26 21:19:01 +01:00
Sam
c4b42c1852 Add layer of abstraction to output pbrData 2018-01-26 20:16:16 +01:00
Sam
f5a0e6477e put the correct convention 2018-01-26 11:10:16 +01:00
Sam
e75f1cb799 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2018-01-26 10:52:23 +01:00
Sam
a1c9ad107f Add the possibility to disable an object for shadow pass 2018-01-26 10:51:42 +01:00
Benau
a10b62b894 Use SPTextureManager to get displace.png 
This will allow using texture compression for it
 2018-01-26 16:02:51 +08:00
Benau
97fd634ed8 Allow auto-add usable uniforms to shader 2018-01-26 16:02:31 +08:00
Benau
9e2d649b55 Warn for failed shader compile or link in GUI when artist debug mode 2018-01-26 16:02:00 +08:00
Deve
313661ad07
Merge pull request #3107 from andy5995/spelling 
README.md:correct spelling of 2 words [skip ci]
 2018-01-26 06:11:12 +01:00
andy5995
cf6b3a2640
README.md:correct spelling of 2 words [skip ci] 
Corrections:

* Dependencies
* aforementioned
 2018-01-25 21:04:58 -06:00
Deve
74af810d50 Fixed compilation error. 
It was failing with "'this' was not captured for this lambda function"
 2018-01-25 21:43:19 +01:00
Benau
9041649a39 Don't check for reference counting in shader mananger 
It will not be 1 if there are fallback shaders
 2018-01-25 15:51:28 +08:00
Benau
297c66bf04 Remove unused cpp and hpp files 2018-01-25 15:41:30 +08:00
Benau
2448b10cd4 Fix correct spelling of deferred 2018-01-25 15:38:10 +08:00
Benau
ff38cb6423 Clean up advanced pipeline off code 
Don't use RTT at all in game when it's off
 2018-01-25 15:36:34 +08:00
Sam
37a6f464b9 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2018-01-24 21:51:11 +01:00
Benau
5b4be274fb Some more fallback for legacy pipeline 2018-01-25 01:51:10 +08:00
Benau
6bcee60a1c Merge remote-tracking branch 'origin/master' into game_protocol 2018-01-24 10:20:06 +08:00
hiker
e9f9302c2f Added simple script to extract only the data rendered on the client. 2018-01-24 12:38:54 +11:00
hiker
226ff0cea2 Added simple script to extract useful data from a client 
and server run.
 2018-01-24 12:38:26 +11:00