Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 16:43:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65389 commits 25 branches 0 tags 1.1 GiB
Commit graph

24119 commits

Author SHA1 Message Date
Sam Gateau
d0de5b2d96
Merge pull request #12496 from AndrewMeadows/faster-raypick 
faster per-entity raypick culling and time-boxed picks
 2018-03-09 13:01:52 -08:00
John Conklin II
6969f014fc
Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one 
clear wallet when picking a new one
 2018-03-09 10:09:41 -08:00
Zach Fox
2b137f94a6
Merge pull request #12596 from zfox23/fixFontsAgain 
Fix font loading for MacOS via completely different font loading method
 2018-03-09 09:49:56 -08:00
Brad Hefta-Gaub
5437ffb2c8
Merge pull request #12536 from ctrlaltdavid/21700 
Remove deprecated Window.openFileChanged() signal from API
 2018-03-09 08:47:57 -08:00
Andrew Meadows
9fbe7ec194 time-box Picks and solve in round-robin sequence 2018-03-09 08:35:18 -08:00
Atlante45
69fb830480 Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-08 17:23:17 -08:00
John Conklin II
cad53a0203
Merge pull request #12585 from druiz17/small-tablet-changes 
tablet scale and position changes
 2018-03-08 15:36:06 -08:00
John Conklin II
fe0d354d26
Merge pull request #12599 from zfox23/RC65_preventSendingEmptyKeys 
RC65: Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd
 2018-03-08 15:30:19 -08:00
howard-stearns
9d805283d1 clear wallet when picking a new one 2018-03-08 14:24:44 -08:00
Zach Fox
409f5293bf Try this 2018-03-08 13:51:34 -08:00
Zach Fox
086431d0e7 Merge branch 'master' of github.com:highfidelity/hifi into fixFontsAgain 2018-03-08 13:50:19 -08:00
John Conklin II
260715d616
Merge pull request #12580 from elisa-lj11/RC65-blocks-image-bug 
Fixed blocks importer textures being interpreted as image entities
 2018-03-08 13:33:41 -08:00
Zach Fox
22f18dbf56 Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd 2018-03-08 13:12:13 -08:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
NissimHadar
d1b87b3116 Added missing avatar shadows. 2018-03-08 12:14:42 -08:00
Zach Fox
a479439b23
Merge pull request #12572 from zfox23/sendMoney_connectionInstructions 
Show Connection instructions in Send Money when 0 connections
 2018-03-08 11:20:23 -08:00
Zach Fox
d0cc64f63d Fix font loading for MacOS via different font loading method 2018-03-08 11:19:49 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android 
Android Tip
 2018-03-08 10:18:35 -08:00
Zach Fox
a0eb7e0712 Don't default unknown Marketplace item types to 'Entity' 2018-03-07 15:01:12 -08:00
Sam Gondelman
f51a35455a
Merge pull request #12515 from SamGondelman/scriptableMaterials 
Material reflection
 2018-03-07 14:29:31 -08:00
Elisa Lupin-Jimenez
2987c90f96 fixed syntax for ubuntu 2018-03-07 13:48:35 -08:00
Elisa Lupin-Jimenez
9ae2da7e4b fixed logic for texture files/non-models 2018-03-07 13:18:36 -08:00
Elisa Lupin-Jimenez
28589094c2 hopefully fixed mac/ubuntu builds 2018-03-07 10:18:40 -08:00
Dante Ruiz
2d448d7208 tablet scale and position changes 2018-03-07 10:02:35 -08:00
Brad Hefta-Gaub
9595049e01
Merge pull request #12582 from thoys/fix/JSDOCtypo 
fix JSDOC typo rule -> role
 2018-03-07 07:50:07 -08:00
Elisa Lupin-Jimenez
c6e5f4c9c8 zip file drags don't auto add model textures 2018-03-06 19:24:09 -08:00
Thijs Wenker
866bec0b34 rule -> role 2018-03-07 02:36:07 +01:00
Cristian Luis Duarte
bde2ba9272 Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed 2018-03-06 22:02:23 -03:00
Elisa Lupin-Jimenez
251e4a3127 Fixed blocks importer textures being interpreted as image entities 2018-03-06 16:44:23 -08:00
NissimHadar
d72f46ec3e Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 16:24:53 -08:00
Zach Fox
04a230c20f
Merge pull request #12491 from ElderOrb/FB12523 
fix for not re-enabling preview on leaving security-sensitive pages in marketplace
 2018-03-06 16:19:39 -08:00
Atlante45
edeed95ccc Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-06 15:33:12 -08:00
NissimHadar
dbf1be5de3 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 15:22:40 -08:00
Gabriel Calero
a2327ea0cf Merge branch 'android' into android_bubble_fix 2018-03-06 19:03:53 -03:00
Gabriel Calero
069d3e40bc Merge branch 'android' into android_bubble_fix 2018-03-06 18:58:49 -03:00
Zach Fox
48aa862c16 Show Connection instructions in Send Money when 0 connections 2018-03-06 13:52:42 -08:00
Brad Davis
6cc36136bd Fix assert on interaction with stats and avatarinputs during UI setup 2018-03-06 12:34:21 -08:00
Alexander Ivash
53e1a0cae5 forward 'maybeEnableHmdPreview' if control is not visible 2018-03-06 22:25:35 +03:00
John Conklin II
7bc3848c36
Merge pull request #12533 from druiz17/stereo-checkbox 
Adding Stereo checkbox in Audio settings
 2018-03-05 12:45:01 -08:00
Brad Davis
8bfc610cfb Merge remote-tracking branch 'upstream/master' into android 2018-03-05 11:48:58 -08:00
NissimHadar
1eb0dde3d2 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-05 11:36:39 -08:00
John Conklin II
3f751bb5ca
Merge pull request #12546 from druiz17/fix-hyperlink 
Fix hyperlink when far/near grabbing enitities
 2018-03-05 08:23:51 -08:00
NissimHadar
8536b44c61 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 16:09:06 -08:00
John Conklin II
8f403ebc23
Merge pull request #12543 from zfox23/improveFontLoading 
Improve font loading via QRC instead of file path
 2018-03-02 14:22:17 -08:00
Dante Ruiz
7ce13a3ce7 adding comment 2018-03-02 11:06:28 -08:00
Dante Ruiz
55d8cfd4c1 make sure dont make audio devices that don't use stereo use stereo 2018-03-02 10:56:44 -08:00
NissimHadar
000b08f7c0 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 08:07:01 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -08:00
SamGondelman
e3b65a9201 Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-03-01 16:39:31 -08:00
Dante Ruiz
1f4aed31f1 adding hyperlink 2018-03-01 16:16:47 -08:00