Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 00:43:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
52075 commits 25 branches 0 tags 1.1 GiB
Commit graph

52075 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ken Cooke
818425707b update unit tests 2017-03-04 16:14:31 -08:00
Ken Cooke
a5571bd49d redo unsafe optimization 2017-03-04 16:02:39 -08:00
Ken Cooke
44c1f8500d redo unsafe optimization 2017-03-04 15:55:53 -08:00
Ken Cooke
50f92cb934 redo unsafe optimization 2017-03-04 15:29:23 -08:00
Ken Cooke
46c5f96113 redo unsafe optimization 2017-03-04 15:24:03 -08:00
Ken Cooke
117bba8b6a redo unsafe optimization 2017-03-04 15:17:09 -08:00
Ken Cooke
0bababf1f5 Safe replacement of glm_mat4_mul() for unaligned arguments instead of __m128 2017-03-04 14:53:07 -08:00
Seth Alves
c677326025 Merge pull request #9754 from hyperlogic/feature/fingers-on-tablet 
Touch the tablet with your finger
 2017-03-04 11:58:47 -08:00
Menithal
fe19b5511c Fixed up blocks scripts 2017-03-04 21:55:21 +02:00
Menithal
ea3f7f0274 Initial Magnetic block 2017-03-04 18:50:30 +02:00
Menithal
d85cb645b0 Changed limit logic, default limit is now 0 
Clones now have a named based on the original entity id
Limit is now calculated from the source instance, instead of just clone
name to avoid a single box being calculated as something else
Default limit is now 0, which disables limit
 2017-03-04 11:42:43 +02:00
Menithal
6d4abca0c1 Base line progress 2017-03-04 11:12:19 +02:00
ZappoMan
9908723bb9 fist cut at basic TriangleSet class 2017-03-03 22:27:38 -08:00
David Rowe
6385bb2b80 Open general settings dialog in tablet from tablet menu 2017-03-04 15:57:58 +13:00
David Rowe
0333122b23 Make Save and Cancel buttons close preferences dialog 2017-03-04 15:27:31 +13:00
howard-stearns
15d680d4f9 preserve audio data during pal refresh 2017-03-03 16:56:12 -08:00
howard-stearns
a715a694f0 fix 'banned user doesn't disappear from pal until refresh' 2017-03-03 16:27:38 -08:00
David Rowe
53cfad65cd Add keyboard to preferences dialogs 2017-03-04 13:01:02 +13:00
Brad Hefta-Gaub
aaec6ce9f7 Merge pull request #9722 from davidkelly/dk/agentAvatarDataUpdates 
Agent Avatars sending loudness in AvatarData
 2017-03-03 14:26:26 -08:00
Anthony J. Thibault
e56f02d94f Changed default for preferFingerOverStylus to false. 2017-03-03 14:12:04 -08:00
Seth Alves
bccfa79e8b Merge pull request #9749 from ctrlaltdavid/21176 
If someone else is grabbing entity you want to grab show their grab beam
 2017-03-03 13:43:28 -08:00
David Rowe
6403e51d20 Merge branch 'tablet-ui-edit-js' into 21199 2017-03-04 09:00:49 +13:00
David Rowe
48ee661f02 Merge branch 'tablet-ui-edit-js' into 21197 2017-03-04 08:58:48 +13:00
Bradley Austin Davis
ce9d637b3f Expose ASW activation status, provide normalized present rate information 2017-03-03 10:46:05 -08:00
Bradley Austin Davis
c892d8a81a Update Oculus SDK to 1.11 2017-03-03 10:41:47 -08:00
Dante Ruiz
88c0db969c added tabletComboBox to tabletFileDialog 2017-03-03 17:14:00 +00:00
Anthony J. Thibault
45febe8565 Merge branch 'master' into feature/fingers-on-tablet 2017-03-03 09:04:43 -08:00
Seth Alves
40caa1ea49 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-03 09:01:57 -08:00
Philip Rosedale
ac16d86835 Merge pull request #9788 from ctrlaltdavid/21186 
Distance grab with second hand rotates entity
 2017-03-03 08:39:22 -08:00
Dante Ruiz
f5324d5822 Merge branch 'master' of github.com:highfidelity/hifi into menuFix 2017-03-03 15:41:43 +00:00
Dante Ruiz
f867f4e739 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-03-03 15:40:41 +00:00
David Rowe
388a144af1 Tidying after merge 2017-03-03 18:44:50 +13:00
David Rowe
482c23ead5 Merge branch 'master' into 21186 
# Conflicts:
#	scripts/system/controllers/handControllerGrab.js
 2017-03-03 18:38:42 +13:00
David Rowe
9384dfd89c Merge branch 'tablet-ui-edit-js' into 21197 2017-03-03 18:05:18 +13:00
David Rowe
854292b193 Merge branch 'tablet-ui-edit-js' into 21199 2017-03-03 17:51:12 +13:00
David Rowe
55963c4418 Style audio stats dialog button 2017-03-03 17:46:12 +13:00
David Rowe
b31cf23c8d Fix tablet QML fonts path 
This is the path for running scripts from build/install directory rather
than from source directory.
 2017-03-03 17:45:23 +13:00
David Rowe
3285816fca Fix up audio stats displayed in tablet 2017-03-03 16:45:35 +13:00
David Rowe
02a2bb6fc3 Rename QML file 2017-03-03 16:25:15 +13:00
Seth Alves
807e15ade9 Merge pull request #9798 from AndrewMeadows/faster-avatar-updates-2 
avoid animation blending for other avatars
 2017-03-02 18:37:18 -08:00
Brad Hefta-Gaub
e655e442a0 Merge pull request #9799 from sethalves/steady-hand-lasers 
Steady hand lasers
 2017-03-02 18:27:39 -08:00
Seth Alves
f055711c76 refix 2017-03-02 16:47:19 -08:00
Seth Alves
3b581a8dfe merge from upstream 2017-03-02 16:35:44 -08:00
Seth Alves
9f07079be6 Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-03-02 16:34:06 -08:00
Seth Alves
155a310852 Merge pull request #9761 from Menithal/21166 
WL#21166 Cloneable Equipment
 2017-03-02 16:33:13 -08:00
Seth Alves
10cb7aab06 Merge pull request #9684 from Menithal/parent-hotkey 
WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks
 2017-03-02 16:30:43 -08:00
Seth Alves
88d6fe6a04 fix offset relative to endParent 2017-03-02 16:26:56 -08:00
Seth Alves
5f570c1ba8 fix up bounds handling in Line3DOverlay 2017-03-02 16:16:48 -08:00
Seth Alves
6a4d477381 fix up bounds handling in Line3DOverlay 2017-03-02 16:15:41 -08:00
Anthony J. Thibault
bc256f3e8f Fix for multi-threaded access to maps in DebugDraw. 2017-03-02 14:42:06 -08:00