Commit Graph
161 Commits
Author SHA1 Message Date
Vasily 860eca1956 Add compiling on Ubuntu for X11 funcs 2019-04-22 09:56:50 +02:00
Vasily 0e8e26d553 Change version name to 3.1.0-dev
The previous -new appendix was just to make sure the old name wasn't
being used instead.
2019-04-19 22:30:04 +02:00
Vasily bb1d3e16fb Convert executable icon to new method
Manually creating an RC file was the Qt 4 way. The Qt 5 way is just
giving it an icon.

When an RC_FILE isn't manually created Qt will attempt to create one. If
there are non-integers in the version number the compilation will crash.

AdvancedSettings_resource.rc is a build artifact on Windows.
2019-04-19 22:30:04 +02:00
Vasily 164158330e Convert C++ version string to be define instead of include
This allows Qmake to use the version number as well as not requiring all
other uses of the version string to strip double quotes from it. This
also reduces the fragility of the version string as it was required to
be a valid C++ char*, even in contexts where that wouldn't matter.
2019-04-19 22:30:04 +02:00
Vasily 5c4e8a3486 Make version append script respect release builds
Users do not care about commit numbers and it only serves to confuse
them. Release builds should not contain build metadata since there
should only be one definitive version.
2019-04-19 22:29:21 +02:00
Vasily c36dd70f60 Change build metadata separator from - to +
SemVer 2.0.0 requires a plus for build metadata.

