Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-19 12:02:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21019 commits 76 branches 59 tags 1.2 GiB
Commit graph

21019 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
6d3a9f7bc0 merge fix 2015-01-26 18:43:42 -08:00
Philip Rosedale
2108cac38e Merge pull request #4170 from Atlante45/hydra_grab_fix 
Fixed mapped rotation + doubled it
 2015-01-26 18:27:42 -08:00
Atlante45
64f8495681 Fixed mapped rotation + doubled it 2015-01-26 18:20:08 -08:00
Philip Rosedale
dd352e5a1a Merge branch 'master' of https://github.com/worklist/hifi 2015-01-26 17:31:35 -08:00
Philip Rosedale
78e1769468 Merge pull request #4169 from Atlante45/hydra_grab_fix 
Hydra grab fix
 2015-01-26 17:31:13 -08:00
Philip Rosedale
a1babe3a33 Put paddle exactly in hand, add animation of fingers gripping paddle 2015-01-26 17:20:31 -08:00
Atlante45
4b3291d946 Some cleanup in hydraGrab.js 2015-01-26 17:11:49 -08:00
Atlante45
4278407137 Account for avatar scale in Hand(Data) get/set 
When using localToWorld/WorldToLocal type functions
 2015-01-26 16:48:33 -08:00
Philip Rosedale
bfdbe2e675 Detach both guns on shutdown 2015-01-26 16:25:07 -08:00
Stephen Birarda
3ceadf31b3 Merge pull request #4165 from murillodigital/ice-monitoring 
Check just for http availability
 2015-01-26 14:30:33 -08:00
Brad Hefta-Gaub
d207304db0 Merge pull request #4166 from ctrlaltdavid/20279 
Temporarily re-enable audio selection on Windows
 2015-01-26 12:08:53 -08:00
David Rowe
9aaa3a6fe4 Temporarily re-enable audio selection on Windows 
This is to test current behavior on different users' PCs before
re-enabling permanently.
 2015-01-26 11:48:44 -08:00
Leonardo Murillo
d26804e68c Check just for http availability 2015-01-26 13:45:14 -06:00
Philip Rosedale
09527cc264 hit target 2015-01-25 21:52:08 -08:00
Philip Rosedale
67632fa589 remove debug 2015-01-25 21:51:12 -08:00
Philip Rosedale
901044fc53 First version, popcorn machine 2015-01-25 21:40:16 -08:00
Andrew Meadows
18e0a91ea8 Merge pull request #4158 from ZappoMan/fixGlitches 
fix last simulated and last updated to correctly be sent over the wire
 2015-01-23 16:45:27 -08:00
ZappoMan
de75eec877 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches 2015-01-23 16:23:56 -08:00
Philip Rosedale
1048c9cda3 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-23 16:09:51 -08:00
Philip Rosedale
806c1851be add save/restore of gravity 2015-01-23 16:09:45 -08:00
Philip Rosedale
ba65112463 Merge pull request #4159 from Atlante45/master 
Request blocking calls
 2015-01-23 16:08:23 -08:00
Atlante45
7a1300d66c Request blocking calls 2015-01-23 16:05:06 -08:00
ZappoMan
9a0576adfb remove setting last simulated in setLastEdited() because it may cause problems 2015-01-23 15:54:26 -08:00
Philip Rosedale
e2cd394845 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-23 15:30:49 -08:00
ZappoMan
9cc61e90f7 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches 
Conflicts:
	libraries/entities/src/EntityItem.cpp
 2015-01-23 15:01:35 -08:00
Brad Hefta-Gaub
494c189094 Merge pull request #4157 from AndrewMeadows/isentropic 
client-side kinematic motion for non-physical objects
 2015-01-23 15:00:01 -08:00
Andrew Meadows
1ad5f9c7db merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/physics/src/ObjectMotionState.cpp
 2015-01-23 14:04:26 -08:00
ZappoMan
c01d2d657c added comment 2015-01-23 13:55:12 -08:00
ZappoMan
fa485d21b7 added comment 2015-01-23 13:52:28 -08:00
ZappoMan
3c38a9eb53 add last simulated to the protocal 2015-01-23 13:32:38 -08:00
Andrew Meadows
b34189115d Merge branch andrew/isentropic 2015-01-23 13:21:45 -08:00
Andrew Meadows
36c20c24fe fix for velocity in units of domain size 2015-01-23 13:20:12 -08:00
Andrew Meadows
f2bcdfa2b4 update _lastSimulated for kinematic motion 2015-01-23 13:10:41 -08:00
Andrew Meadows
eefd32b42b remove KinematicController classes 2015-01-23 11:04:02 -08:00
Andrew Meadows
d173afaa70 add support for non-physical kinematic movement 2015-01-23 11:01:46 -08:00
ZappoMan
31f72107da remove support for old pre-entity svo files 2015-01-23 09:26:48 -08:00
Philip Rosedale
e422c0ed96 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-23 08:22:59 -08:00
Andrew Meadows
3a1c99b5e5 Merge pull request #4153 from PhilipRosedale/master 
Paddle ball game, first version
 2015-01-23 08:05:59 -08:00
Andrew Meadows
5672403900 Merge pull request #4154 from huffman/win-dpi-fixes 
Update runningScriptsWidgets px -> pt
 2015-01-23 08:05:24 -08:00
Andrew Meadows
cce763858e Merge pull request #4147 from ey6es/master 
Fixed bug with normal selection, incremental improvements to stitching.
 2015-01-23 08:04:10 -08:00
Andrzej Kapolka
b8a15f0726 Another tweak. 2015-01-22 22:04:10 -08:00
Andrzej Kapolka
c124dffd6a Another slight improvement. 2015-01-22 21:26:08 -08:00
Andrzej Kapolka
e65090bab9 Another slight stitching improvement. 2015-01-22 21:08:48 -08:00
Ryan Huffman
0e6f2d7252 Update runningScriptsWidgets px -> pt 2015-01-22 16:22:36 -08:00
Andrzej Kapolka
c1c9f698df Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-22 14:55:37 -08:00
Andrzej Kapolka
805d5ace13 Another slight stitching improvement. 2015-01-22 14:55:14 -08:00
Stephen Birarda
e488e841b7 Merge pull request #4151 from murillodigital/ice-monitoring 
Adding http monitoring for ICE server
 2015-01-22 14:26:49 -08:00
Philip Rosedale
a3df7a242d Merge branch 'master' of https://github.com/worklist/hifi 2015-01-22 14:25:16 -08:00
Andrew Meadows
355759d3d4 Merge pull request #4152 from ZappoMan/fixGlitches 
Fix glitches in bullets and multiple viewers
 2015-01-22 13:49:00 -08:00
Philip Rosedale
59f79fd436 Add handedness choice, default to right handed 2015-01-22 13:42:19 -08:00