Andrzej Kapolka
0a329bbe3c
More work on LOD rendering; now rendering in preview.
2014-11-26 16:18:57 -08:00
Andrzej Kapolka
790b085307
Rejiggering the heightfield renderer for LOD.
2014-11-26 13:02:11 -08:00
Andrzej Kapolka
1d9c7d7c72
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-26 10:56:23 -08:00
Philip Rosedale
7737994399
Merge pull request #3865 from ctrlaltdavid/20197
...
CR for Job #20197 - Bug: Initial ping stats mis-reported
2014-11-26 08:08:50 -08:00
Andrzej Kapolka
7f14a66922
More work on heightfield quadtrees.
2014-11-25 18:27:09 -08:00
Andrzej Kapolka
a987e7ce10
When we set heightfield layers, break it up into quadtree.
2014-11-25 15:32:02 -08:00
Andrzej Kapolka
fc16207c08
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-25 14:11:08 -08:00
Andrzej Kapolka
8d3f4a627b
Working on quadtree for heightfields.
2014-11-25 14:10:44 -08:00
Andrew Meadows
1c636fe6b2
more correct entity list maintenance
2014-11-24 20:37:09 -08:00
David Rowe
01867e2459
Display "--" for ping values if not yet valid
2014-11-24 18:32:47 -08:00
Andrzej Kapolka
af875eb5af
Allow shared objects to write extra, non-property data.
2014-11-24 16:45:34 -08:00
Andrzej Kapolka
71cee18c4b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-24 15:43:54 -08:00
Sam Gateau
6a63099a0f
Fixed syntax issues and review critics, put all the debugging code in a #define block
2014-11-24 15:24:20 -08:00
Sam Gateau
1f22d5b493
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2014-11-24 10:05:39 -08:00
Sam Gateau
87471df7a1
First version of the lighmap working
2014-11-21 18:08:34 -08:00
Andrzej Kapolka
282732677f
Catch and log BitstreamExceptions when reading datagrams.
2014-11-21 16:45:39 -08:00
Andrzej Kapolka
4b24a6ca80
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-21 16:27:30 -08:00
Andrzej Kapolka
6cd96c95f4
Include a context in the Bitstream so that streamed objects can find their
...
LOD.
2014-11-21 16:26:58 -08:00
AndrewMeadows
8d9df8570c
Merge pull request #3847 from ey6es/metavoxels
...
Big metavoxel update: removed unused pieces, converted heightfields to "spanners" in order to allow arbitrary transforms, switched to 16 bit heightfields with lossless compression, some rendering improvements.
2014-11-21 15:57:00 -08:00
ZappoMan
bd2adf08e3
fix to drift in usecTimestampNow() caused when computer sleeps
2014-11-21 13:33:53 -08:00
Andrzej Kapolka
41eaf340c6
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-21 12:47:26 -08:00
Andrzej Kapolka
03e302c508
Removed a debug statemen.
2014-11-20 17:34:37 -08:00
Philip Rosedale
cd2a6f0f9c
merge fix
2014-11-20 17:35:50 -06:00
Andrzej Kapolka
0a976ad262
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-20 11:26:29 -08:00
Brad Hefta-Gaub
168487e0a7
Merge pull request #3840 from huffman/entity-snap-on-create
...
Entity snap on create (+ remove getEntityItemID)
2014-11-20 09:58:54 -08:00
Sam Gateau
7daff18101
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2014-11-20 09:57:59 -08:00
Brad Hefta-Gaub
32f60c4255
Merge pull request #3839 from birarda/master
...
trim whitespace for place name lookup, potential lobby crash fix
2014-11-20 09:57:39 -08:00
Sam Gateau
764ad72471
adding the light map support from FBX
2014-11-20 09:54:41 -08:00
Ryan Huffman
6a68281308
Remove EntityScriptingInterface::getEntityItemID
2014-11-20 09:39:41 -08:00
Stephen Birarda
1aa98dfc4c
trim whitespace for place name lookup
2014-11-20 09:24:43 -08:00
Philip Rosedale
5101e469dc
Merge branch 'master' of https://github.com/worklist/hifi
2014-11-19 23:54:31 -06:00
Atlante45
4d5451fafe
Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f
...
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/avatar/SkeletonModel.cpp
2014-11-19 17:28:24 -08:00
Clément Brisset
2c6a76ec17
Merge pull request #3830 from huffman/entity-list-window
...
Entity list window
2014-11-19 17:05:48 -08:00
Brad Hefta-Gaub
925e2fab66
Merge pull request #3835 from birarda/lobby
...
lobby changes, Sound and AudioInjectorOptions stereo tweaks
2014-11-19 16:59:54 -08:00
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
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
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
a18a83d45c
Update getEntityItemID() to check for id existence
2014-11-19 15:31:41 -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
3ff44964b5
Add entity list window
2014-11-19 13:25:38 -08:00
