Commit Graph

17824 Commits

Author SHA1 Message Date
hiker
e03c0849ce Fixed previous commit - got confused with the #undef :P 2017-08-09 20:30:44 +10:00
hiker
8be5443f8c Merge branch 'fix-profiler' into improve-xbox-gamepad-support 2017-08-09 17:56:40 +10:00
hiker
d46b03b317 Hopefully fixed cygwin build problems. 2017-08-09 17:54:29 +10:00
hiker
11a587dd30 Merge branch 'improve-xbox-gamepad-support' of github.com:supertuxkart/stk-code into improve-xbox-gamepad-support 2017-08-09 10:15:35 +10:00
hiker
b440511c95 Fixed incorrect right thumbstick mapping. 2017-08-08 21:55:28 +10:00
hiker
bd5eb89cc0 Use XInput 9.1 which does not need an installer and works on most
windows platforms. Move the linking to irrlicht cmake.
2017-08-08 21:44:32 +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
620d1f34c1 Link in xinput on windows builds. 2017-08-07 23:50:09 +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
e6c2c3df95 Revert to using guidProduct for all existing code, but the correct guidInstance
for detecting XInput devices only.
2017-08-07 09:15:09 +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
hiker
68d41a07ba Now actually use XInput to read the joystick events for all
XInput devices.
2017-08-05 00:34:51 +10:00
hiker
f431730278 Fixed recognition of XInput devices. 2017-08-05 00:12:22 +10:00
hiker
04c775eead Don't measure lock time, some whitespace cleanup. 2017-08-03 21:21:40 +10:00
hiker
d3da93f368 Try to use a Microsoft function to detect XInput devices when using
DirectInput - atm not working yet :(
2017-08-03 09:24:50 +10: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
22208365d2 Switch to direct input for joystick handling. 2017-08-02 08:13:24 +10:00
hiker
1e5d2643be Bugfix: incorrect index. 2017-08-02 08:13:04 +10:00
hiker
cc6a1a3909 Started to add XInput support (to be able to distinguish the two
triggers).
2017-08-01 17:48:18 +10:00
hiker
85ee217d77 Converted tab to spaces. 2017-08-01 17:19:52 +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
Deve
a89b2f5df2 Minor tweak for linux icon.
On freedesktop specs they suggest to use 48x48 icon.
2017-07-30 12:56:25 +02:00
Deve
7d4fbb8d0c Minor modification in play tutorial text. Fixes #2535 2017-07-29 00:43:17 +02:00
QwertyChouskie
0be10ce448 Fix MinGW cross-compilation (#2883)
* Fix MinGW x64 cross-compilation

* Fix MinGW x86 cross-compilation
2017-07-22 20:17:31 -04:00
Benau
979e1546fb Fix #2881, only create a camera when initializing 2017-07-21 09:27:57 +08:00
auria.mg
1770d01e07 Changelog, continued 2017-07-20 19:57:42 -04:00
auria.mg
b2fd3d341a Changelog 2017-07-20 19:50:46 -04:00
Deve
09a735c25e Use key names in android device too 2017-07-20 22:58:12 +02:00
Deve
7a92708fd3 Use key names in wayland device 2017-07-20 22:58:12 +02:00
Deve
0dba3c8f67 Add a prefix to irrlicht key codes 2017-07-20 22:58:11 +02:00
Benau
10909b9556 Remove m_scale_rtts_factor == 1.0f in image quality for now
Because not working in advanced pipeline
2017-07-20 10:19:30 +08:00
samuncle
a3d6f2f453 Start to update the changelog for the release (please add/correct if needed) 2017-07-19 19:35:04 +02:00
Deve
11b2409fab Activate accelerometer only if needed 2017-07-18 21:43:45 +02:00
Deve
20850c9811 Remove unused cmake option 2017-07-18 00:11:09 +02:00
Deve
bbee93dfe8 Update readme and generate_assets script.
The issues on android 4.4 + qualcomm should be already fixed in 8653d410f8 and d44802a482

I also added few lightweight tracks and karts to the apk
2017-07-14 22:04:52 +02:00
Deve
cbba2b6b7d Merge pull request #2880 from scootergrisen/patch-2
Add danish translation
2017-07-14 06:21:38 +02:00
scootergrisen
cb8e0d7b2a Add danish translation 2017-07-14 00:40:56 +02:00
Deve
d44802a482 Add a workaround for some qualcomm devices on android 4.4 2017-07-11 00:37:31 +02:00
Deve
70c481cb26 Add a possibility to set android version in graphics restrictions. 2017-07-10 22:54:38 +02:00
Deve
1fd6a8aa86 Make sure that we are not using files from our zlib/libpng when STK is compiled with shared libraries.
It's possible that STK was using these files for compilation when cmake was run from main directory. In this case compiled files are stored in stk-code/lib, so that CMAKE_CURRENT_BINARY_DIR is stk-code/lib/irrlicht rather than stk-code/build/lib/irrlicht and we include whole lib/libpng rather than non-existing directory.
2017-07-10 21:14:28 +02:00
Benau
8653d410f8 Option 1 for fixing android 4.4
Reinit vertex attribute pointer each time, performance may hurt
2017-07-09 00:46:42 +08:00