Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 23:34:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
74087 commits 75 branches 59 tags 1.2 GiB
Commit graph

74087 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Back
dff4e34e7b CR changes 2018-11-19 16:59:33 -08:00
Jeff Clinton
30051f75da
Merge pull request #14434 from sethalves/fix-throw-from-worker 
catch QString exceptions that ModelCache can throw
 2018-11-19 16:36:52 -08:00
David Back
249ebb2389 remove unneeded 2018-11-19 16:21:52 -08:00
Ryan Huffman
b7fe3d47be
Merge pull request #14433 from huffman/fix/entity-properties-styling 
Fix several entity tool window styling issues
 2018-11-19 16:17:50 -08:00
David Back
ff6d43d0e4 block updates during dragging 2018-11-19 16:15:11 -08:00
NissimHadar
a448efb452 WIP - Readme to install on Mac. 2018-11-19 16:01:53 -08:00
Seth Alves
26a50e1820 don't log urls! 2018-11-19 15:38:12 -08:00
Simon Walton
2a7e22bf31 Identify initial chunk of an upload so as to be more resilient 2018-11-19 15:26:08 -08:00
Seth Alves
cd177a4457 catch QString exceptions that ModelCache can throw 2018-11-19 15:25:14 -08:00
John Conklin II
378742f896
Merge pull request #14431 from Atlante45/fix/throttle 
Turn off throttling behavior when not throttling
 2018-11-19 14:48:05 -08:00
NissimHadar
d4281212d6 First running version. 2018-11-19 14:32:47 -08:00
Ryan Huffman
007396346c Fix grid tool styling 2018-11-19 14:07:24 -08:00
Simon Walton
987f5317a9
Merge pull request #14428 from birarda/bug/traits-in-budget 
consider avatar traits bytes in budget and omit if over
 2018-11-19 12:58:48 -09:00
Ryan Huffman
c87748830f
Merge pull request #14430 from thoys/fix/create/propertiesAutoScrollOnNewEntity 
MS19903: don't trigger virtual keyboard scroll on non input focus.
 2018-11-19 13:52:22 -08:00
Ryan Huffman
7694aa8e66 Fix draggable number going into edit too often 2018-11-19 13:51:25 -08:00
Ryan Huffman
193b9752b8 Fix styling of properties window when narrow 2018-11-19 13:50:56 -08:00
David Rowe
7ffa70d0ac Fix memory accumulating while Interface is minimized 2018-11-20 09:36:58 +13:00
Clement
359a841f69 Turn off throttling behavior when not throttling 2018-11-19 12:28:04 -08:00
Thijs Wenker
84e8e21d85 don't trigger virtual keyboard scroll on non input focus. 2018-11-19 21:08:21 +01:00
NissimHadar
d30334fc3a Updating on Mac 2018-11-19 11:47:00 -08:00
Dante Ruiz
d6fbcb1668 remove entity highlighting 2018-11-19 11:04:09 -08:00
birarda
a0a87e7170 consider avatar traits bytes in budget and omit if over 2018-11-19 10:55:05 -08:00
NissimHadar
3af094e41b Merge branch '19942-MacInstall' of github.com:NissimHadar/hifi into 19942-MacInstall 2018-11-19 10:34:39 -08:00
NissimHadar
eea89655f6 WIP - Readme to install on Mac. 2018-11-19 10:33:04 -08:00
NissimHadar
4c763fd0d6 WIP - Readme to install on Mac. 2018-11-19 10:31:06 -08:00
Jeff Clinton
484de06cf4
Merge pull request #14422 from SimonWalton-HiFi/entities-json-less-strict 
Don't check for presence of particular keys in models json
 2018-11-19 10:29:10 -08:00
John Conklin II
6b25179aa9
Merge pull request #14420 from danteruiz/fix-keyboard-loging-issue 
Dismiss keyboard when backout of the login screen
 2018-11-19 09:58:54 -08:00
John Conklin II
d63a850ec0
Merge pull request #14409 from danteruiz/keyboard-touchups 
keyboard address some feedback
 2018-11-19 09:48:00 -08:00
Jeff Clinton
870619b19d
Merge pull request #14412 from amantley/avatarPipelineOffsets 
Avatar Pipeline Joint Rotation Offsets Handling
 2018-11-19 08:54:29 -08:00
NissimHadar
558e5cff2e Merge branch 'master' of https://github.com/highfidelity/hifi 2018-11-18 08:40:48 -08:00
vladest
db82994b4d Merge branch 'master' into qml_warning_fix 2018-11-18 16:10:21 +01:00
vladest
932d1dbcd7 Fixed width binding loop warning 2018-11-17 17:20:02 +01:00
vladest
53b7cc1376 Fix QML achoring warnings on Layouts 2018-11-17 15:06:25 +01:00
Seth Alves
b72f462028
Merge pull request #14406 from danteruiz/master-disable-interstitial 
disable interstitial for master
 2018-11-16 20:13:50 -08:00
Ryan Huffman
7701be0742
Merge pull request #14410 from thoys/fix/create/entityListDoubleClick 
CreateApp Fix entity list double click rename / highlight and virtual keyboard issue
 2018-11-16 18:41:47 -08:00
Simon Walton
3baebf55c5 Don't enforce key presence in models.json 2018-11-16 17:33:13 -08:00
Thijs Wenker
ba790ae470 fix behavior after merge. 2018-11-17 01:20:36 +01:00
Dante Ruiz
4388763c34 fixing keyboard not being dismissing when backout of the login screen 2018-11-16 16:04:40 -08:00
Simon Walton
2d2cc0eaca Use a random session id for a sequence of chunks 2018-11-16 15:56:39 -08:00
Jason Najera
da3ea682ba
Merge pull request #14347 from r3tk0n/19550-oculus-store-v2 
MS19550 - Don't show help for HMDs that aren't plugged in and active
 2018-11-16 15:49:46 -08:00
Antonina Savinova
4fc43e197c
Merge pull request #14417 from birarda/feat/throttle-in-domain-settings 
add throttle start and backoff to DS settings
 2018-11-16 15:22:01 -08:00
Shannon Romano
6425a474ac
Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading 
Fixing case of interstitial not finishing loading
 2018-11-16 14:53:01 -08:00
Simon Walton
5883035991 Gcc doesn't like QTemporaryFile in a map so store unique ptrs 2018-11-16 14:50:03 -08:00
Dante Ruiz
a77121a588 keyboard touch ups 2018-11-16 14:20:17 -08:00
Thijs Wenker
7b3d2bed15 CR fixes 2018-11-16 22:10:15 +01:00
Thijs Wenker
e89346c146 making rename functionality list refresh proof 2018-11-16 22:10:14 +01:00
Thijs Wenker
31d37e7e75 Fix entity list double click rename / highlight issue 2018-11-16 22:08:58 +01:00
Jamil Akram
4d6a3b389a
Merge pull request #14413 from dback2/entityListResizeBug 
Entity list - fix resizing
 2018-11-16 12:59:07 -08:00
Shannon Romano
ba699e3e9b
Merge pull request #14273 from NissimHadar/MAC 
Case 19722 - Auto-Tester on Mac.
 2018-11-16 12:49:58 -08:00
birarda
6daac008ff sanitize throttle start and backoff values from DS settings 2018-11-16 12:00:18 -08:00