Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 06:32:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8016 commits 75 branches 59 tags 1.2 GiB
Commit graph

8016 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
3f4b4178ff remove the test injector code from Application 2013-12-19 15:25:39 -08:00
Stephen Birarda
7ed609633a complete the test injector stub 2013-12-19 15:23:31 -08:00
Stephen Birarda
0eb22fdc60 Merge branch 'master' of https://github.com/worklist/hifi into injected-audio 2013-12-19 15:17:10 -08:00
Stephen Birarda
bdf8c4b9b2 implement threaded send for AudioInjector 2013-12-19 15:17:03 -08:00
Philip Rosedale
38b59f96d3 Merge pull request #1412 from ZappoMan/bugfixes 
Implement support for adjusting particles to clock skew
 2013-12-19 15:01:01 -08:00
ZappoMan
d71bc248f4 support adjusting particles based on clockSkew 2013-12-19 14:49:58 -08:00
Leonardo Murillo
e1e38eb01a Merge pull request #1411 from murillodigital/master 
Missing line feed
 2013-12-19 14:32:16 -08:00
Leonardo Murillo
44a24496cc Missing line feed 2013-12-19 16:31:38 -06:00
Stephen Birarda
2409b5f784 complete inital test of AudioInjector API 2013-12-19 13:46:37 -08:00
ZappoMan
72649f1ac9 adjust flight times correctly in stats tracking 2013-12-19 13:29:45 -08:00
ZappoMan
bfbaf265dd first cut at added clockSkew support to nodes and PING/PING_REPLY 2013-12-19 13:14:14 -08:00
Stephen Birarda
4c15c54535 Merge branch 'master' of https://github.com/worklist/hifi into injected-audio 2013-12-19 12:42:06 -08:00
Stephen Birarda
b035f74f94 fix for build busters with changed AbstractAudioInterface 2013-12-19 12:39:57 -08:00
Stephen Birarda
eac3b6be65 add AudioInjector class to pull samples from URL and inject 2013-12-19 12:28:37 -08:00
Philip Rosedale
4a44d798c8 Merge pull request #1410 from ZappoMan/bugfixes 
Bug fixes
 2013-12-19 10:52:18 -08:00
ZappoMan
864fc10d3a debug cleanup and change to Particle::update() to handle clock skew slightly better 2013-12-19 10:39:42 -08:00
Stephen Birarda
9c39bcba4c Merge branch 'master' of https://github.com/worklist/hifi into injected-audio 2013-12-19 10:23:33 -08:00
ZappoMan
26366e9fe7 cleanup debug 2013-12-19 10:05:20 -08:00
ZappoMan
b48161ae26 cleanup debug 2013-12-19 09:59:36 -08:00
ZappoMan
f7793a0f08 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-12-19 09:51:07 -08:00
ZappoMan
e2b7e08398 revert back to timestamps, fix a couple other bugs 2013-12-19 09:50:53 -08:00
ZappoMan
dbfb0d1487 Merge pull request #1409 from murillodigital/master 
Print assignment request details to log
 2013-12-19 09:33:08 -08:00
Leonardo Murillo
57bf31e1a6 Wrong spacing 2013-12-19 11:25:51 -06:00
Leonardo Murillo
c3b222cfc2 Print assignment request details to log 2013-12-19 11:23:55 -06:00
ZappoMan
2fb4eeeb08 Merge pull request #1407 from ZappoMan/bugfixes 
fix expectedBytes() mismatch between edit packets and normal packets
 2013-12-18 21:21:01 -08:00
ZappoMan
d430558ea9 fix expectedBytes() mismatch between edit packets and normal packets 2013-12-18 21:08:34 -08:00
Philip Rosedale
9980065659 Merge pull request #1406 from ZappoMan/particle_blinky_bug 
Fix Particle Blinkiness on Clock Skew, and remove all global time stamps from wire formats
 2013-12-18 20:02:38 -08:00
ZappoMan
95df772707 make really old 30 seconds not 300 2013-12-18 19:36:34 -08:00
ZappoMan
5b36953e81 cleanup clockSkew debug options and remove some chatty logs 2013-12-18 19:33:52 -08:00
ZappoMan
6e2c0032b5 removed dead code 2013-12-18 19:22:15 -08:00
ZappoMan
c6933239d9 fixed comment 2013-12-18 19:21:30 -08:00
ZappoMan
920ef65ccb removed _lastedEdited changed to editedAgo 2013-12-18 19:01:42 -08:00
ZappoMan
c68a226094 removing of created timestamp from wire format, still supports lifetime 2013-12-18 17:43:48 -08:00
Andrzej Kapolka
7458839218 Merge pull request #1405 from ey6es/master 
Fix for menu shortcuts; just include widget library rather than using aw...
 2013-12-18 17:31:17 -08:00
Andrzej Kapolka
f10dccb1b8 Fix for menu shortcuts; just include widget library rather than using awkward 
workaround.
 2013-12-18 17:28:21 -08:00
ZappoMan
8b1c39a471 more lastUpdated-ectomy 2013-12-18 17:03:53 -08:00
ZappoMan
1badc8dc5d first pass at removing timestamps from particles removed _lastUpdated/getLastUpdated() 2013-12-18 16:59:36 -08:00
ZappoMan
6b0d7c30f0 added debugging option for forced clock skew 2013-12-18 16:58:49 -08:00
Philip Rosedale
9786d1b21d Merge pull request #1404 from PhilipRosedale/master 
Fix to see other people animate hydra hands
 2013-12-18 16:43:43 -08:00
Philip Rosedale
17f35ce97b Fix to see other people animate hydra hands 2013-12-18 16:37:15 -08:00
Philip Rosedale
29a30c7adc Merge pull request #1396 from ZappoMan/controller_scripting_interface 
Generic Controller exposed to JavaScript interface in client
 2013-12-18 16:25:46 -08:00
ZappoMan
41490991ff Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 
Conflicts:
	interface/src/Application.h
 2013-12-18 15:50:03 -08:00
Andrzej Kapolka
47097cd0fd Merge pull request #1403 from ey6es/master 
Build fix.
 2013-12-18 13:57:04 -08:00
Andrzej Kapolka
3f0b5aa748 Build fix. 2013-12-18 13:56:30 -08:00
Stephen Birarda
1892564e6a Merge pull request #1395 from stojce/19461 
Code Review for Job #19461
 2013-12-18 13:02:51 -08:00
Stojce Slavkovski
d72c4e4f65 removed commented code 2013-12-18 20:40:15 +01:00
Stojce Slavkovski
45d926da41 CR fixes 2013-12-18 20:37:45 +01:00
ZappoMan
4f3f6c0327 fixed build buster 2013-12-18 10:42:35 -08:00
ZappoMan
8549894ff8 add support for palm and tip spatial data to JS interface 2013-12-18 09:53:47 -08:00
ZappoMan
efdef1ad35 added all buttons triggers and joysticks 2013-12-18 09:33:48 -08:00