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

63351 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nissim Hadar
1e2413bade Removed unneeded file. 2018-01-04 16:01:22 -08:00
Nissim Hadar
e797a77262 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	interface/resources/qml/js/Utils.jsc
 2018-01-04 15:58:08 -08:00
Andrew Meadows
01fd6dc8f6 add comments to make code more clear 2018-01-04 15:53:03 -08:00
Andrew Meadows
a51d83c6e4 rollback automatic priority promotion to RECRUIT 2018-01-04 15:53:03 -08:00
Andrew Meadows
6638b1deae fix bug causing sim ownership thrash 2018-01-04 15:53:03 -08:00
Andrew Meadows
7e01f97f8f more correct volunteer ownership priority promotion 2018-01-04 15:53:03 -08:00
Seth Alves
9e8e15d620
Merge pull request #12074 from AndrewMeadows/simulation-ownership 
fix bug preventing simulation ownership on localhost domain
 2018-01-04 15:48:54 -08:00
SamGondelman
eb0d09360a Merge remote-tracking branch 'upstream/master' into overlayFix 2018-01-04 15:47:20 -08:00
Zach Fox
ea29d8bde0 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixHandControllerInspection 2018-01-04 15:41:27 -08:00
Zach Fox
4612ef3d7c Use atYBeginning 2018-01-04 15:41:01 -08:00
David Back
ac8b8da7b1 Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices 2018-01-04 15:30:57 -08:00
Anthony J. Thibault
eff77b995e Merge branch 'master' into feature/exp-smoothing-input-filter 2018-01-04 15:24:33 -08:00
David Rowe
67eb282815 Don't swap hands if both triggers are squeezed 2018-01-05 12:12:36 +13:00
Andrew Meadows
fbe2dd8a41 remove unnecessary 'virtual' keyword 2018-01-04 14:46:16 -08:00
Andrew Meadows
13538006ec fix bug preventing sim owenrship on local domain 2018-01-04 14:46:16 -08:00
Zach Fox
4232bc0200 Bump per_page to 100 2018-01-04 14:42:05 -08:00
Anthony J. Thibault
f0985a8a01 Code review feedback 
clamp _rotationConstant and _translationConstante between 0 and 1.
re-organized apply structure, to prevent transforming invalid values.
 2018-01-04 14:21:53 -08:00
Stephen Birarda
22ced025cd
Merge pull request #12089 from Atlante45/fix/ice-servers 
Add Unused packet type back for ICE servers
 2018-01-04 15:15:27 -07:00
vladest
67ca76baa1 Magninfication 2018-01-04 23:11:42 +01:00
David Rowe
27bed8d1f1 Tidying 2018-01-05 11:05:49 +13:00
David Rowe
fb09a9724e Change laser hand with trigger squeeze 2018-01-05 11:04:09 +13:00
Zach Fox
14447c26a0 Prevent visual data loss 2018-01-04 13:47:31 -08:00
Anthony J. Thibault
9beb3ac5b6 Merge branch 'master' into feature/exp-smoothing-input-filter 2018-01-04 13:45:27 -08:00
David Back
81f3590954 Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices 2018-01-04 13:17:07 -08:00
Atlante45
294a7ca3c6 Make sure the protocol signature still changes 2018-01-04 13:15:01 -08:00
SamGondelman
6a19b0e0b6 update render items on texture load 2018-01-04 13:10:46 -08:00
Atlante45
d4a239731c Add Unused packet type back for ICE servers 2018-01-04 13:07:02 -08:00
Nissim Hadar
8bd2985f1f Simplified code. 2018-01-04 13:06:28 -08:00
David Rowe
9f7a2b18e6 Use laser from dominant hand if both hands are pointing at the tablet 2018-01-05 10:04:39 +13:00
RebeccaStankus
9ba324b85f "Clear Filter" button instead of "Show All" 2018-01-04 12:51:11 -08:00
RebeccaStankus
3e8063f80a Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-04 12:48:09 -08:00
Alexander Ivash
7ab7a46530 11008 GoTo app does not focus on address bar when opened 2018-01-04 23:38:10 +03:00
Gabriel Calero
8cac98545a Fixes for Android 2018-01-04 17:36:10 -03:00
Zach Fox
10d494b51d Pagination for Recent Activity 2018-01-04 12:32:30 -08:00
David Rowe
02f4085368 Fix magic number 2018-01-05 09:00:53 +13:00
Clément Brisset
efbff56f26
Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener 
Remove legacy jurisdiction code
 2018-01-04 11:52:38 -08:00
Nissim Hadar
e8770ec204 TEMPORARY fix for older content not containing these fields (keylight, skybox, ambient light). 2018-01-04 11:30:02 -08:00
luiscuenca
367e2266f7 Fix eslint 2018-01-04 12:04:52 -07:00
samcake
40daeae45b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2018-01-04 10:51:18 -08:00
RebeccaStankus
f52a6d8eae Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-04 10:49:32 -08:00
luiscuenca
ef0164c272 Fix tabs 2018-01-04 11:43:51 -07:00
luiscuenca
28d9409bf0 Fix default hand poses 2018-01-04 11:37:37 -07:00
Nissim Hadar
5b7ef9a3d3 Minor cleanup. 2018-01-04 09:13:58 -08:00
David Rowe
6095a90e69 Don't display default lasers when Shapes app is active 2018-01-04 21:09:38 +13:00
David Rowe
6c16fcfe65 Fix tablet laser when Shapes app is running 2018-01-04 16:37:20 +13:00
David Rowe
7236ac17e2 Merge branch 'master' into 21661 2018-01-04 15:21:00 +13:00
David Rowe
138092ac37 Remove "Prefer Avatar Finger Over Stylus" setting 2018-01-04 15:12:34 +13:00
Ryan Downe Karpf
eada0b1ff7
Merge pull request #11546 from vladest/tablet_home_paginate 
Tablet home paginate
 2018-01-03 18:12:32 -08:00
Ryan Downe Karpf
c1b94693c5
Merge pull request #12061 from druiz17/fix-actions-not-being-deleted 
Fix deleted action not being sent over the network correctly
 2018-01-03 18:11:06 -08:00
Ryan Downe Karpf
5a589350fe
Merge pull request #12077 from ctrlaltdavid/remove-filed 
Remove erroneous "filed" Overlay property
 2018-01-03 18:10:37 -08:00