Andrzej Kapolka
|
b68c836b12
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-11-19 11:49:27 -08:00 |
|
dev
|
fc54ad93b8
|
refining the avatar display name rendering with different behavior if in HMD mode or not
|
2014-11-19 11:46:59 -08:00 |
|
Ryan Huffman
|
1706faf2da
|
Fix animationIsPlaying not showing correctly in properties tool window
|
2014-11-19 11:20:47 -08:00 |
|
Ryan Huffman
|
4d56c21442
|
Add snapping to vertical translation
|
2014-11-19 10:35:42 -08:00 |
|
Brad Hefta-Gaub
|
c2adc6256e
|
Merge pull request #3827 from huffman/fix-tool-window
Initialize ToolWindow _selfHidden property
|
2014-11-19 09:43:58 -08:00 |
|
Andrew Meadows
|
82bf0f6210
|
menu item for "idle animations shift hips" hack
|
2014-11-19 09:38:10 -08:00 |
|
Ryan Huffman
|
d1d561b833
|
Initialize ToolWindow _selfHidden property
|
2014-11-19 09:18:17 -08:00 |
|
Andrew Meadows
|
6673d9d0c2
|
avatar stands on lowest toe
|
2014-11-19 09:13:24 -08:00 |
|
Andrew Meadows
|
7f4e0c206c
|
cache indeces to toe joints
|
2014-11-19 09:13:03 -08:00 |
|
Philip Rosedale
|
0a143d9177
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-11-19 07:05:36 -08:00 |
|
Philip Rosedale
|
31c128954e
|
Merge pull request #3826 from samcake/temp0
fix lighting bug in occulus and improve the avatar name display size and behavior
|
2014-11-19 07:02:26 -08:00 |
|
dev
|
ce50152863
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2014-11-19 01:06:33 -08:00 |
|
dev
|
2e19ad48a7
|
ready for pull request
|
2014-11-19 00:50:59 -08:00 |
|
Philip Rosedale
|
9afaf8f6d8
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-11-18 21:58:40 -08:00 |
|
Andrzej Kapolka
|
d273e7c399
|
Render heightfields -> render spanners.
|
2014-11-18 19:49:08 -08:00 |
|
Andrzej Kapolka
|
0cc92dc87e
|
More spanner voxelization bits.
|
2014-11-18 19:15:06 -08:00 |
|
dev
|
4028e66c08
|
trying to fix the lighting issue in stereo and fix the display name size and orientation
|
2014-11-18 18:59:54 -08:00 |
|
Brad Hefta-Gaub
|
51a2bf8226
|
Merge pull request #3825 from Atlante45/fix_ac_deadlock
AC ambiance script / moved AC scripts to new directory
|
2014-11-18 17:47:33 -08:00 |
|
Brad Hefta-Gaub
|
23457c7382
|
Merge pull request #3823 from birarda/master
cleanup time in log prefix
|
2014-11-18 17:39:24 -08:00 |
|
Atlante45
|
44190b6fde
|
AC ambiance script / moved AC scripts to new directory
|
2014-11-18 17:27:37 -08:00 |
|
Andrzej Kapolka
|
59fcff740b
|
Remove remaining heightfield attribute bits.
|
2014-11-18 17:17:07 -08:00 |
|
Andrzej Kapolka
|
a0f75c990e
|
Working on fetching/clearing heightfield chunks.
|
2014-11-18 17:12:47 -08:00 |
|
Andrzej Kapolka
|
632f3bfa7f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-11-18 17:12:40 -08:00 |
|
Stephen Birarda
|
e0c29529a1
|
Merge pull request #3824 from Atlante45/fix_ac_deadlock
Fix singleton object created on temporary thread
|
2014-11-18 17:04:13 -08:00 |
|
Stephen Birarda
|
8c65c6c1c8
|
fix comment for actual time format
|
2014-11-18 17:02:28 -08:00 |
|
Stephen Birarda
|
705d3da089
|
cleanup time in log prefix
|
2014-11-18 17:00:33 -08:00 |
|
Atlante45
|
1443cece5b
|
Fix singleton object created on temporary thread
|
2014-11-18 16:57:00 -08:00 |
|
Philip Rosedale
|
340742ec36
|
Merge pull request #3821 from ZappoMan/movables
More work on the movable.js script
|
2014-11-18 16:53:09 -08:00 |
|
Brad Hefta-Gaub
|
02b8ef2a05
|
Merge pull request #3822 from birarda/master
restore default domain for clean app launch
|
2014-11-18 15:48:27 -08:00 |
|
Stephen Birarda
|
2274b35d08
|
connect to sandbox domain by default
|
2014-11-18 15:35:11 -08:00 |
|
Brad Hefta-Gaub
|
ee19a2d5a7
|
Merge pull request #3820 from huffman/grid-updates
Grid tool updates + fixes
|
2014-11-18 14:57:08 -08:00 |
|
Brad Hefta-Gaub
|
b94f8c6b87
|
Merge pull request #3818 from samcake/temp0
Introduce the Stereo optimization for occulus rendering path
|
2014-11-18 14:56:14 -08:00 |
|
ZappoMan
|
7af3843bed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into movables
|
2014-11-18 14:50:07 -08:00 |
|
ZappoMan
|
c070835681
|
use move sounds for turning until further research and foley work
|
2014-11-18 14:41:56 -08:00 |
|
ZappoMan
|
b53124cba7
|
tweaks to sound behavior
|
2014-11-18 14:25:12 -08:00 |
|
Ryan Huffman
|
2bfd3d213a
|
Update ToolWindow to auto-hide itself when main window loses focus
|
2014-11-18 12:50:37 -08:00 |
|
Ryan Huffman
|
ad3d7fbfb4
|
Improve performance of drawing GridOverlay3D
|
2014-11-18 12:24:52 -08:00 |
|
Andrzej Kapolka
|
add615810b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-11-18 11:19:04 -08:00 |
|
Adrianl3d
|
f1543a9d36
|
Added notifications.js
Creates overlay notifications from events and key strokes. improved
fading.
|
2014-11-19 04:36:57 +10:00 |
|
dev
|
5f3488eff6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2014-11-18 10:34:49 -08:00 |
|
Ryan Huffman
|
16e3887cbc
|
Set snapToGrid to default to false
|
2014-11-18 10:28:14 -08:00 |
|
Ryan Huffman
|
a4cc12e448
|
Add snapToSpacing functionality
|
2014-11-18 10:28:03 -08:00 |
|
Ryan Huffman
|
10008cb41f
|
Fix snapToGrid checkbox not working
|
2014-11-18 10:27:26 -08:00 |
|
Philip Rosedale
|
79497586dd
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-11-18 10:15:32 -08:00 |
|
Brad Hefta-Gaub
|
e1085a6cbb
|
Merge pull request #3816 from AndrewMeadows/bispinor
changes to EntityTree simulation state management
|
2014-11-18 10:03:22 -08:00 |
|
Ryan Huffman
|
c39bd362b7
|
Fix grid controls not updateable
|
2014-11-18 09:52:00 -08:00 |
|
dev
|
853015da4c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2014-11-18 09:47:25 -08:00 |
|
dev
|
2997589559
|
Merge branch 'temp0' of https://github.com/samcake/hifi into temp0
|
2014-11-18 09:46:43 -08:00 |
|
dev
|
4442b46880
|
Introduce the stereo improvment for the Oculus rendering path
|
2014-11-18 09:44:30 -08:00 |
|
Philip Rosedale
|
4168249ef5
|
Merge pull request #3817 from ZappoMan/movables
Add "rotate" and "sounds" to movable.js
|
2014-11-18 09:17:08 -08:00 |
|