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

74317 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
2913d4f984 Removed baaaaaad file. 2018-11-26 08:25:07 -08:00
Sam Gateau
f9fb4b61c1 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-11-25 22:40:06 -08:00
SamGondelman
e282d51883 CR 2018-11-26 01:15:07 -05: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
amantley
746c5ed621 we can now handle missing joints and extra joints 2018-11-21 15:46:54 -08:00
sam gateau
9ee35def3d trying to fix the include issue 2018-11-21 15:42:35 -08:00
David Rowe
5e51ba051a Improve code responsibilities 2018-11-22 11:12:22 +13:00
sam gateau
48f32dc36b Remove stuppid error 2018-11-21 13:35:36 -08:00
sam gateau
ad3d5f7efb Merge branch 'one' of github.com:samcake/hifi into one 2018-11-21 13:32:54 -08:00
sam gateau
be03859ed6 Warnings from build 2018-11-21 13:31:54 -08:00
Sam Gateau
6b1c7bf96e restoring the engine render views and cleaning up the task / config section of the pr 2018-11-20 23:15:09 -08:00
SamGondelman
c99a8101f7 trying to fix build errors 2018-11-21 01:56:46 -05: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
Sam Gateau
1461f81a9e Merge branch 'one' of github.com:samcake/hifi into one 2018-11-20 19:29:51 -08:00
Sam Gateau
dd828c81e0 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-11-20 19:29:01 -08:00
NissimHadar
4ef54cd4f2 Tests run without Interface crashing. 2018-11-20 17:45:37 -08:00
sam gateau
f3bbd412d1 Cleaning too many changes 2018-11-20 17:40:59 -08:00
sam gateau
44b9b92450 Getting ready for merge 2018-11-20 17:32:04 -08:00
amantley
a488364976 fixed mirroring helper functions contains left and contains right 2018-11-20 17:14:35 -08:00
amantley
572cdcd008 remapping is now able to work remains to clean up code and check for gotchas from old fst code 2018-11-20 17:09: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
birarda
b2bd0d99de add a warning for cloud domain ID changes 2018-11-20 16:07:48 -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
birarda
b0aa1b2af2 make domain settings maps keyed case insensitively 2018-11-20 14:47:33 -08:00
sabrina-shanman
be511378cd Merge branch 'master' into hfm_serializer 2018-11-20 13:42:24 -08:00
David Rowe
c3a0805db1 Make far grab ignore tablet while grabbing an entity 2018-11-21 10:28:46 +13: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
David Rowe
44efd18882 Make Create and Shapes lasers ignore tablet while editing 2018-11-21 08:38:30 +13: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