Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 14:07:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
72516 commits 75 branches 59 tags 1.2 GiB
Commit graph

4103 commits

Author SHA1 Message Date
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1 
move grab pseudo-properties (userData) into first-class EntityItemProperties
 2018-10-17 13:29:20 -07:00
John Conklin II
e59e3720fe
Merge pull request #14139 from SamGondelman/animation 
Fix various ResourceCache bugs
 2018-10-17 11:13:35 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged 
Merged interstitial page/redirect domain improvements
 2018-10-08 10:32:29 -07:00
Stephen Birarda
88f76ac760 suppress traits larger than INT16_MAX bytes 2018-10-05 09:46:55 -07:00
Dante Ruiz
651f37aceb Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged 2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d fix loading progress 2018-10-04 15:01:16 -07:00
SamGondelman
4024f2a180 fix various resourcecache bugs 2018-10-04 11:29:22 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
Wayne Chen
d6af09ca62 ignoring entities in interstitial/saving address on 404 error 2018-10-03 17:40:42 -07:00
John Conklin II
4d7b2bb429
Merge pull request #14113 from Atlante45/feat/audio-mixer-throttle-equation 
Audio Mixer Scaling
 2018-10-03 13:17:28 -07:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f 
Mini tablet in palm
 2018-10-01 16:56:36 -07:00
Wayne Chen
5f05be554f check for hard refusal to 404 2018-10-01 10:06:13 -07:00
Wayne Chen
eab57633a5 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-01 09:21:26 -07:00
Stephen Birarda
371de312cc enumerate a vector of mixable streams for each listener 2018-09-28 14:54:50 -07:00
Stephen Birarda
aed79b3b17 use a vector for ignored node IDs 2018-09-28 14:54:49 -07:00
David Rowe
2456fd0e99 Merge branch 'master' into M17428-f 2018-09-28 08:41:57 +12:00
Roxanne Skelly
af6db93b70 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-27 12:05:21 -07:00
Wayne Chen
9079c8a6b7 adding log for redirect cases 2018-09-27 10:42:21 -07:00
Wayne Chen
db41a1c16b error state signal for 404/interstitial 2018-09-26 13:48:15 -07:00
Wayne Chen
de5614500a Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialImprovements 2018-09-25 21:52:01 -07:00
Wayne Chen
26b6967ba6 adding overlays to redirect domain 2018-09-25 18:16:18 -07:00
Wayne Chen
69d5299362 patching fix for previous commits 2018-09-24 15:22:46 -07:00
Wayne Chen
ac5814a1f8 Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect 2018-09-24 13:57:23 -07:00
Roxanne Skelly
61cbee72af Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-21 12:31:36 -07:00
Wayne Chen
7e796f7e7f committing requested changes 2018-09-19 14:26:30 -07:00
Roxanne Skelly
d5f756c79d Tray Notifier Checkpoint 
* Add app launch
* Add authentication for auth-related calls
* Refactor notifications code
 2018-09-19 12:40:15 -07:00
Wayne Chen
01594d7a52 fixing settings check in domain handler 2018-09-19 10:17:14 -07:00
Wayne Chen
795580f4e1 adding 404 redirect toggle with interstitial 2018-09-19 09:55:15 -07:00
Wayne Chen
be5f498c2f reversion 2018-09-18 15:47:54 -07:00
Wayne Chen
48e4b38312 reversion 2018-09-18 15:28:15 -07:00
Wayne Chen
8274f4cb4c reverting domain handler change 2018-09-18 15:26:12 -07:00
Wayne Chen
f82063ed46 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-09-18 09:17:28 -07:00
Wayne Chen
0afea6fbd1 removing double login fail signal 2018-09-14 11:08:53 -07:00
Wayne Chen
fd1e64e4e6
Revert "Fix login fail twice call" 2018-09-13 17:01:59 -07:00
John Conklin II
aef3ed3e01
Merge pull request #13989 from wayne-chen/fixLoginFailTwiceCall 
Fix login fail twice call
 2018-09-13 16:59:00 -07:00
Wayne Chen
0fc1cc9af8 Revert "adding fix for getting DomainHandler into error state" 
This reverts commit 49f26d968a.
 2018-09-13 15:39:18 -07:00
David Rowe
bbfb2b1374 Merge branch 'master' into M17428-f 2018-09-14 10:36:49 +12:00
John Conklin II
0bf064c451
Merge pull request #13984 from wayne-chen/fixLoopingConnectionMonitor 
Fixing Error State for Timeout/localhost Redirection
 2018-09-13 15:19:55 -07:00
Wayne Chen
647c4e1694 adding true fix for localhost timeouts 2018-09-13 13:51:42 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling 
Performance improvements for Avatar Mixer
 2018-09-13 13:43:18 -07:00
Wayne Chen
873859455a Revert "adding fix for getting DomainHandler into error state" 
This reverts commit 3fe3f674d0.
 2018-09-13 11:53:56 -07:00
Wayne Chen
380f24b37f adding fix, changing window title 2018-09-13 11:53:21 -07:00
Wayne Chen
96ab7d417e removing connection for on login failed 2018-09-13 10:35:43 -07:00
Wayne Chen
ad233677b8 adding changes for overriding host change for error state 2018-09-12 18:31:01 -07:00
Wayne Chen
3fe3f674d0 adding fix for getting DomainHandler into error state 2018-09-12 15:45:06 -07:00
Wayne Chen
49f26d968a adding fix for getting DomainHandler into error state 2018-09-12 15:42:55 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged 
Interstitial Page with 404 Redirect
 2018-09-12 08:39:52 -07:00
Wayne Chen
20cab87a17 Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-11 18:53:06 -07:00
Wayne Chen
a7321f950a pushing requested changes - adding timeout refusal 2018-09-11 18:32:17 -07:00