ZappoMan
93755e6506
fix bugs in unloading scripts when changing domains
2014-11-22 11:53:50 -08:00
Brad Hefta-Gaub
e9207ab74d
Merge pull request #3854 from PhilipRosedale/master
...
Entity script allowing you to grab and 'inspect' an object
2014-11-22 07:44:14 -08:00
Philip Rosedale
983975e872
lets you grab an object and turn it near your face to better see it
2014-11-21 20:05:36 -06:00
Stephen Birarda
6df2116ee0
Merge pull request #3853 from birarda/master
...
have domain-server report its ID at /id
2014-11-21 16:51:41 -08:00
Stephen Birarda
dff5695965
have domain server report its ID at /id
2014-11-21 16:20:44 -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
Clément Brisset
d23cc24ed2
Merge pull request #3851 from ZappoMan/flightTimeDebugging
...
fix to drift in usecTimestampNow() caused when computer sleeps
2014-11-21 15:20:03 -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
296718e2aa
Removed redundant members, clarified class names, used better hash factors.
2014-11-21 12:46:24 -08:00
Brad Hefta-Gaub
9c9381e57e
Merge pull request #3849 from ctrlaltdavid/suppress-gverb-warnings
...
Suppress Windows C4305 compiler warnings in gverb includes
2014-11-21 11:07:55 -08:00
Philip Rosedale
8ca2a613a2
Merge pull request #3848 from PhilipRosedale/master
...
Jump with number keys to preset places, improve HeadMove
2014-11-21 01:07:36 -06:00
Philip Rosedale
85419a3e2d
limit max distance of movement, don't pull to 3P unless going back
2014-11-21 01:04:52 -06:00
David Rowe
9e32b2c64e
Suppress Windows C4305 compiler warnings in gverb includes
2014-11-20 20:58:31 -08:00
Philip Rosedale
5d6d9ae0df
cleaner version
2014-11-20 22:53:49 -06:00
Philip Rosedale
069f1be89d
jump with number keys to preset places
2014-11-20 22:48:03 -06:00
Brad Hefta-Gaub
a8d718be82
Merge pull request #3843 from PhilipRosedale/master
...
Fix jumpy eyes when turning toward or away from someone
2014-11-20 20:01:58 -08:00
Andrzej Kapolka
87cc565c1a
I believe this should be a better hash function for the voxel coordinates.
2014-11-20 18:16:57 -08:00
Philip Rosedale
e07f53d022
remove unused test audio filters
2014-11-20 19:57:24 -06:00
Philip Rosedale
6e89437bce
simplify audio scope menu(s)
2014-11-20 19:34:56 -06:00
Andrzej Kapolka
2adb519193
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-20 17:34:51 -08:00
Andrzej Kapolka
03e302c508
Removed a debug statemen.
2014-11-20 17:34:37 -08:00
Philip Rosedale
9a9f6bc485
Merge branch 'master' of https://github.com/worklist/hifi
2014-11-20 19:20:57 -06:00
Philip Rosedale
57d3bac805
Merge pull request #3844 from ZappoMan/sitEntityScript
...
First cut at sit entity script
2014-11-20 19:20:39 -06:00
Philip Rosedale
6dab28e6c5
Merge pull request #3846 from birarda/lobby
...
fix for scaling of lobby and missing reticle
2014-11-20 19:19:33 -06:00
Andrzej Kapolka
d4693232d3
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-20 17:17:09 -08:00
Andrzej Kapolka
f2f7335f58
Increase the block size, reduce the overhead.
2014-11-20 17:16:52 -08:00
Stephen Birarda
64d9dc4efa
fix for scaling of lobby and missing reticle
2014-11-20 17:05:37 -08:00
Philip Rosedale
ddcd39ea65
Merge branch 'master' of https://github.com/worklist/hifi
2014-11-20 18:51:04 -06:00
Philip Rosedale
2a260f86c8
Merge pull request #3845 from birarda/lobby
...
tweaks for new lobby orb
2014-11-20 18:46:43 -06:00
Andrzej Kapolka
1e294e043b
Batch voxel drawing, too.
2014-11-20 16:37:37 -08:00
Philip Rosedale
d8a74a4db4
add max distance at which you will auto-magically look at someone else
2014-11-20 18:34:06 -06:00
Stephen Birarda
7f795ec67c
repairs for new lobby shell
2014-11-20 16:20:32 -08:00
Stephen Birarda
4f879a06a6
fix flipped URLs for models in lobby
2014-11-20 16:11:08 -08:00
ZappoMan
3761f24619
fix stand up icon
2014-11-20 16:08:36 -08:00
Stephen Birarda
c15354d935
update lobby for new orb and panel wall
2014-11-20 15:44:05 -08:00
ZappoMan
ee6516970e
first cut at entity script for sitting
2014-11-20 15:37:00 -08:00
ZappoMan
b2c342c5c7
add support for unload method
2014-11-20 15:36:28 -08:00
Philip Rosedale
cd2a6f0f9c
merge fix
2014-11-20 17:35:50 -06:00
Philip Rosedale
e1ad9d3b4b
Fix eyes jittering when turning away/toward someone
2014-11-20 17:26:11 -06:00
Andrzej Kapolka
da85714dc8
Batch heightfield sections for better performance.
2014-11-20 15:09:38 -08:00
Brad Hefta-Gaub
5d2fd9df36
Merge pull request #3842 from AndrewMeadows/thermonuclear
...
fix for crash in SkeletonModel::updateStandingFoot()
2014-11-20 14:40:21 -08:00
Andrew Meadows
1b778603c8
fix for crash in SkeletonModel::updateStandingFoot()
2014-11-20 14:21:08 -08:00
Stephen Birarda
47f86fac68
have QAudioOutput cleaned up with injector thread
2014-11-20 13:48:29 -08:00
Andrzej Kapolka
53809803dd
These edits need to be sent reliably
2014-11-20 12:56:56 -08:00
Andrzej Kapolka
d351a65999
Increase the smoothing cutoff.
2014-11-20 12:09:33 -08:00
Andrzej Kapolka
0a976ad262
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-20 11:26:29 -08:00
Stephen Birarda
0a6ffe3dbd
Merge pull request #3841 from birarda/master
...
fix oculus mode check for lobby
2014-11-20 10:55:57 -08:00
Stephen Birarda
81b46d6c2c
fix oculus mode check for lobby
2014-11-20 10:55:40 -08:00
Stephen Birarda
7d982abbcc
Merge pull request #3838 from ZappoMan/removeVoxelEdit
...
remove voxel edit
2014-11-20 10:45:27 -08:00
