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

19351 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
80c1f5038c Merge branch 'master' of https://github.com/highfidelity/hifi into lobbyTweaks 2014-11-23 11:39:05 -08:00
ZappoMan
f23d8f6c20 text sizing tweaks 2014-11-23 11:21:05 -08:00
ZappoMan
437af06245 switch to 3d text for description 2014-11-23 11:16:33 -08:00
ZappoMan
5ea6973fe7 fix isFacingAvatar for 3d text overlays 2014-11-23 10:53:03 -08:00
Philip Rosedale
a4f3fc1cb5 Merge pull request #3855 from ZappoMan/sitEntityScript 
fix bugs in unloading scripts when changing domains
 2014-11-22 23:42:25 -08:00
ZappoMan
53bd8fd6d2 handle no description and blank panels better 2014-11-22 21:30:58 -08:00
ZappoMan
efe202b7e8 make a version of computePick that works off of view frustum even when in HMD mode, updates to lobby 2014-11-22 21:25:43 -08:00
ZappoMan
310e31377d handle line wrapping in description 2014-11-22 14:49:56 -08:00
ZappoMan
f014025b81 first cut at lobby tweaks 2014-11-22 14:28:06 -08:00
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
Adrianl3d
2edd252576 Fix persist time 
Set persist time to 10 secs
 2014-11-22 21:47:14 +10:00
Sam Gateau
87471df7a1 First version of the lighmap working 2014-11-21 18:08:34 -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
Adrianl3d
6a66351e7f Clean up code 
Fix indentations, whitespace, and layout
 2014-11-22 10:39:34 +10: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
Ryan Huffman
ab2fa16be3 Update edit entities moveUp arrow position 2014-11-21 12:06:46 -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