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

79679 commits

This branch
This branch
All branches
Author SHA1 Message Date
dante ruiz
d20f50fa3c redoing some work 2019-06-27 20:53:23 -07:00
Simon Walton
9b894456e9 Change address for sequence-number hash also 2019-06-27 17:29:17 -07:00
Brad Davis
8bcde84d89 Disable remote QML unless whitelisted 2019-06-27 16:37:56 -07:00
Zach Fox
95ed908dc0 Merge branch 'master' of github.com:highfidelity/hifi into PTTAttenuationOption 2019-06-27 15:58:42 -07:00
Zach Fox
8af469992e BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option 2019-06-27 15:55:58 -07:00
Simon Walton
1265531f79 Plumb down change of destination address 2019-06-27 15:52:39 -07:00
Andrew Meadows
0bec2bca83 OctreePacketProcessor should process packet even when no SafeLanding 2019-06-27 14:44:23 -07:00
Zach Fox
b95586239a
Merge pull request #15847 from zfox23/removePTTAttenuation 
BUGZ-363: Remove 20dB output attenuation during PTT
 2019-06-27 13:45:49 -07:00
Andrew Meadows
45ffa2bb1f
Merge pull request #15827 from raveenajain/nitpick_shadows 
BUGZ 598: nitpick tests failing due to shadow issue
 2019-06-27 13:37:31 -07:00
Zach Fox
7c189d46f2 BUGZ-363: Remove 20dB output attenuation during PTT 2019-06-27 13:28:29 -07:00
David Rowe
9f01cc2f32 Merge branch 'master' into DOC-79 2019-06-28 08:14:12 +12:00
jennaingersoll
b6cefd8dfb
Merge pull request #15786 from ChristophHaag/patch-1 
Update jsdoc to avoid breakage with recent node
 2019-06-27 13:06:12 -07:00
raveenajain
3a60bc6a13 clang braces fix 2019-06-27 11:52:43 -07:00
dooglifeSF
7856ab611f rig shoulder rotation order fixed, animations batch converted and polished, json updated with new ranges for side steps, tabs converted to spaces 2019-06-27 11:37:05 -07:00
Andrew Meadows
bf068a3211 fix SafeLanding start/stop on entity-server connection flow 2019-06-27 11:33:51 -07:00
raveenajain
d6fb7f8a6f arrays for bias calcs 2019-06-27 10:42:14 -07:00
raveenajain
309e59ca8b Merge branch 'master' of https://github.com/highfidelity/hifi into nitpick_shadows 2019-06-27 09:42:03 -07:00
raveenajain
04afbde188 cascade loop, fine tune calc 2019-06-27 09:41:39 -07:00
Shannon Romano
417e02ac9d
Merge pull request #15845 from SamGondelman/threadpool 
BUGZ-861: Wait on QThreadPool threads on shutdown
 2019-06-27 08:42:06 -07:00
Andrew Meadows
dfb7ac7044 name changes and improved flow for SafeLanding logic 2019-06-27 08:14:34 -07:00
Simon Walton
50965f1916 Handle remote public-address changes 2019-06-26 18:04:41 -07:00
Anna
6b79b275a9 fixed reinhard and filmic curves 2019-06-26 18:00:49 -07:00
Anna
24b6d64e34 removed extraneous code for hmd 2019-06-26 17:27:53 -07:00
Andrew Meadows
00185ee82e cleaup to help unravel one spaghetti strand 2019-06-26 17:05:44 -07:00
Anna
6f5b37ec87 removed extraneous conversion to SRGB and back during deferred rendering 2019-06-26 16:36:04 -07:00
Andrew Meadows
496a7f3608 less cruft, more readable 2019-06-26 16:02:00 -07:00
raveenajain
534794d7ff move bias init from config to run 2019-06-26 15:42:11 -07:00
Andrew Meadows
46b3d84be5 remove unused cruft 2019-06-26 15:41:50 -07:00
Shannon Romano
a3d6dd2623
Merge pull request #15844 from annabrewer/color-banding 
BUGZ-828: Color banding showing up in recent builds
 2019-06-26 15:41:22 -07:00
Andrew Meadows
355de0e6d5 move Application::setFailedToConnect() to cpp for easier debugging 2019-06-26 15:41:01 -07:00
Andrew Meadows
c96b704a28 avoid dupe connections and teardown old connections 2019-06-26 15:38:59 -07:00
SamGondelman
5937a219dd wait on thread pool threads 2019-06-26 15:25:17 -07:00
Shannon Romano
b96db7517c
Merge pull request #15836 from RebeccaStankus/create 
BUGZ-659 Fix create menu paths
 2019-06-26 11:52:02 -07:00
Sam Gondelman
7573c1207b
remove extra alpha check in deferred sdf_text3D.slf 2019-06-26 11:21:52 -07:00
Zach Fox
6e4b9c1723
Merge pull request #15774 from PrestonB1123/iconChanges 
New Top Bar Icons
 2019-06-26 11:01:12 -07:00
Preston Bezos
f0dd28e71a removed extra line 2019-06-26 09:54:43 -07:00
dooglifeSF
9f8d1dd51d Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-26 09:31:23 -07:00
Anna
59505ab20f fixed color banding on rift 2019-06-26 09:29:06 -07:00
Preston Bezos
bd3fe8a092 fixed conflict and spacing 2019-06-26 09:12:32 -07:00
Brad Hefta-Gaub
06bb09ff58
Merge pull request #15841 from SimonWalton-HiFi/accountmanager-quit-signal 
BUGZ-789: Use a queued signal to quit from AccountManager::saveLoginStatus()
 2019-06-25 17:20:41 -07:00
MiladNazeri
7d6cff46ff
Merge pull request #15842 from MiladNazeri/refreshNametagLifetime 
[BUGZ 798] :: updated lifetime
 2019-06-25 19:32:33 -04:00
RebeccaStankus
d8daee49a8 Fixed bad path to gridControls 2019-06-25 16:31:21 -07:00
milad
72867437be updated lifetime 2019-06-25 15:38:02 -07:00
Shannon Romano
2af701235a
Merge pull request #15815 from annabrewer/snapshot-gamma 
BUGZ-765: Snaps Photos are Dark
 2019-06-25 15:26:00 -07:00
Shannon Romano
d13b8d354c
Merge pull request #15840 from danteruiz/launcher-issues 
BUGZ-837: Fix Launcher crash (mac)
 2019-06-25 15:04:44 -07:00
Simon Walton
b4e1c2264c Use a queued signal to quit from AccountManager::saveLoginStatus() 2019-06-25 14:47:58 -07:00
Sam Gateau
48f9c33bdd
Merge pull request #15822 from samcake/yellow 
BUGZ-664: Introduce scaling of rendering for forward renderer
 2019-06-25 14:27:17 -07:00
Andrew Meadows
20376c9542
Merge pull request #15823 from ctrlaltdavid/DOC-79 
DOC-79: Entities JSDoc Update
 2019-06-25 14:18:13 -07:00
dante ruiz
1e38e7b7eb print out exception error 2019-06-25 14:11:41 -07:00
Andrew Meadows
adce2a6fd0
Merge pull request #15838 from kencooke/render-blendshape-optim-avx2 
Fix Mac crash caused by PR#15825
 2019-06-25 13:54:39 -07:00