Atlante45
35dd45ddf9
Capture drive keys while avatar is seated
2017-03-16 15:44:18 -07:00
Clément Brisset
21c5e7b0b2
Merge pull request #9880 from Atlante45/feat/sit
...
Fix avatars stuck in the sitting position after a domain disconnect
2017-03-16 15:42:29 -07:00
Seth Alves
31e0cfe296
Merge pull request #9825 from thoys/record-fixes
...
Avatar Recorder and Playback Fixes
2017-03-16 07:27:42 -08:00
Atlante45
b14a4faf61
Guard against script loading before avatar
2017-03-14 10:54:22 -08:00
Atlante45
9e6312ba0e
Make sit script more stable.
2017-03-13 18:06:32 -08:00
Atlante45
f0d971fc6f
Put avatar in front of chair on situp to avoid infinite collisions
2017-03-13 18:06:32 -08:00
Atlante45
1a375432e0
Only grab primary clicks
2017-03-13 18:06:32 -08:00
Atlante45
34889d38c9
Override all roles instead of just fly
2017-03-13 18:06:32 -08:00
Brad Hefta-Gaub
23e47f2fdc
added icons to the audioScope app
2017-03-10 18:13:35 -08:00
Brad Hefta-Gaub
b8a2525f9e
add auto pause/resume to the Audio Scope App
2017-03-10 17:38:00 -08:00
Brad Hefta-Gaub
5f3ee2e98f
add a basic tablet app for the audio scope
2017-03-10 17:08:54 -08:00
Seth Alves
494b602d4c
Merge pull request #9850 from druiz17/toolbar-MIA-afetr-snapshot
...
toolbar becomes visible after taking a snapshot
2017-03-10 10:20:01 -08:00
Seth Alves
cef4c988c4
Merge pull request #9835 from druiz17/toolbar-window-dont-close
...
Close toolbar windows when reloading scripts
2017-03-10 10:19:07 -08:00
Dante Ruiz
d54005b62e
no more duplicate snapshot buttons after taking reloading scripts
2017-03-10 00:17:44 +00:00
Dante Ruiz
c6c0c6d382
toolbar becomes visible after taking a snapshot
2017-03-09 22:54:22 +00:00
druiz17
007ed9fe81
Merge pull request #9836 from druiz17/2-tablets-fix
...
Fixed having more than one tablet when reloading scripts
2017-03-09 09:13:14 -08:00
Dante Ruiz
2a275a4f4b
removed tab at the end of word
2017-03-09 00:15:02 +00:00
Dante Ruiz
b878f164fb
minimize diff again
2017-03-09 00:10:38 +00:00
Dante Ruiz
f6d799c048
minimize diff
2017-03-09 00:09:32 +00:00
Dante Ruiz
561bd27c38
minimize diff
2017-03-09 00:08:50 +00:00
Dante Ruiz
5f7a0ea8fc
Close tablet when switching form HMD to desktop and vice versa
2017-03-09 00:05:26 +00:00
Dante Ruiz
ce105e0329
fix double tablets when reloading scripts
2017-03-08 22:21:57 +00:00
Dante Ruiz
881213259d
Merge branch 'master' of github.com:highfidelity/hifi into toolbar-window-dont-close
2017-03-08 21:44:20 +00:00
Dante Ruiz
59b4fa5fd7
Close toolbar windows when scripts are reloaded
2017-03-08 21:44:04 +00:00
Seth Alves
a67f8ac0ed
Merge pull request #9807 from Menithal/21166-remove-limit
...
#9761 Cloneable Improvement
2017-03-08 07:15:06 -08:00
Thijs Wenker
097db9a7f9
- debug message removal (oops)
...
- smaller timer textbox, allows you to grab around the edges and still drag the toolbar
2017-03-08 01:41:20 +01:00
Thijs Wenker
b21bd3afa9
Make the time and slider follow the record.js toolbar
2017-03-08 01:14:11 +01:00
Thijs Wenker
6b26f5f3a3
Fix the timer display
2017-03-08 00:09:56 +01:00
Ryan Huffman
a744e0d11c
Merge pull request #9685 from humbletim/21114-part2
...
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
2017-03-07 13:25:25 -08:00
Andrew Meadows
1e9623e2f2
Merge pull request #9813 from druiz17/multipule-audio-fix
...
removed duplicated audio devices
2017-03-07 10:00:48 -08:00
Dante Ruiz
fc65723d68
corrected removing duplicate devices
2017-03-06 22:14:20 +00:00
Andrew Meadows
1b8f6b9835
Merge pull request #9784 from samcake/blue
...
Fixing Emissive on overlay for models (opaque and transparent)
2017-03-06 13:24:00 -08:00
samcake
21f36d7212
removing comments and restoring the correct behavior for Pal.js
2017-03-06 12:41:00 -08:00
Brad Hefta-Gaub
38668b6ce5
Merge pull request #9812 from sethalves/dont-auto-ungrab-overlays
...
don't automatically unhook overlays from hands unless they were grabbable overlays
2017-03-06 12:32:18 -08:00
Thijs Wenker
6ded937b25
Merge pull request #9809 from Menithal/21201
...
WL#21201 Snap-together Magnetic blocks
2017-03-06 21:30:53 +01:00
Seth Alves
a2d2c41f02
remove debug print
2017-03-06 11:45:49 -08:00
Menithal
01ba44c572
Fixed print
2017-03-06 21:32:27 +02:00
Menithal
d50a0e33a9
CR. Run through Lint ECMAScript 5 standard
...
Meaning all const are out, non-variable definitions are out, etc
2017-03-06 21:07:16 +02:00
Dante Ruiz
b6671d92c8
removed duplicated audio devices
2017-03-06 18:46:57 +00:00
Seth Alves
6ac576c9e6
Merge branch 'master' of github.com:highfidelity/hifi into dont-auto-ungrab-overlays
2017-03-06 10:43:43 -08:00
Seth Alves
19a31d7630
don't automatically unhook overlays from hands unless they were grabbable overlays
2017-03-06 10:15:53 -08:00
Brad Hefta-Gaub
781e0be0e3
Merge pull request #9806 from howard-stearns/preserve-audio-data-during-pal-refresh
...
preserve audio data during pal refresh
2017-03-06 08:45:46 -08:00
Menithal
04d3bf0c38
Cleanup and safeguards
...
- RegistrationPoint can no longer be set for magnetic blocks, will set it to
0.5 on snap.
- Simplified axis lock logic
2017-03-06 10:55:47 +02:00
sam
cffd838d1d
merging with master
2017-03-05 12:57:13 -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
howard-stearns
15d680d4f9
preserve audio data during pal refresh
2017-03-03 16:56:12 -08:00
