Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-08 11:43:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65682 commits 6 branches 1 tag 1.1 GiB
Commit graph

65682 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Brad Davis
6cc36136bd Fix assert on interaction with stats and avatarinputs during UI setup 2018-03-06 12:34:21 -08:00
Simon Walton
30206ff33e Call killed-avatar slot directly rather than by signal 
Rename nodeKilled slot to handleKilledAvatar since the node
isn't killed in this case and call directly from
handleKillAvatarPacket().
 2018-03-06 12:28:55 -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
Simon Walton
547d86a2d5 Improve debugging diagnostic 2018-03-05 18:10:15 -08:00
NissimHadar
84815fadae Use JPG->PNG trick to keep file sizes down. 2018-03-05 17:45:51 -08:00
Simon Walton
8fb3015ec8 Fix for missing avatar on second replay 
Fixes a logic problem in the handshake request handling; deals with
KillAvatar from the Agent by removing the node-linked data, not
the actual Node; tweaks some of the network debug output.
 2018-03-05 16:51:05 -08:00
John Conklin II
acf1f48d9e
Merge pull request #12550 from thoys/fix/grabbableCheckbox 
FIX: make the grabbable checkbox function again when dynamic disabled
 2018-03-05 14:55:38 -08:00
Simon Walton
d259e115c0 Merge remote-tracking branch 'upstream/master' 2018-03-05 14:35:30 -08:00
John Conklin II
16bb992d8d
Merge pull request #12557 from druiz17/correctly-use-defaults-values 
correctly use default values and don't delete userData in entitiesProperties.js
 2018-03-05 13:15:23 -08:00
Cristian Luis Duarte
0bb56d837d Android - Use a different variable to save the reported dpi by qt in TouchscreenVirtualPadDevice 2018-03-05 18:08:06 -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
Cristian Luis Duarte
c091bc0bb3 Fix warnings regarding float to double conversion 2018-03-05 17:08:38 -03:00
Seth Alves
7d6927a00d
Merge pull request #12555 from druiz17/fix-controllerDispacther-error 
fix controllerDispatcher error in logs
 2018-03-05 12:08:35 -08:00
Thijs Wenker
d7725f1d73 make the grabbable checkbox again, respect default true setting 2018-03-05 20:54:08 +01: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
Dante Ruiz
1997cd27bd correctly use default values 2018-03-05 11:26:37 -08:00
Dante Ruiz
654770af51 fix controller dispatacher error 2018-03-05 09:39:26 -08:00
John Conklin II
8cb7e0584f
Merge pull request #12547 from Atlante45/fix/session-uuid-lock 
Protect session UUID from concurrent read/writes
 2018-03-05 08:24:22 -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
5a79f272f3 Allow multiple evaluations. 2018-03-04 20:56:57 -08:00
NissimHadar
913ad569c0 Added completion message. 2018-03-04 17:36:20 -08:00