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

74307 commits

This branch
This branch
All branches
Author SHA1 Message Date
sam gateau
44b9b92450 Getting ready for merge 2018-11-20 17:32:04 -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
Wayne Chen
cdee10d0b8 getting dominant hand laser + sign up working 2018-11-20 16:54:16 -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
sabrina-shanman
be511378cd Merge branch 'master' into hfm_serializer 2018-11-20 13:42:24 -08:00
SamGondelman
a618ea664f Merge remote-tracking branch 'upstream/master' into hud 2018-11-20 16:09:52 -05:00
sam gateau
a28b5a8902 Merge branch 'master' of github.com:highfidelity/hifi into one 2018-11-20 12:15:42 -08:00
Wayne Chen
4d55081184 changing the keyboard password flag appropriately 2018-11-20 10:56:34 -08:00
Wayne Chen
5f658b90ff Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-11-20 10:44:29 -08:00
Seth Alves
87878cbdee use -shared-libasan with clang whem memory debugging is enabled 2018-11-20 10:40:32 -08:00
Wayne Chen
d55c9467e7 fixing keyboard offset 2018-11-20 10:37:30 -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
Dante Ruiz
db607e564f fixing keyboard mallets dimensions 2018-11-20 09:13:07 -08:00
NissimHadar
cbfe9f5440 Merge branch 'master' of https://github.com/highfidelity/hifi into 19942-MacInstall 2018-11-20 08:43:40 -08:00
SamGondelman
e8d45c46c1 shouldn't be able to write actionData 2018-11-19 23:31:20 -05:00
SamGondelman
58408497d1 hopefully fix hud crash 2018-11-19 21:27:23 -05: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
sam gateau
3412a4573b Merge branch 'master' of github.com:highfidelity/hifi into one 2018-11-19 17:40:15 -08:00
birarda
e52c7d9c85 update the control packet types after removals 2018-11-19 17:32:18 -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
sam gateau
84cd2a8ef6 Merge branch 'master' of github.com:highfidelity/hifi into one 2018-11-19 15:23:55 -08:00
Wayne Chen
e0eba2135a
Merge branch 'master' into loginInitiative2 2018-11-19 15:23:43 -08:00
Wayne Chen
2820328137 Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-11-19 15:21:24 -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
Wayne Chen
1419ec907b adding wip 2018-11-19 13:57:55 -08: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