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

47295 commits

This branch
This branch
All branches
Author SHA1 Message Date
howard-stearns
579c95b5dd pr feedback 2016-10-12 14:42:41 -07:00
howard-stearns
055e2ffcb0 Merge branch 'master' of https://github.com/highfidelity/hifi into crowd-animation 2016-10-12 14:38:07 -07:00
Howard Stearns
08f3a85aab Merge pull request #8751 from davidkelly/dk/codecInAgentAvatar 
Have avatar sounds negotiate codecs
 2016-10-12 14:32:39 -07:00
Brad Davis
2d6522a76f Merge pull request #8786 from hyperlogic/bug-fix/more-openvr-shutdown-crashes 
Prevent crashes in openvr on shutdown
 2016-10-12 13:54:56 -07:00
Chris Collins
58d4eb7452 Merge pull request #8788 from ctrlaltdavid/fix-asset-browser 
QA READY: Fix Asset Browser add-to-world
 2016-10-12 13:02:35 -07:00
David Kelly
c8850a8b8e PR feedback 
AgentAvatarTimer now in its own files.  The thread still is created
the same way, and started only when you are an avatar, but now I
remember to stop it when you no longer are one.  Audio is still at
100Hz, but avatar messages go at 60Hz as before.  Unsure it matters,
but easy to do.   Looking at that buzz now.
 2016-10-12 12:44:24 -07:00
David Rowe
18f19b07d4 Fix checkbox not being disabled per dropdown default 
And tweak checkbox position.
 2016-10-13 08:37:30 +13:00
Seth Alves
16af14d1f6 Merge pull request #8758 from hyperlogic/bug-fix/allow-ignoreik-false 
allow equipped object to follow hand and not controller
 2016-10-12 09:52:57 -07:00
Brad Davis
4e0fffb8b7 Merge pull request #8779 from gcalero/shaders_gl_es 
Adapt shader for GL ES support
 2016-10-12 08:32:50 -07:00
Brad Hefta-Gaub
0f1e61e240 Merge pull request #8781 from ZappoMan/tweakGrabPoint 
adjust grab indicators
 2016-10-12 07:08:16 -07:00
David Rowe
86f6cee2ad Fix Asset Browser add-to-world drop-down 2016-10-12 20:08:33 +13:00
David Rowe
ee31e3b896 Fix Asset Browser add-to-world with spaces unwittingly appended to names 2016-10-12 20:08:15 +13:00
Brad Hefta-Gaub
6630ec3208 Merge pull request #8746 from ctrlaltdavid/21033 
Send High Fidelity user's visibility when users.js starts up
 2016-10-11 21:36:22 -07:00
Brad Hefta-Gaub
8e8eba5e0c Merge pull request #8770 from jherico/textures_tweak 
Fix GPU texture counter, better logging for memory pressure
 2016-10-11 21:36:03 -07:00
Brad Hefta-Gaub
8ac31a041d Merge pull request #8654 from ZappoMan/betterAway 
fix away HMD unmouted logic
 2016-10-11 20:35:08 -07:00
Brad Hefta-Gaub
cded9c03f9 Merge pull request #8767 from ZappoMan/viveControllerFixes 
fix 'any endpoints' for axis style inputs
 2016-10-11 20:33:35 -07:00
Stephen Birarda
33e426bfd2 Merge pull request #8778 from Atlante45/asset-client 
Fix crash in AssetClient handleProgressCallback
 2016-10-11 18:36:23 -07:00
Anthony J. Thibault
f76dbeeffd Edit.js now works with new ignoreIK default 2016-10-11 17:12:02 -07:00
Anthony J. Thibault
973ee544fb Prevent crashes in openvr on shutdown 
By ensuring that there is an opengl context is bound before calling VR_Shutdown()
 2016-10-11 16:36:29 -07:00
Brad Davis
8f42e564b4 Disable 'min free GPU memory', bump max texture memory 65% 2016-10-11 16:34:54 -07:00
Brad Davis
1e7dd7db64 Fix GPU texture counter, better logging for memory pressure 2016-10-11 16:28:16 -07:00
Brad Hefta-Gaub
e1a3bc7d55 hide/show grab point sphere only when in a grabbable entity 2016-10-11 16:22:42 -07:00
howard-stearns
884d22a59b make agent avatar animations work again, and use them in crowds 2016-10-11 16:06:55 -07:00
Brad Hefta-Gaub
5615f883ce Merge pull request #8783 from ZappoMan/xboxControllerTweaks 
fix xbox to match help
 2016-10-11 16:03:34 -07:00
