Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 00:53:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73893 commits 71 branches 56 tags 1.2 GiB
Commit graph

73893 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
d4281212d6 First running version. 2018-11-19 14:32:47 -08:00
NissimHadar
d30334fc3a Updating on Mac 2018-11-19 11:47:00 -08:00
NissimHadar
3af094e41b Merge branch '19942-MacInstall' of github.com:NissimHadar/hifi into 19942-MacInstall 2018-11-19 10:34:39 -08:00
NissimHadar
eea89655f6 WIP - Readme to install on Mac. 2018-11-19 10:33:04 -08:00
NissimHadar
4c763fd0d6 WIP - Readme to install on Mac. 2018-11-19 10:31:06 -08:00
NissimHadar
558e5cff2e Merge branch 'master' of https://github.com/highfidelity/hifi 2018-11-18 08:40:48 -08:00
Seth Alves
b72f462028
Merge pull request #14406 from danteruiz/master-disable-interstitial 
disable interstitial for master
 2018-11-16 20:13:50 -08:00
Ryan Huffman
7701be0742
Merge pull request #14410 from thoys/fix/create/entityListDoubleClick 
CreateApp Fix entity list double click rename / highlight and virtual keyboard issue
 2018-11-16 18:41:47 -08:00
Thijs Wenker
ba790ae470 fix behavior after merge. 2018-11-17 01:20:36 +01:00
Jason Najera
da3ea682ba
Merge pull request #14347 from r3tk0n/19550-oculus-store-v2 
MS19550 - Don't show help for HMDs that aren't plugged in and active
 2018-11-16 15:49:46 -08:00
Antonina Savinova
4fc43e197c
Merge pull request #14417 from birarda/feat/throttle-in-domain-settings 
add throttle start and backoff to DS settings
 2018-11-16 15:22:01 -08:00
Shannon Romano
6425a474ac
Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading 
Fixing case of interstitial not finishing loading
 2018-11-16 14:53:01 -08:00
Thijs Wenker
7b3d2bed15 CR fixes 2018-11-16 22:10:15 +01:00
Thijs Wenker
e89346c146 making rename functionality list refresh proof 2018-11-16 22:10:14 +01:00
Thijs Wenker
31d37e7e75 Fix entity list double click rename / highlight issue 2018-11-16 22:08:58 +01:00
Jamil Akram
4d6a3b389a
Merge pull request #14413 from dback2/entityListResizeBug 
Entity list - fix resizing
 2018-11-16 12:59:07 -08:00
Shannon Romano
ba699e3e9b
Merge pull request #14273 from NissimHadar/MAC 
Case 19722 - Auto-Tester on Mac.
 2018-11-16 12:49:58 -08:00
birarda
6daac008ff sanitize throttle start and backoff values from DS settings 2018-11-16 12:00:18 -08:00
Seth Alves
d19cdc62d7
Merge pull request #14135 from ElderOrb/FB18573 
FB18573 - Other avatars' avatar entities may appear to be successfull…
 2018-11-16 10:05:22 -08:00
Roxanne Skelly
1b63ffb996
Merge pull request #14414 from howard-stearns/security-setting-post-oculus-store-wording 
security settings post-oculus-store wording
 2018-11-16 09:35:26 -08:00
NissimHadar
6440c13bfe Updated manual. 2018-11-15 18:50:56 -08:00
NissimHadar
7fba4c4673 Deleted unneeded file. 2018-11-15 17:41:01 -08:00
birarda
bb0f046a72 add throttle start and backoff to DS settings 2018-11-15 17:28:34 -08:00
Howard Stearns
8e1785bd90 security settings post-oculus-store wording 2018-11-15 15:59:52 -08:00
Jamil Akram
35ec0b60ab
Merge pull request #14251 from humbletim/fb18302-deprecated-package-model 
FB18302 Remove deprecated Package Model functionality
 2018-11-15 15:52:04 -08:00
David Back
de7f4a4a4d fix entity list resizing 2018-11-15 15:23:18 -08:00
John Conklin II
1ea2ab338e
Merge pull request #13975 from ElderOrb/FB16697 
Fix multiple issues on 'Calibration' tab of 'Controls' dialog
 2018-11-15 14:54:26 -08:00
r3tk0n
60832b071c Fix logic for cases with rift headset but no touch controllers. 2018-11-15 14:08:38 -08:00
r3tk0n
34224c4f16 Fix XBox One controller detection. 2018-11-15 14:08:21 -08:00
John Conklin II
60c538309a
Merge pull request #14411 from SamGondelman/fading 
Fix for avatar flashing on fade out
 2018-11-15 13:58:43 -08:00
John Conklin II
83660ab8e1
Merge pull request #14128 from Zvork/ao 
Improved Ambient Occlusion
 2018-11-15 13:57:13 -08:00
John Conklin II
8177d5bbcd
Merge pull request #14275 from Atlante45/fix/injector-crash 
Rework audio data memory ownership model to fix injector crashes
 2018-11-15 13:25:42 -08:00
Dante Ruiz
20ad05726e entity server timout 2018-11-15 10:52:40 -08:00
SamGondelman
597ff773e1 fix for avatar flashing 2018-11-15 10:52:22 -08:00
NissimHadar
e6190eb429 Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-15 10:45:05 -08:00
Brad Hefta-Gaub
20766da624
Merge pull request #14382 from dback2/newPropertySliders 
Entity properties - new draggable numbers
 2018-11-15 10:01:07 -08:00
Jeff Clinton
c72dd3d690
Merge pull request #14395 from ctrlaltdavid/M19859 
Fix Goto app clicks not working
 2018-11-15 09:56:56 -08:00
Olivier Prat
0401858129 Cleaned up do_draw in GLESBackend 2018-11-15 18:34:41 +01:00
Jamil Akram
60b58977cd
Merge pull request #14267 from humbletim/fb17479-fix-handshake-keyrelease 
FB17479 - Fix scripted key release events for handshakes.
 2018-11-15 09:21:32 -08:00
Olivier Prat
ed42c94772 Merge branch 'master' of http://github.com/highfidelity/hifi into ao 2018-11-15 17:55:29 +01:00
NissimHadar
fb0a84e800 CR updates. 2018-11-15 07:54:56 -08:00
NissimHadar
1e17b878e7 CR updates. 2018-11-15 07:32:26 -08:00
humbletim
d0e4c62978 fix merge conflict 2018-11-14 23:50:02 -05:00
humbletim
21030fbe5b Merge remote-tracking branch 'upstream/master' into fb18302-deprecated-package-model 2018-11-14 23:40:04 -05:00
NissimHadar
a74e123229 Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-14 20:20:41 -08:00
John Conklin II
ef3acae896
Merge pull request #14407 from jherico/fix/19876 
Case 19876: Fix procedurals using the iGlobalTime input
 2018-11-14 17:18:57 -08:00
David Back
dfed797682 set more min/max/steps 2018-11-14 15:44:30 -08:00
Atlante45
31033ad685 Update TTS audio API use 2018-11-14 15:42:39 -08:00
Brad Davis
b7c567af08 Fix procedurals using the iGlobalTime input 2018-11-14 15:28:22 -08:00
Dante Ruiz
f17723c216 disable interstitial for master 2018-11-14 14:50:38 -08:00