Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 07:53:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
74093 commits 67 branches 56 tags 1.2 GiB
Commit graph

74093 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
d6a4f89a08 Merge branch 'master' of https://github.com/highfidelity/hifi into 19991-MacAppData 2018-11-26 19:36:01 -08:00
NissimHadar
4700b94f28 Merge branch 'master' of https://github.com/highfidelity/hifi into 19991-MacAppData 2018-11-26 18:11:20 -08:00
NissimHadar
aed947cb0a Minor cleanup. 2018-11-26 18:10:41 -08:00
NissimHadar
5da6ecad12 Compilation error. 2018-11-26 18:10:14 -08:00
NissimHadar
f9954990dd Merge branch '19991-MacAppData' of github.com:NissimHadar/hifi into 19991-MacAppData 2018-11-26 16:43:36 -08:00
NissimHadar
e7ab7094cd Kill Hifi processes after evaluation. 2018-11-26 16:42:48 -08:00
NissimHadar
e587820de3 Should be v1.0 2018-11-26 16:18:43 -08:00
NissimHadar
c211dc363b Updated README.md 2018-11-26 16:05:49 -08:00
NissimHadar
ebc7875f5e Updated README.md 2018-11-26 16:03:40 -08:00
Zach Fox
a9fd443f28 'improve' UI slightly 2018-11-26 16:03:07 -08:00
NissimHadar
2ade0078f4 Updated README.md 2018-11-26 16:02:22 -08:00
NissimHadar
e943504f60 Updated README.md 2018-11-26 15:59:08 -08:00
Zach Fox
31f7d747c8 Bugfixes; enable purchase asset from marketplace screen raise 2018-11-26 15:48:49 -08:00
Antonina Savinova
d547a29f94
Merge pull request #14438 from birarda/bug/update-wireshark-dissectors 
update wireshark dissector with correct control packet types
 2018-11-26 13:55:14 -08:00
Shannon Romano
422045861a
Merge pull request #14471 from jherico/fix/macbuild 
Make vcpkg build default to home directory on mac
 2018-11-26 13:30:06 -08:00
Zach Fox
8df5db4239 Allow scripts to open SendAsset screen with pre-filled info 2018-11-26 13:26:17 -08:00
Brad Davis
43b9aa29bc Make vcpkg build default to home directory on mac 2018-11-26 12:37:11 -08:00
Ryan Huffman
a6e203e3e5 Fix draggable inputs not being tabbable 2018-11-26 11:12:14 -08:00
NissimHadar
48fabf51f2 Corrected Linux compilation error. 2018-11-26 08:54:09 -08:00
NissimHadar
f4f1ac8f02 Merge branch '19991-MacAppData' of https://github.com/NissimHadar/hifi into 19991-MacAppData 2018-11-26 08:25:54 -08:00
NissimHadar
2913d4f984 Removed baaaaaad file. 2018-11-26 08:25:07 -08:00
NissimHadar
6313ab8ed7 Working on possible crash on Mac. 2018-11-25 20:10:01 -08:00
NissimHadar
e173b29687 Added warning 2018-11-24 20:43:13 -08:00
NissimHadar
26319e6d6f Remove all disk images 2018-11-24 20:37:21 -08:00
NissimHadar
bbbc358ccb Restore AppData folder on Mac 2018-11-24 20:31:19 -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
David Rowe
c96cd422e1 Fix near parent grab tear away calc for avatar scale 2018-11-24 11:58:40 +13:00
David Rowe
f2abf8e398 Debounce haptic pulses at start of near parent grab 2018-11-24 11:43:05 +13:00
David Rowe
29c268df5a Remove extraneous grab entity haptic pulses 2018-11-24 11:38:54 +13:00
David Rowe
f1dad3c465 Add hystersis between near parent grabbing and tearing away 2018-11-24 08:35:02 +13:00
David Rowe
1362e7f361 Fix near parent grab entity tear away distance calc 2018-11-24 08:26:54 +13:00
Ryan Huffman
1e746e1b1c Swap key light directions in Create 2018-11-21 16:43:54 -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
sabrina-shanman
be511378cd Merge branch 'master' into hfm_serializer 2018-11-20 13:42:24 -08:00
Seth Alves
87878cbdee use -shared-libasan with clang whem memory debugging is enabled 2018-11-20 10:40:32 -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