Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39385 commits 2 branches 0 tags 1.1 GiB
Commit graph

15931 commits

Author SHA1 Message Date
Brad Hefta-Gaub
2c7c6be6a6 fix build buster 2016-02-21 10:40:11 -08:00
Brad Hefta-Gaub
a12446dab5 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
 2016-02-21 10:10:24 -08:00
Brad Hefta-Gaub
f41ebdf71d CR feedback 2016-02-21 10:03:54 -08:00
Brad Hefta-Gaub
dd558f0656 Merge pull request #7147 from jherico/too_many_webs 
Too many (or too large) web views crash Interface
 2016-02-21 10:03:16 -08:00
Brad Hefta-Gaub
1a4591db58 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-21 09:30:41 -08:00
Thijs Wenker
58539171a3 give particle trails a nice smooth path between frames 2016-02-20 22:46:19 +01:00
Brad Davis
786747c2d7 Properly preserve and restore the GL context after building a web entity 2016-02-20 12:01:34 -08:00
Brad Hefta-Gaub
e6614fb9e5 Merge pull request #7141 from sethalves/fix-avatar-fade 
Fix avatar fade
 2016-02-20 10:26:07 -08:00
Brad Hefta-Gaub
db448c240f Merge pull request #7122 from howard-stearns/audio-output-buffer 
Audio output buffer
 2016-02-20 09:40:06 -08:00
Brad Hefta-Gaub
04fa37324f tweak to virtual desktop size, to make text more readable, 240d horz FOV 2016-02-19 18:24:32 -08:00
Brad Davis
021b86c3fe Cap the max concurrent webviews, and deallocate unrendered views after 30 seconds 2016-02-19 15:41:40 -08:00
Brad Davis
64ec56bf89 Guards and warnings in QML rendering 2016-02-19 15:36:51 -08:00
howard-stearns
e21d9042d0 Remove some logging. 2016-02-19 13:34:06 -08:00
Brad Hefta-Gaub
7be5811f34 tweak to UI size, clean up screen to overlay 2016-02-19 13:22:37 -08:00
Seth Alves
fea60499d4 rename poorly named variable 2016-02-19 11:32:59 -08:00
Chris Collins
1fe9bb2c6c Merge pull request #7142 from howard-stearns/null-audio-injector 
null audio injector
 2016-02-19 11:32:01 -08:00
Howard Stearns
fcdc6dd6fa When we don't make an audo injector (because we're at a limit), make sure the value returned to scripts is null. 2016-02-19 10:54:53 -08:00
Andrew Meadows
c53e583bf4 Merge pull request #7129 from hyperlogic/tony/no-hands-in-body 
Prevent avatar's wrists from entering torso
 2016-02-19 10:53:12 -08:00
Seth Alves
ee5a82f9b8 call simulate from setScaleInternal rather than just initJointTransforms so the scale change is visible 2016-02-19 10:05:22 -08:00
Brad Hefta-Gaub
dd8e5fd199 removed dead code 2016-02-18 20:21:42 -08:00
howard-stearns
adb33e7dca Up default initial buffer frame size to the value from before. 2016-02-18 16:32:18 -08:00
howard-stearns
162be13914 Don't keep adding signal connections. More logging. 2016-02-18 16:14:03 -08:00
howard-stearns
30ae1950d2 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-output-buffer 2016-02-18 11:35:41 -08:00
Brad Hefta-Gaub
0467930c57 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 
Conflicts:
	examples/controllers/handControllerGrab.js
 2016-02-18 10:30:43 -08:00
Anthony J. Thibault
613b60658e Rig: prevent normalization of a zero vector 2016-02-18 10:24:36 -08:00
Brad Hefta-Gaub
c4fc3e4057 more work on dragging in hmd 2016-02-18 10:07:37 -08:00
Brad Hefta-Gaub
279519b6d5 hmd mouse check point 2016-02-18 08:44:22 -08:00
Brad Hefta-Gaub
8b8b99c7e0 HMD mouse checkpoint 2016-02-17 21:19:01 -08:00
Brad Hefta-Gaub
a3766a93ea Merge pull request #7128 from sethalves/fix-energy 
minor adjustments to avatar-energy code
 2016-02-17 20:04:35 -08:00
