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

2214 commits

Author SHA1 Message Date
Triplelexx
5883bd39dc rename color to component 2017-03-15 11:17:27 +00:00
Triplelexx
41041c711f use utils.js 2017-03-15 11:09:13 +00:00
Triplelexx
9e0091ebe0 use utils.js, move easing function, use mixes 
some cleanup
 2017-03-15 11:08:54 +00:00
Triplelexx
84d157ab18 handle overlay lifetime during update, remove color conv 2017-03-15 10:31:09 +00:00
Triplelexx
6971aeb081 additional reference information 2017-03-14 17:18:11 +00:00
Triplelexx
8a39ce16bd add simple easing function 
dodgy add push
 2017-03-14 16:57:45 +00:00
Triplelexx
4dd9a7c37f add simple easing function 2017-03-14 16:51:43 +00:00
Triplelexx
30c16984c0 change offsetPosition to use Camera.position 2017-03-14 06:07:22 +00:00
Triplelexx
c729ceccb5 change color lerp to use HSV color 2017-03-14 03:59:24 +00:00
Triplelexx
2e0cac4676 add extra safeguards 2017-03-14 01:25:39 +00:00
Triplelexx
8bd155cb86 change offsetPosition to use Camera.orientation 2017-03-14 01:23:04 +00:00
Triplelexx
95fcb1df7a fix spelling mistake 2017-03-13 18:32:53 +00:00
Triplelexx
873a9aa39e change color swapping to be more concise 2017-03-11 07:40:32 +00:00
Triplelexx
8a0dd55275 change naming and comment 2017-03-11 00:19:02 +00:00
Triplelexx
eb4dee0495 create audioMuteOverlay.js 
client scipt that creates an overlay to provide mute feedback
 2017-03-10 23:37:29 +00: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
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