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

39492 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
eabeb98076 injector load 2016-02-18 11:50:26 -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
Zach Pomerantz
f79fc30b83 Update audioscope to use new renderGrid 2016-02-18 11:30:53 -08:00
Zach Pomerantz
2bfbf1b5fd Reimplement renderGrid to use frag shader 2016-02-18 11:30:03 -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
Chris Collins
e3ae2baa7b Merge pull request #7123 from ericrius1/editProps 
added collidesWith property to entities list
 2016-02-18 09:11:18 -08:00
James B. Pollack
acaa824cb5 but only position 2016-02-18 09:00:39 -08:00
James B. Pollack
e6662edcb4 revert step size change 2016-02-18 08:57:06 -08:00
Brad Hefta-Gaub
279519b6d5 hmd mouse check point 2016-02-18 08:44:22 -08:00
David Rowe
54b27f3ac3 Merge branch 'master' into 20805 2016-02-18 23:35:37 +13:00
David Rowe
c07b1f9b1e Tidying 2016-02-18 23:06:26 +13:00
David Rowe
b68837277c Fix default focus 2016-02-18 22:12:43 +13:00
David Rowe
81169c59c8 Fix runtime warnings 2016-02-18 19:52:20 +13:00
Brad Hefta-Gaub
8b8b99c7e0 HMD mouse checkpoint 2016-02-17 21:19:01 -08:00
David Rowe
4df77cff31 Add scrollbars to running scripts and available scripts tables 2016-02-18 18:10:58 +13: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
Brad Hefta-Gaub
39592a583f Merge pull request #7130 from ericrius1/editFix 
fixed edit bug
 2016-02-17 20:02:36 -08:00
David Rowe
d32f743f52 Style running scripts and available scripts tables 2016-02-18 16:35:51 +13:00
ericrius1
5f5af9c6a0 fixed edit bug 2016-02-17 17:45:57 -08:00
James B. Pollack
5aa2979a86 Merge pull request #7127 from sethalves/BUGS 
fix far-trigger
 2016-02-17 16:29:44 -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
James B. Pollack
89039747a2 Update entityProperties.html 
lowercase 'static' like other props
 2016-02-17 16:22:14 -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
ericrius1
19cd3ec152 checkboxes working 2016-02-17 13:12:17 -08:00
Seth Alves
64e50c5329 keep search-line from freezing during a far-trigger 2016-02-17 12:35:23 -08:00
Seth Alves
784dc2b538 Merge pull request #7124 from samcake/red 
Fixing the disappearing avatars maybe ?
 2016-02-17 12:05:04 -08:00
Seth Alves
69caf1df4d fix far-trigger 2016-02-17 12:04:25 -08:00
ericrius1
94fdf6b091 checkboxes working 2016-02-17 11:59:14 -08:00
Anthony J. Thibault
3426173d1d AnimInverseKinematics: open up shoulder swing constraint. 2016-02-17 11:44:11 -08:00
ericrius1
f85916e808 checkbox keeps getting checked... 2016-02-17 10:27:53 -08:00
Brad Hefta-Gaub
38430d8d2c Merge pull request #7112 from howard-stearns/snap-turn-preference 
Snap turn preference
 2016-02-17 09:19:38 -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
David Rowe
b2314d33ba Style and lay out text fields 2016-02-17 20:44:09 +13:00
David Rowe
2a25509f7c Further font fixes 2016-02-17 20:38:01 +13:00
ericrius1
0f8f67ef0b removing dynamic. need to add others 2016-02-16 19:34:32 -08:00
David Rowe
f568b1c67f Fix display of Raleway Bold 2016-02-17 16:19:00 +13:00
David Rowe
61d359a9b5 Style Button controls 2016-02-17 16:12:11 +13:00
David Rowe
1164e3e303 Set up window pane's content width so that can right-align 2016-02-17 15:35:35 +13:00
James B. Pollack
f2445e81e0 Merge pull request #7110 from ericrius1/particlesInEdit2 
Particles in edit
 2016-02-16 18:33:01 -08:00
ericrius1
168fb67d67 making collidesWith a checkbox 2016-02-16 18:19:12 -08:00
Howard Stearns
6d70584b5a Change name and use only when in HMD. 2016-02-16 18:09:56 -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