Anthony J. Thibault
73ac47724a Rig: Prevent the hand IK targets from entering the body. 
Use a 2d circle/circle intersection test to keep the hands outside of the body.
 2016-02-17 16:23:18 -08:00
Anthony Thibault
e863da5a68 Merge pull request #7118 from jherico/hmd_mono 
Remove distortion on HMD previews, both mono and stereo
 2016-02-17 15:39:48 -08:00
Brad Davis
8289c39a2a Removing flicker from OpenVR mirror 2016-02-17 14:48:24 -08:00
Seth Alves
af1640ac4e adjust avatar-energy code to avoid editing local tree and then not telling the entity-server about it 2016-02-17 14:36:18 -08:00
howard-stearns
547d3d6b9a Merge branch 'audio-output-buffer' of https://github.com/howard-stearns/hifi into audio-output-buffer 2016-02-17 13:57:21 -08:00
howard-stearns
b8b1565470 Don't fake-fail the format test. Trust the os. 2016-02-17 13:46:48 -08:00
Anthony J. Thibault
3426173d1d AnimInverseKinematics: open up shoulder swing constraint. 2016-02-17 11:44:11 -08:00
Brad Hefta-Gaub
d5c349abec Merge pull request #7114 from samcake/hdr 
Adding Ambient lighting to transparent surfaces
 2016-02-17 09:08:38 -08:00
Andrew Meadows
07df96b6b3 Merge pull request #7125 from hyperlogic/tony/ik-bugfix 
AnimInverseKinematics: fix for extra twist in lowerSpine joints.
 2016-02-17 08:56:16 -08:00
Anthony J. Thibault
2d1304e070 AnimInverseKinematics: use glm::clamp for clarity. 2016-02-16 18:00:45 -08:00
Howard Stearns
983a0ccb9b Change internal preference names so that old users pick up the new default values, and change name in dialog. 2016-02-16 18:00:39 -08:00
Anthony J. Thibault
b5a72225db AnimInverseKinematics: renamed variable for extra style points 2016-02-16 17:42:51 -08:00
Anthony J. Thibault
df21fffa4a AnimInverseKinematics: fix for extra twist in lowerSpine joints. 
* When computing tipPosition, for the next iteration of the CCD,
  use the leverArm before it's projected onto the lowerSpine twist axis.
* fix for acos() that was going outside of valid domain. (-1.0, 1.0)
 2016-02-16 17:31:39 -08:00
Brad Davis
d61f4fbb25 PR feedback 2016-02-16 16:44:16 -08:00
Andrew Meadows
80aee563fc Merge pull request #7119 from sethalves/fix-linux-local-scriptnames 
filenames on Linux are case-sensitive
 2016-02-16 13:27:14 -08:00
Brad Hefta-Gaub
a25581c656 clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor) 2016-02-16 12:11:58 -08:00
Andrew Meadows
fd8073f6b5 init drawstatus to false 2016-02-16 12:11:19 -08:00
howard-stearns
d328b82c3c Default output buffer size is 1 frame, and automatic updates don't persist 
changes (just in-memory).
 2016-02-16 12:09:44 -08:00
howard-stearns
14b3ab495a Merge branch 'master' of https://github.com/highfidelity/hifi into audio-output-buffer 2016-02-16 11:23:59 -08:00
Howard Stearns
4255b1f9aa Change output buffer size on correct thread, and turn on automatic resizing on all platforms instead of just mac. 2016-02-16 11:22:01 -08:00
Andrew Meadows
492c026f78 Merge pull request #7102 from zzmp/fix/model-tex-revert 
Revert model texs when unset
 2016-02-16 09:25:40 -08:00