Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 02:40:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34928 commits 25 branches 0 tags 1.1 GiB
Commit graph

34928 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
45e8ebbe8c Merge pull request #6432 from huffman/lod-range 
Increase available range in LOD Tools
 2015-11-19 09:40:10 -08:00
Ryan Huffman
f523cad0a9 Add lodTest.js for testing LOD settings 2015-11-19 09:24:29 -08:00
Howard Stearns
0a8fd9cbad Spread avatars around (not up to) a larger area. 2015-11-19 09:22:41 -08:00
Howard Stearns
7d30cd0159 checkpoint: it works! 2015-11-19 09:18:40 -08:00
Ryan Huffman
8adf456b91 Update range of LOD to go up to 20:2 2015-11-19 08:52:57 -08:00
samcake
7cc68e851d Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-18 18:07:42 -08:00
samcake
90ee205a66 Merge pull request #6429 from ZappoMan/samConditionalLove 
make preferences dialog resizable
 2015-11-18 18:07:07 -08:00
Stephen Birarda
271387f96e use a unique_ptr for linkedData in Node 2015-11-18 18:03:31 -08:00
Brad Hefta-Gaub
dc093159a1 make preferences dialog resizable 2015-11-18 17:54:51 -08:00
samcake
182e3ff730 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-18 17:52:36 -08:00
samcake
74beeefe06 Merge pull request #6420 from jherico/dargo 
Make recording and playback work in interface, playback in agent
 2015-11-18 17:52:09 -08:00
Stephen Birarda
3fba1f8445 better variable naming for nodeToKill 2015-11-18 17:46:32 -08:00
Stephen Birarda
f4cf1c0291 only broadcast removed node messages to interested nodes 2015-11-18 17:45:18 -08:00
Brad Hefta-Gaub
456da661ff implement support to download the persist file from entity server status page 2015-11-18 17:30:07 -08:00
Brad Davis
98cc7408b1 Fixing issues found in AC playback test 2015-11-18 17:17:20 -08:00
samcake
9232dd3c92 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-18 17:11:40 -08:00
Brad Hefta-Gaub
b47aadff2b Merge pull request #6424 from AlessandroSigna/groupRecording 
Group recording - upgraded to the new messages system
 2015-11-18 16:49:31 -08:00
Stephen Birarda
08e6b63090 cleanup debug of received domain-server settings 2015-11-18 15:43:31 -08:00
Stephen Birarda
3773995bb7 remove true return for readAdditionalConfiguration 2015-11-18 15:41:27 -08:00
Stephen Birarda
3ba0c9d042 resolve conflicts on merge with upstream master 2015-11-18 15:29:39 -08:00
Stephen Birarda
20485b817c use safer domain-server settings request in entity-server 2015-11-18 15:27:57 -08:00
Stephen Birarda
eafc11e054 use safer domain settings request in AvatarMixer 2015-11-18 15:18:16 -08:00
AlessandroSigna
1f854784e1 not load the last recording 2015-11-18 15:17:06 -08:00
Stephen Birarda
f2ecce6043 use safer domain settings request in audio-mixer 2015-11-18 15:13:29 -08:00
Brad Hefta-Gaub
6719092094 add an example of an entityScript that subscribes to messages 2015-11-18 15:03:07 -08:00
Howard Stearns
b4934275e1 Merge pull request #6422 from AndrewMeadows/crashfix 
fix crash on login for invalid index
 2015-11-18 15:02:54 -08:00
Andrew Meadows
73055a59a7 fix crash on login for bad boolean logic 2015-11-18 14:48:59 -08:00
Stephen Birarda
1a066abb26 fix some indentation for UDT_CONNECTION_DEBUG lines 2015-11-18 14:43:56 -08:00
Brad Davis
fd3599acc5 PR comments 2015-11-18 14:32:56 -08:00
Brad Hefta-Gaub
2f3cf82202 don't apply out of order edits to entities that have been deleted 2015-11-18 14:26:18 -08:00
Stephen Birarda
65142a3963 clean up agent comment for domain settings request 2015-11-18 14:20:56 -08:00
howard-stearns
42a1ee353e checkpoint 2015-11-18 14:09:33 -08:00
Brad Davis
5b8047ded4 Make recording and playback work in interface, playback in agent 2015-11-18 14:04:45 -08:00
Ryan Huffman
3d0afc3c5f Update entities version number for polyline change 2015-11-18 14:00:00 -08:00
Ryan Huffman
2fe9af54d4 Add textures property to polyline 2015-11-18 13:59:32 -08:00
Anthony Thibault
d3d3ddfaf1 Merge pull request #6417 from AndrewMeadows/avatar-capsule 
fix bounding capusule calculations for new avatars
 2015-11-18 13:02:48 -08:00
James B. Pollack
12e2178dd3 cleanup 2015-11-18 11:28:07 -08:00
Brad Hefta-Gaub
35677d3a48 Merge pull request #6418 from birarda/test-ds-settings-fail 
move keepalive pings transparently to NL
 2015-11-18 11:12:16 -08:00
James B. Pollack
5f3e3ed9d1 cleanup 2015-11-18 11:06:48 -08:00
Andrew Meadows
5c6df734c5 initialize vector of vec3's 2015-11-18 10:47:53 -08:00
James B. Pollack
d3ee0d4998 handle bubble solidity 2015-11-18 10:44:24 -08:00
James B. Pollack
de953ce14d better spatialkey 2015-11-18 10:41:53 -08:00
Stephen Birarda
c54dffac12 fix entity-server avg ping, remove debug 2015-11-18 10:32:35 -08:00
Stephen Birarda
d90c073102 leverage NL keep alive pings in Agent 2015-11-18 10:25:18 -08:00
Andrew Meadows
ae88057ad9 remove dangling whitespace 2015-11-18 10:24:10 -08:00
Stephen Birarda
0e3d3451d7 make keep alive pings the responsibility of NL 2015-11-18 10:24:10 -08:00
Brad Davis
2636e43fab Merge pull request #6413 from samcake/controllers 
Recording: Moving the Recording js interface to the Script engine
 2015-11-18 10:22:55 -08:00
samcake
13d11f89df Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-18 09:26:18 -08:00
Andrew Meadows
ee751ed1b9 use kDop volume of avatar mesh parts for capsule 2015-11-18 09:22:40 -08:00
James B. Pollack
eb48342d07 add inversiona nd spatialkey 2015-11-18 09:10:04 -08:00