Commit graph

19216 commits

Author SHA1 Message Date
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Stephen Birarda
63be5ae9bf Merge pull request #3834 from ZappoMan/fixMissingRegistrationPointBug
fix a major bug in updateEntity() caused by the new properties not containing "registrationPoint"
2014-11-19 16:42:16 -08:00
Brad Hefta-Gaub
270939dee4 Merge pull request #3833 from AndrewMeadows/thermonuclear
flag EntityItem when changed by update
2014-11-19 16:40:40 -08:00
Stephen Birarda
dac980d433 have AssignmentClientMonitor catch SIGTERM and cleanup 2014-11-19 16:40:19 -08:00
Brad Hefta-Gaub
75304fd419 Merge pull request #3832 from Atlante45/fix_left_right_jumping
Fix left/right audio jumping
2014-11-19 16:40:04 -08:00
Brad Hefta-Gaub
3a8e89f754 Merge pull request #3831 from ey6es/master
Clear the saccade when Faceshift is active.
2014-11-19 16:39:18 -08:00
Brad Hefta-Gaub
7dd88eca08 Merge pull request #3829 from samcake/temp1
refining the avatar display name rendering with different behavior if in...
2014-11-19 16:39:04 -08:00
Brad Hefta-Gaub
0b7c3d3356 Merge pull request #3828 from AndrewMeadows/bispinor
don't slide feet during idle animations
2014-11-19 16:38:34 -08:00
ZappoMan
2a08a6d48e fix a bug in updateEntity() caused by the new properties not containing registrationPoint 2014-11-19 16:07:07 -08:00
Andrew Meadows
11e7339e9e add UPDATE_COLLISION_GROUP and UPDATE_MOTION_TYPE 2014-11-19 15:52:57 -08:00
Ryan Huffman
4b5d67d519 Update entityList.js to check for invalid entityIDs 2014-11-19 15:33:32 -08:00
Ryan Huffman
a18a83d45c Update getEntityItemID() to check for id existence 2014-11-19 15:31:41 -08:00
Stephen Birarda
afe4a4e432 don't show reticle if not wearing HMD, reset panel textures 2014-11-19 15:26:18 -08:00
Andrew Meadows
97d1dc4200 use updateFoo() where entity properties need relay
clear EntityItem updateFlags when processed
2014-11-19 15:12:22 -08:00
Stephen Birarda
987b75d8f7 switch to next musak when finished 2014-11-19 14:52:57 -08:00
Atlante45
0a9a6f1ef8 Fix parsing of silent packets properties 2014-11-19 14:32:50 -08:00
Atlante45
b5abf44aa3 Comment packt type number every 5 2014-11-19 14:31:49 -08:00
Andrew Meadows
a183248f38 add updateFoo() methods that accumulate flags
about properties that have changed
2014-11-19 14:12:26 -08:00
Stephen Birarda
45450c4fe3 handle offset passed in AudioInjectorOptions for mixer injections 2014-11-19 13:42:24 -08:00
Stephen Birarda
81c5f9ba5a inject lobby music at a random starting point 2014-11-19 13:36:27 -08:00
Ryan Huffman
0242e0efcf Fix layout of entity list window 2014-11-19 13:35:08 -08:00
Andrzej Kapolka
e943a6167c Clear the saccade when Faceshift is active. 2014-11-19 13:27:13 -08:00
Ryan Huffman
3ff44964b5 Add entity list window 2014-11-19 13:25:38 -08:00
Stephen Birarda
03bfaa4869 handle RAW stereo audio files by using stereo.raw extension 2014-11-19 12:20:12 -08:00
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