Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-18 00:59:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
7996 commits 24 branches 28 tags 1.2 GiB
Commit graph

7996 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
c287e37691 Reverted key mapping change since Andrzej fixed the underlying problem. 2013-12-19 10:02:43 -08:00
Philip Rosedale
77751df992 Revert "Switched voxel size (back) to key +,- because ZoomIn and ZoomOut don’t seem to trigger (at least on my mac)" 
This reverts commit d68a551940.
 2013-12-19 10:01:55 -08:00
Philip Rosedale
118b380d3b Merge remote-tracking branch 'upstream/master' 2013-12-18 21:22:41 -08: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
abd0951696 Merge remote-tracking branch 'upstream/master' 2013-12-18 20:55:57 -08:00
Philip Rosedale
09e5b8ea4a slaps sound only on impact with velocity 2013-12-18 20:55:27 -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
Philip Rosedale
d68a551940 Switched voxel size (back) to key +,- because ZoomIn and ZoomOut don’t seem to trigger (at least on my mac) 2013-12-18 17:13:51 -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
ZappoMan
70e9781ad9 CR feedback new class names 2013-12-18 08:42:34 -08:00
Stojce Slavkovski
a2ad70524f Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-18 17:36:33 +01:00
ZappoMan
14b31654ff Merge pull request #1400 from PhilipRosedale/master 
HandBall:  Sounds for throw, catch, new ball.  Tuned forces.
 2013-12-18 07:36:56 -08:00
Stojce Slavkovski
397eb13680 removed legacy resources path locator 2013-12-18 08:05:34 +01:00
Stojce Slavkovski
4c1226ffd9 Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-18 08:00:55 +01:00
Philip Rosedale
13be1ea825 added catch, throw, new ball sounds. Tuned ball speed for handball. 2013-12-17 22:08:52 -08:00
Philip Rosedale
b3bb33e48c Merge remote-tracking branch 'upstream/master' 2013-12-17 20:12:31 -08:00
Philip Rosedale
e6847961f5 reduced damping for thrown balls, turned off screen flash 2013-12-17 20:11:53 -08:00
ZappoMan
a59650beac Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 2013-12-17 19:50:39 -08:00
ZappoMan
634eb29c65 Merge pull request #1399 from ey6es/metavoxels 
First pass at/proof of concept of "metavoxels."
 2013-12-17 19:08:51 -08:00
Andrzej Kapolka
45c31cece3 Removed insertion test code. 2013-12-17 18:23:12 -08:00
Andrzej Kapolka
a90dbe314b Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 18:10:39 -08:00
ZappoMan
a443570106 Merge pull request #1397 from birarda/master 
fix for 8 channel audio output
 2013-12-17 18:04:12 -08:00
Andrzej Kapolka
f7aa464bf2 Somehow, I overwrote this value in Camera. 2013-12-17 17:21:56 -08:00
Andrzej Kapolka
ff2b77d311 Back to a more modest depth. 2013-12-17 17:16:09 -08:00
Andrzej Kapolka
8ddf6297a5 Fixed Xcode warnings. 2013-12-17 17:13:41 -08:00
Andrzej Kapolka
6cffce5b31 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 16:57:25 -08:00
Andrzej Kapolka
e6a41b2003 Proof of concept sphere thing for metavoxels. 2013-12-17 16:56:52 -08:00