Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-18 01:16:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73991 commits 24 branches 28 tags 1.2 GiB
Commit graph

73991 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
2913d4f984 Removed baaaaaad file. 2018-11-26 08:25:07 -08:00
NissimHadar
f62fd97f09 Updated to v1.1 2018-11-24 09:49:13 -08:00
NissimHadar
b3f646e9dc Updated to v1.1 2018-11-24 09:44:46 -08:00
NissimHadar
ebea93603b Merge branch '19991-MacAppData' of https://github.com/NissimHadar/hifi into 19991-MacAppData 2018-11-24 09:43:45 -08:00
John Conklin II
7e2f1ca64a
Merge pull request #14436 from birarda/bug/no-naks-after-timeout 
ensure packets are always added to loss list after estimated timeout
 2018-11-21 15:48:14 -08:00
NissimHadar
2b71a82e4e Updated to v1.1 2018-11-20 20:52:13 -08:00
NissimHadar
eb2533d224 Updated CMake file to include the AppData folder 2018-11-20 20:51:20 -08:00
NissimHadar
4c0f8b176b No need for this after implementation of AppData on Mac. 2018-11-20 19:59:43 -08:00
NissimHadar
4ef54cd4f2 Tests run without Interface crashing. 2018-11-20 17:45:37 -08:00
NissimHadar
c3c41700f6 Can delete temporarY AppData folder and rename High Fidelity folder as a temporary folder 2018-11-20 17:01:58 -08:00
NissimHadar
f6ffb16103 Version 1.1 2018-11-20 15:21:39 -08:00
NissimHadar
a2bcc9e899 teeny weeny typo... 2018-11-20 15:19:54 -08:00
NissimHadar
e5b642ef1b Merge branch 'master' of https://github.com/highfidelity/hifi into 19942-MacInstall 2018-11-20 15:16:33 -08:00
NissimHadar
88fc066fb6 Merge branch '19942-MacInstall' of github.com:NissimHadar/hifi into 19942-MacInstall 2018-11-20 15:16:22 -08:00
John Conklin II
87cac67c75
Merge pull request #14280 from ElderOrb/FB17381 
FB17381 - Reticle.setVisible isn't working
 2018-11-20 09:53:52 -08:00
John Conklin II
04ccf9a257
Merge pull request #14435 from dback2/draggableNumberDelay2 
Entity list - prevent draggable number updates while dragging
 2018-11-20 09:16:14 -08:00
NissimHadar
cbfe9f5440 Merge branch 'master' of https://github.com/highfidelity/hifi into 19942-MacInstall 2018-11-20 08:43:40 -08:00
NissimHadar
e24eee897e Typo. 2018-11-19 17:59:02 -08:00
NissimHadar
55182be99b Merge branch 'master' of https://github.com/highfidelity/hifi into 19942-MacInstall 2018-11-19 17:57:28 -08:00
John Conklin II
9b886ff725
Merge pull request #14391 from SimonWalton-HiFi/upload-to-ds-chunked 
Upload content to domain server in multiple chunks
 2018-11-19 17:53:44 -08:00
NissimHadar
da60aaa5af WIP - Readme to install on Mac. 2018-11-19 17:52:21 -08:00
birarda
23857ea8c2 ensure packets are added to loss list after timeout 2018-11-19 17:40:55 -08:00
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
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
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