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

65760 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
b26faf55e3 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-03-07 10:54:02 -08:00
NissimHadar
2f040d0032 Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester 2018-03-07 10:48:20 -08:00
NissimHadar
da414b94fd WIP - adding the creation of recursive scripts. 2018-03-07 10:47:37 -08:00
David Back
2047437893 Merge branch 'RC65' of https://github.com/highfidelity/hifi into RC65 2018-03-07 10:30:18 -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
Andrew Meadows
03a5a6f4e0 more correct proxy classification for multiple views 2018-03-07 08:41:01 -08:00
Dante Ruiz
13767beece Caps change 2018-03-07 08:19:36 -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
David Rowe
a62b6b7150 Merge branch 'master' into 21709 2018-03-07 17:34:53 +13:00
David Rowe
eeb7f5ca8d Doc review 2018-03-07 17:29:39 +13:00
Bradley Austin Davis
3f762c7900
Merge pull request #12519 from gcalero/android_experimental_joystick_fixed 
Android - Make the virtual pad (joystick) position fixed. Change assets.
 2018-03-06 20:06:35 -08:00
Bradley Austin Davis
36d02389d9
Merge pull request #12499 from gcalero/android_bubble_fix 
Set bubble default state off for android.
 2018-03-06 20:04:59 -08:00
Elisa Lupin-Jimenez
c6e5f4c9c8 zip file drags don't auto add model textures 2018-03-06 19:24:09 -08:00
samcake
4a91ac11c9 Adding controls of the regions 2018-03-06 18:19:02 -08:00
samcake
e2ac5353b1 Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-03-06 18:03:07 -08:00
samcake
923c81ae28 Swap order of the ZoneRendererJob with DrawLocalLights to fix the local lights 2018-03-06 17:38:27 -08:00
Thijs Wenker
866bec0b34 rule -> role 2018-03-07 02:36:07 +01:00
Sam Gateau
7a3e8caa34
Merge pull request #12581 from AndrewMeadows/workload-007 
workload: fix proxy-region distance math
 2018-03-06 17:24:30 -08:00
Andrew Meadows
43920b548f fix proxy-region distance math 2018-03-06 17:05:49 -08:00
Cristian Luis Duarte
4f0cecefc3 Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed 2018-03-06 22:03:39 -03: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
Gabriel Calero
243e79df4a Fix merge of radar.js 2018-03-06 21:59:59 -03:00
Elisa Lupin-Jimenez
251e4a3127 Fixed blocks importer textures being interpreted as image entities 2018-03-06 16:44:23 -08:00
NissimHadar
4b3d63eea4 Added math.h to includes (MacOS build error). 2018-03-06 16:37:05 -08:00
NissimHadar
f0fe3cbfca Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester 2018-03-06 16:33:17 -08:00
Simon Walton
17c12fde9c Fix for HandshakeRequest logic 2018-03-06 16:32:04 -08:00
NissimHadar
d72f46ec3e Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 16:24:53 -08:00
NissimHadar
05e9aa52c9 Moved can-cast-shadow checkbox to behaviour section. 2018-03-06 16:22:54 -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
Dante Ruiz
97d283cc5f use correct api call for audio and correct function call to set stereo input mode 2018-03-06 16:17:27 -08:00
Clément Brisset
fdc054c86b
Merge pull request #12577 from Atlante45/new-master 
RC65 merge back into master
 2018-03-06 16:17:27 -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
NissimHadar
b30934d460 Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester 2018-03-06 15:21:38 -08:00
David Back
47e8e26255 CR indent fixes 2018-03-06 14:05:24 -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
Stephen Birarda
a83b54e10d fix for getSetting QVariant ref in DomainServer 2018-03-06 13:55:50 -08:00
Zach Fox
48aa862c16 Show Connection instructions in Send Money when 0 connections 2018-03-06 13:52:42 -08:00
samcake
7cb4afc6b4 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-03-06 13:34:37 -08:00
Andrew Meadows
ad81fd54f3
Merge pull request #12565 from samcake/workload 
Workload: Adding view setup job and more debugging tool
 2018-03-06 13:23:17 -08:00
Atlante45
a23884d0e0 Prevent crash during long backup web requests 2018-03-06 13:21:02 -08:00
John Conklin II
9294ae0dd2
Merge pull request #12567 from elisa-lj11/RC65-update 
Added fixed log spam undefined error to RC65
 2018-03-06 12:40:28 -08:00
samcake
b6b7cb3394 Adressing warnings issue and implementing the independent intersection test per region spheres 2018-03-06 12:39:28 -08:00
Brad Davis
6cc36136bd Fix assert on interaction with stats and avatarinputs during UI setup 2018-03-06 12:34:21 -08:00
David Back
b74be92fd8 redo scale handles to fix scaling into avatar collision causing chaos 2018-03-06 12:27:51 -08:00
Alexander Ivash
53e1a0cae5 forward 'maybeEnableHmdPreview' if control is not visible 2018-03-06 22:25:35 +03:00
Elisa Lupin-Jimenez
15c1f5ba30 fixed log spam undefined error 2018-03-06 11:01:50 -08:00
Sam Gateau
7e96608699 introducing the first stage of the workload engine to setup view and expand the view definition 2018-03-06 01:35:16 -08:00