https://semver.org/
`Build metadata MAY be denoted by appending a plus sign and a series of
dot separated identifiers immediately following the patch or pre-release
version. Identifiers MUST comprise only ASCII alphanumerics and hyphen
[0-9A-Za-z-]. Identifiers MUST NOT be empty. Build metadata SHOULD be
ignored when determining version precedence. Thus two versions that
differ only in the build metadata, have the same precedence. Examples:
1.0.0-alpha+001, 1.0.0+20130313144700, 1.0.0-beta+exp.sha.5114f85.`
2019-04-19 22:29:21 +02:00
Vasily 0ec39f7714 Add double quotes around new version string 2019-04-19 22:29:21 +02:00
Vasily 72a319bc1e Make Python replace version file responsible for file writes
While the initial idea of having cmd/PS/bash actually write the changes
to file, the integration with the AppVeyor YAML just made it really
frustrating.
2019-04-19 22:29:21 +02:00
Vasily 4e781fa74a Make append version file more cross platform 2019-04-19 22:29:21 +02:00
Vasily af98c357fc Add version number to start of build script 2019-04-19 22:29:20 +02:00
Vasily 9303d93f27 Make appveyor able to inject git commit into version 2019-04-19 22:29:20 +02:00
Vasily a74f0cad49 Make NSIS and Win build scripts remove " character
It is not strictly necessary in the Python version because it's being
appended to a batch command, but in order to have things make sense if
the mechanism of dispatching commands changes the program will strip
double quotes.
2019-04-19 22:29:20 +02:00
Vasily 6cf009e915 Convert C++ code to read version string from file
This is definitely not a pretty thing. Double quotes are required around
the string which means they'll need to be removed in the NSIS and Python
scripts.
2019-04-19 22:29:20 +02:00
Vasily cd1522b9e2 Make windows build scripts read file for version number 2019-04-19 22:28:46 +02:00
Vasily e91c22d20a Change NSIS to look in file for version string 2019-04-19 22:28:06 +02:00
Vasily 82e2d1c863 Update version string to append "-dev" 2019-04-19 18:20:20 +02:00
ykeara 3da6f3d81c Release 3.1.0 (#167)
* updated version string

* format

* reverted clang-tidy change

* revert the revert
2019-04-19 09:14:02 -05:00
Vasily 2cee659c2d Update windows build docs for Qt 5.12
5.12.2 is the latest version and so the most likely version for people
to download.
2019-04-17 20:51:34 +02:00
Vasily 28700575ec Replace single quotes with double quotes
Variable was not being expanded otherwise.
2019-04-17 20:51:34 +02:00
Vasily ed9e4008af Make Linux build scripts directory agnostic
Using the script location as an anchor, the scripts can now be called
from anywhere and work.
2019-04-17 20:51:34 +02:00
Vasily 6895a44ddb Refactor build_linux.sh into configure.sh
This moves all the error handling and setup into configure.sh, for a
cleaner script.
2019-04-17 20:51:34 +02:00
Vasily bd5b913f20 Add qt to clang system header prefixes
Clang-tidy will error on them otherwise.
2019-04-17 20:51:34 +02:00
Vasily b5d63c8166 Update required Qt version to 5.12
On Ubuntu 16.04 and 18.04 it is not possible to get Qt 5.12 from the
official repo. You will need to get it from
https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.12.2-bionic
which places the files in /opt. This leads qmake to including the files
as non system headers, which makes them spam errors. Adding them as
-isystem headers first prevents this.
2019-04-17 20:51:34 +02:00
Vasily a631aefb05 Update whitespace in .pro file 2019-04-17 20:51:34 +02:00
ykeara d94c0fa05c changed version strings 2019-04-12 18:49:03 -05:00
ykeara 9de14e20cb merged master to brightness 2019-04-12 18:25:14 -05:00
ykeara 17b31734be fixed c++ errors 2019-04-11 19:50:12 -05:00
Vasily b53ebb699f Remove version specific header files for KeyboardInput
The headers were identical after no longer using the abstract class for
platform independence.
2019-04-04 14:01:11 +02:00
Vasily e7df60311c Convert keyboardinput from class to regular header
No consistent state is needed so it doesn't make sense for it to be a
class.
2019-04-04 14:01:11 +02:00
Vasily 82d44b4ab5 Move KeyboardInput file into keyboardinput folder 2019-04-04 14:01:11 +02:00
ykeara c7483861bc updated qml names 2019-04-03 21:02:25 -05:00
ykeara a382137ef4 qml add 2019-04-03 20:50:08 -05:00
Vasily 760d262a57 Add page to change desktop overlay translation
The implementation is simple 3D vector scaling and addition. The
HmdMatrix34_t consists of a 3x3 rotation matrix and a 3D vector for
position.

The overlay position is only updated whenever a new overlay is changed
because we need the old overlay position in order to modify it. The
openvr call to get the position is only updated whenever you open the
menu.

A new page was created due to lack of space on the utilities page.
2019-03-31 22:31:26 +02:00
Kung-vr bcdf87b0f5 WMR/Rift bind release reset fix and space fix undo disable (#142)
* Test removal of HideWorkingSetPreview for issue #133

* Update WorkingSetPreview on apply reset data for issue #133

* fixed bug to apply floor fix offsets properly

* updated version to 3.0.1

* format

* Prevent space offsets effect on fix floor measurement

* Reorder chaperone commit timing on reset

This is an attempt to smooth apparent ~0.1sec lag on first movement after using a reset.

* Fix space fix tab (todo: reimplement undo button)
2019-03-30 13:56:27 -05:00
ykeara f57347a89c Release 3.0.0 Pr Multiple reviews please. (#129)
* changed version to 3-0-0

* Updated docs with default bindings

* format fix

* changed ordering and fixed minor issue
2019-03-26 11:30:15 -05:00
ykeara 74573eefaa 3.0.0 Release Canidate (#125)
* removed prox sesnor from actions

* removed default hmd bindings

* removed accessibility group from localization

* updated version to 3.0.0 RC1
2019-03-21 15:04:14 -05:00
Vasily fc34347c12 Add execute permissions on all scripts 2019-03-19 16:10:35 +01:00
Goofybud16 d6df066b8c Set execute permissions on the build and run scripts 2019-03-19 16:10:35 +01:00
Goofybud16 f1adb1d3e7 Add quotes around $@ to avoid potential issues with spaces in arguments 2019-03-19 16:10:35 +01:00
Vasily 1af49c0da7 Update run script with different library call 2019-03-19 16:10:35 +01:00
Vasily d9c4d223fc Update Linux build script 2019-03-19 16:10:35 +01:00
Vasily b770d869ae Add initial planning for paths API
The idea is to reduce manual string directories in the general code as
much as possible, in order to reduce typos and general weirdness.
2019-03-19 16:10:35 +01:00
Kung-vr 925d67cf38 Implement gravity options and ui (#117) 2019-03-17 19:29:10 -05:00
Vasily a70fade089 Create DigitalAction and AnalogAction types
This errors at compile time if the wrong action is being used, instead
of at runtime.
2019-03-16 14:07:26 +01:00
ykeara 3c5cab72e5 Chaperone Tab Update (#101)
* added actions for haptics

* Haptic WIP #1 crash on haptic event

* haptics rough implemented

* fixed action names and prox sensor work-around

* added workaround to catch-all in begineer chaperone switch

* added idle work-around to alarm warning

* changed visibility slider values to reflect new API limits

* added disable chaperone

* added display Logic

* fixed visibility slider display and some saving fade distance when chaperone disabled

* fixed warnings not always working (hopefully) centralized action/input keys into ivrinput.h

* default bindings for HMD's

* chaperone input re-factor

* refactored ivrinput class

* fixed naming errors commented out prox testing

* formatting removed commented code

* format

* fixed compiler warnings

* updated documentation

* Reduced reload chaperone calls

* adjusted haptics for chaperone bounds warnings
2019-03-15 15:19:23 -05:00
Vasily e4f2b5369a Change windows executable icon 2019-03-11 20:42:49 +01:00
Vasily d078bd88a4 Move definitions from header file to cpp file
Clang-tidy does not like definitions in header files unless they're
inline.
2019-03-10 23:12:26 +01:00
Vasily dd5ae97b62 Move ivrinput into openvr folder
Doesn't make sense for it to have it's own folder when there's an openvr
folder now.
2019-03-10 23:12:26 +01:00
Vasily 09251b04aa Move openvr_into openvr folder 2019-03-10 23:12:26 +01:00
Vasily 84be2090c8 Move setup code in main to separate file
This makes it easier to find the entry point for the program and also
moves a lot of implementation out of the main.cpp file.
2019-03-10 23:12:26 +01:00