Brad Hefta-Gaub
3054311d60 Merge pull request #8782 from samcake/yellow 
Fixing the key light pass with ambient map
 2016-10-11 16:03:24 -07:00
samcake
3ebab3b017 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2016-10-11 15:45:10 -07:00
Brad Hefta-Gaub
95c1237f66 Merge pull request #8776 from samcake/color 
Add check for bad texture resource slot
 2016-10-11 14:50:56 -07:00
samcake
7ea790aa4f adding a comment to explain what we are doing 2016-10-11 14:43:41 -07:00
Brad Hefta-Gaub
f532affdf3 hardwire xbox to match help 2016-10-11 14:39:45 -07:00
Stephen Birarda
a8568ac821 Merge pull request #8775 from birarda/master 
remove AssetResourceRequest timeout, output occasional progress to log
 2016-10-11 14:31:51 -07:00
Brad Hefta-Gaub
c1763da9b1 Merge pull request #8774 from hyperlogic/bug-fix/oculus-to-desktop-crash 
Fix crash when switching to desktop mode from oculus HMD mode
 2016-10-11 14:29:28 -07:00
Stephen Birarda
504e92607a change format of debug message 2016-10-11 13:23:52 -07:00
Stephen Birarda
20ea7e6c98 change QLoggingCategory include casing 2016-10-11 13:21:53 -07:00
Stephen Birarda
07d0a038a5 set the initial last progress debug 5s back 2016-10-11 13:21:15 -07:00
samcake
7af3aa53ac Fixing the key light pass with ambient map 2016-10-11 13:20:32 -07:00
Stephen Birarda
a0c27e2130 remove timer forced timeouts in ARR, occasionally ouput DL progress 2016-10-11 13:17:57 -07:00
Atlante45
e7e9c71625 Fix AssetClient crash 
Do not access message data until message is complete
 2016-10-11 13:05:57 -07:00
Brad Hefta-Gaub
93d9cf7917 adjust grab indicators 2016-10-11 12:42:26 -07:00
Anthony J. Thibault
350977f03e Speculative fix for crash in AudioClient 2016-10-11 10:49:43 -07:00
Andrew Meadows
abb05bc686 Merge pull request #8753 from ctrlaltdavid/21068 
Improve indication of user not being logged in
 2016-10-11 10:40:37 -07:00
Howard Stearns
48c168fa73 Merge pull request #8769 from sethalves/avoid-ds-ice-metaverse-race 
fix domain-server update metaverse bug
 2016-10-11 10:04:12 -07:00
Stephen Birarda
826c2f1a9f push the AssetResourceRequest timeout to 15s 2016-10-11 09:55:16 -07:00
Stephen Birarda
ec5850b82b emit ReceivedMessage progress signals more frequently for new timeout 2016-10-11 09:55:05 -07:00
David Kelly
1fb7b42f0b One more comment removed 2016-10-11 09:37:42 -07:00
David Kelly
ef844cbd00 Cleanup artifacts 
Seems playAvatarSound could be called from a thread other than
the Agent's thread.  So, artifacts happen when that pointer changes
while a 'tick' is happening.  Also cleaned up code a bit, got rid
of some hard-coded stuff I had in just for dev purposes.
 2016-10-11 09:33:55 -07:00
Gabriel Calero
834d9c0710 Adapt shader for GL ES support which requires operators of the same datatype 2016-10-11 12:15:49 -03:00
David Kelly
0794d95bdc Fix merge 
Take the new crowd-agent.js, my changes were temporary.
 2016-10-10 19:58:16 -07:00
David Kelly
fa9c3951c7 Merge branch 'master' into dk/codecInAgentAvatar 2016-10-10 19:51:56 -07:00
samcake
0951ca6bbe Add check for bad texture resource slot 2016-10-10 18:43:24 -07:00
David Kelly
b58c36cb12 Rolling my own 100hz timer 
Starting with the simplest possible thing - just sleep for 10000
microseconds.  Can make it adaptive if need be.
 2016-10-10 17:57:04 -07:00