Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-29 06:06:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
83282 commits 28 branches 28 tags 1.2 GiB
Commit graph

83282 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alezia Kurdis
962d4671eb
To avoid a regression at some point 2020-04-27 22:49:42 -04:00
Alezia Kurdis
8c1d80d495
To really avoid a regression 2020-04-27 22:48:47 -04:00
Alezia Kurdis
c42734cba8
adding screenshare with the real file 2020-04-27 22:47:49 -04:00
Alezia Kurdis
75747a6a2f
to avoid regression 2020-04-27 22:20:19 -04:00
Alezia Kurdis
cc6fc40b0e
to avoid regression. 2020-04-27 22:19:04 -04:00
Alezia Kurdis
e850e6fe22
Adding field screenshare 
Adding field screenshare
to avoid conflict
 2020-04-27 22:05:24 -04:00
David Rowe
6d5e494f43
Merge pull request #320 from ctrlaltdavid/fix/jsdoc-fixes 
Miscellaneous JSdoc fixes
 2020-04-28 13:49:41 +12:00
David Rowe
5e997d7b60 Fix up Vircadia URLs 2020-04-27 20:38:23 +12:00
kasenvr
c7be40d2fa
Merge pull request #306 from ctrlaltdavid/fix/record-app 
Update Record app
 2020-04-27 01:11:33 -04:00
Thijs Wenker
bbda0cc6d0 CR fixes 2020-04-27 01:17:45 +02:00
Seth Alves
da6b59f3f2 Don't let Linux build of glm with clang-9 fail due to stray semicolon 2020-04-26 21:54:05 +00:00
Seth Alves
10830cf68c recover from rebase errors 2020-04-26 14:50:43 -07:00
Seth Alves
2fdbd0ab78 update urls for vive eye and hand tracking libraries, fix cmake for same 2020-04-26 12:27:18 -07:00
Seth Alves
cb83e4e6c9 adjust to new eye matrix 2020-04-26 12:25:19 -07:00
Seth Alves
3f249dfcd8 fix controller-module run order so that equip works again 2020-04-26 12:25:19 -07:00
Seth Alves
67f4811c2b blink actions were renamed 2020-04-26 12:24:47 -07:00
Seth Alves
a0031c6f10 eye and hand tracking for htc vive pro 2020-04-26 12:24:45 -07:00
Seth Alves
07034721c7 adjust when stylus input is active 2020-04-26 12:23:43 -07:00
Seth Alves
4f7252a0d8 enable and disable TranslateZ mapping, as needed 2020-04-26 12:23:43 -07:00
Seth Alves
a799d305ee don't mess with TranslateZ unless module is active 2020-04-26 12:23:43 -07:00
Seth Alves
600c2c3947 double OK to open/close tablet. touch thumb-tips to walk backwards 2020-04-26 12:23:43 -07:00
Seth Alves
865584e7e3 put tracked hand walk into a controller-dispatcher module 2020-04-26 12:23:40 -07:00
Seth Alves
4d3da24c33 fix angularVelocity reported by leap-motion plugin 2020-04-26 12:22:53 -07:00
Seth Alves
63dcf0e1c9 use same near-grab module to grab entities and overlays 2020-04-26 12:22:53 -07:00
Seth Alves
17ceda0d3e quiet jshint 2020-04-26 12:22:53 -07:00
Seth Alves
5511b18432 don't allow the hand with the mini-tablet to trigger opening the tablet 2020-04-26 12:22:53 -07:00
Seth Alves
fa4d055ab1 disable far-trigger and grab if using hand tracker 2020-04-26 12:22:53 -07:00
Seth Alves
1c926db2db if hands are tracked, make mini-tablet be just a big open-tablet button (remove mute and goto buttons) 2020-04-26 12:22:53 -07:00
Seth Alves
296617977c get near-grab working with camera-tracked hands 2020-04-26 12:22:52 -07:00
Seth Alves
2c535fa204 touching tips of index-fingers together means walk forward 2020-04-26 12:22:50 -07:00
Seth Alves
3d4de67c49 allow thumb+index finger pinch to mean same as trigger click 2020-04-26 12:20:05 -07:00
Seth Alves
7d956198cd re-enable prefer finger over stylus 2020-04-26 12:20:05 -07:00
David Rowe
2d070e630b Merge branch 'master' into fix/jsdoc-fixes 
# Conflicts:
#	interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
#	interface/resources/qml/hifi/commerce/checkout/Checkout.qml
#	interface/resources/qml/hifi/commerce/purchases/Purchases.qml
#	interface/src/Application.cpp
 2020-04-26 20:38:43 +12:00
Heather Anderson
e29271d8ca rename variables from "is crash enabled" to "is crash monitor enabled" (suggested by Thijs Wenker <me@thoys.nl>) 
added a debug message giving the current state of the debug monitor switch (ignoring whether Crashpad support is compiled)
 2020-04-25 20:32:38 -07:00
kasenvr
5c2dab6ba5
Merge pull request #314 from kasenvr/kasen/core 
Update master with kasen/core's latest changes
 2020-04-25 14:46:01 -04:00
Thijs Wenker
44cc1c14b4 get multiple linux artifacts to check them out 2020-04-23 14:00:23 +02:00
Thijs Wenker
3105b7f7c6 use PYTHON_EXEC for upload script to select the correct version of python 2020-04-23 12:24:45 +02:00
Thijs Wenker
5375c341a6 fix upload script path 2020-04-23 11:22:00 +02:00
Thijs Wenker
ee8ee9c611 disable build tools 2020-04-23 11:22:00 +02:00
kasenvr
ffd70f138f
Merge pull request #287 from FluffyJenkins/feature/chat 
Made Gridchat muted by default
 2020-04-22 19:25:46 -04:00
Thijs Wenker
f186c9341a linux gha fix 
# Conflicts:
#	.github/workflows/pr_build.yml
 2020-04-23 01:01:19 +02:00
Thijs Wenker
c4a0fc30bb fix not matching declaration/definition argument name 2020-04-23 00:58:49 +02:00
Thijs Wenker
b4362ea85a move template functions to header 2020-04-23 00:58:49 +02:00
Thijs Wenker
5fa8571c0b shared seems to require linking with CoreFoundation and OpenGL on OSX 2020-04-23 00:58:48 +02:00
Thijs Wenker
fd63e0ed4f set linux github action to 16.04 to maintain backward compatibility 2020-04-22 12:20:30 +02:00
Heather Anderson
2d6d205bf2 The original patch was more appropriate. We need to figure out what this needs to do, enough dancing. 
This reverts commit bc5dd45187.
 2020-04-21 23:15:08 -07:00
kasenvr
0fb1f37450
Merge pull request #277 from kasenvr/fix/api-docs-branding 
API docs rebranded to Vircadia.
 2020-04-21 23:46:55 -04:00
Kasen IO
e85c50e712 Update URL. 2020-04-19 23:44:11 -04:00
David Rowe
8cf1766df4 Update AC script URL 2020-04-20 15:43:07 +12:00
David Rowe
0f0a8ad7bf Update branding and AC script location 2020-04-20 10:42:22 +12:00