Commit Graph

13217 Commits

Author SHA1 Message Date
Benau
ea58a736d5 Fix displace fallback in non-advanced pipeline 2017-08-28 13:04:41 +08:00
Benau
7b571de395 Fix the wrong "misuse"
Now you can play hot.ogg
2017-08-25 16:39:34 +08:00
Deve
6465cc4569 Minor fix in graphics restrictions.
Some android restrictions are very basic, eg. UniformBufferObject is disabled on whole platform. So make sure that it's not used on any exotic OS.
2017-08-23 21:18:45 +02:00
Benau
850afc8620 Allow using animated texture with displace shader
Plus some clean-up
2017-08-23 00:55:25 +08:00
Deve
6a03f147f6 Add a possibility to use ubo on gles.
Disabled by default on android, because it's been tested on only one device and it's a bit slower in most cases.
2017-08-22 00:02:34 +02:00
Benau
ad369b88da Remove .b3d usage in stk-code 2017-08-21 16:02:06 +08:00
Benau
a8e20101f8 Make SPM loader more portable (for stk-editor later)
Also allow calculating normal if required
2017-08-21 14:57:33 +08:00
Deve
d698e62053 Minor fix in video settings dialog 2017-08-19 22:09:42 +02:00
Benau
1ca6a6edea Remove the need of 2nd UVmap for displace objects 2017-08-19 08:51:09 +08:00
Benau
4c0b28a43e Fix speed weight object looping in non-animated character 2017-08-17 15:48:21 +08:00
Benau
fd7bf80493 Fix kart selection screen animation if only 1 kart 2017-08-17 15:28:04 +08:00
Benau
a00b878919 Use transposed matrix everywhere 2017-08-17 01:26:08 +08:00
Benau
3031fabcf9 Add spm loader 2017-08-16 13:48:27 +08:00
hiker
01be800253 Fixed stack traces for win32 (#2642). 2017-08-15 23:54:39 +10:00
hiker
5a2b92d79d Merge branch 'master' into improve-xbox-gamepad-support 2017-08-14 10:05:26 +10:00
Deve
0bf0ca0a35 Fixed memory leak 2017-08-13 01:38:21 +02:00
Deve
1f4a9135b6 Remove useless elif 2017-08-13 01:38:21 +02:00
hiker
3923da30bc Use unique names for profiler events. 2017-08-11 09:41:22 +10:00
hiker
587687a614 Merge remote-tracking branch 'origin/fix-2850' 2017-08-09 21:40:44 +10:00
hiker
626f540b15 Merge branch 'Fix-2617' 2017-08-09 21:21:03 +10:00
hiker
86d5e11c13 Merge branch 'improve-xbox-gamepad-support' of github.com:supertuxkart/stk-code into improve-xbox-gamepad-support 2017-08-09 20:32:13 +10:00
hiker
8be5443f8c Merge branch 'fix-profiler' into improve-xbox-gamepad-support 2017-08-09 17:56:40 +10:00
Benau
861e7f7ebd Remove contradiction 2017-08-09 15:36:26 +08:00
Benau
cc8331f5cd Fix #2897 2017-08-09 15:03:37 +08:00
Benau
79c6705bb1 Fix #2814 2017-08-09 13:00:09 +08:00
Benau
ea97258b65 Add scripting code for throwing banana monkeys 2017-08-09 12:23:37 +08:00
auria.mg
94bb657102 Ignore input sensing coming from the wrong gamepad 2017-08-08 20:44:31 -04:00
auria.mg
f589bbea04 Attempt to fix 2617 2017-08-08 20:23:22 -04:00
hiker
c3cd7ceaa2 Merge branch 'master' into improve-xbox-gamepad-support 2017-08-08 23:08:14 +10:00
hiker
0acda38987 Add profiling events to sfx manager, but they are commented out
by default (using preprocessor directives), since they are typically
not useful.
2017-08-08 16:44:55 +10:00
hiker
6a0fb83209 Clear existing events when the circular buffer wraps around. 2017-08-08 16:36:54 +10:00
hiker
d29d2b831f Only use start and end time for thread 0, since all other threads
might not have valid start and end times (since they can record
several identical events during one frame). Bars for all other
threads can therefore not be nested.
2017-08-08 16:09:49 +10:00
hiker
887814ea98 Fixed incorrect start and end time setting when synchronising
frames. Only use thread 0's start and end time to compute the
duration (since other threads might have multiple identical
events during one frame, resulting in incorrect start times).
2017-08-08 16:08:15 +10:00
hiker
6783ab26f8 Keep a list of all event names in the order in which they first
appear. This list allows the proper ordering of events when drawing
the bar chart to show nesting. Make sure that enabling the profiler
starts at the next synch point (to avoid incomplete event pairs).
Create a seprate output file for each thread.
2017-08-07 17:53:15 +10:00
hiker
4c55ca4da9 Merge commit 'e6a134c3479ccdbaf91bb36d46ffb64b6a3b52b9' into improve-xbox-gamepad-support 2017-08-06 22:58:49 +10:00
hiker
891e439264 Remapped XInput to be the same as DirectInput buttons, so that
existing configs works as expected. Hard-coded 6 axis for xbox
controller to allow for triggers to be reported as two different
axis (instead of as one axis). Updated gamepad config to use
proper names for triggers.
2017-08-06 22:56:59 +10:00
Geoffrey Mon
a73af6eb0d Save and use usernames in replay files (#2754) (#2893)
* Save and use usernames in replay files

Fixes #2754.

* Store usernames of each racer in recorded replay files
* Display those usernames in a column of the replay selection UI
  and in race result dialogs
* RaceResultGUI::getKartDisplayName functionality moved into
  Controller::getName

* Move Controller::getName definition to avoid unnecessary #include

* Backwards compatibility: use kart name if username is not in replay

* Fix code style issues
2017-08-03 19:51:42 -04:00
hiker
04c775eead Don't measure lock time, some whitespace cleanup. 2017-08-03 21:21:40 +10:00
Geoffrey Mon
802d70ca8d Fix code style issues 2017-08-02 17:21:37 -04:00
Geoffrey Mon
9ec2ff5c4a Backwards compatibility: use kart name if username is not in replay 2017-08-02 14:13:26 -04:00
Geoffrey Mon
ca5258a46c Move Controller::getName definition to avoid unnecessary #include 2017-08-02 13:48:44 -04:00
Benau
ac406e1e00 Fix #2891 2017-08-03 01:34:35 +08:00
Geoffrey Mon
f3a962c391 Save and use usernames in replay files
Fixes #2754.

* Store usernames of each racer in recorded replay files
* Display those usernames in a column of the replay selection UI
  and in race result dialogs
* RaceResultGUI::getKartDisplayName functionality moved into
  Controller::getName
2017-08-02 12:55:23 -04:00
hiker
203995262c Exclude the time to get the lock from profile measurements. 2017-08-02 22:40:19 +10:00
hiker
d8fe700f64 Don't store data when the profiler is disabled. 2017-08-02 08:48:01 +10:00
hiker
d800a8c0bc Made everything threadsafe. 2017-08-02 08:34:43 +10:00
hiker
ea12c8f494 Very first version of profiler that supports multiple threads
and handles events in branches better.
2017-07-31 22:56:47 +10:00
hiker
47d2e30c5f Fixed compiler warnings. 2017-07-31 22:56:00 +10:00
hiker
e6a134c347 Fix 2850 by increasing the number of axis for a gamepad to include
D-pad.
2017-07-30 23:05:27 +10:00
hiker
65c8cb7ae1 Replaced arrays with std::vector (to get better error checking). 2017-07-30 23:03:40 +10:00