Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 14:59:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54207 commits 25 branches 0 tags 1.1 GiB
Commit graph

54207 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
59ed51c702 Merge pull request #10280 from samcake/white 
Fixing the crash on mac at start up
 2017-04-25 14:32:23 -07:00
Stephen Birarda
c00dfcc7d7 send the domain disconnect packet before UUID is cleared 2017-04-25 14:32:21 -07:00
Ryan Huffman
284af6d378 Merge pull request #10085 from thoys/gameTable 
[DNM] Game table
 2017-04-25 14:05:20 -07:00
David Rowe
c83f82f5da Delay start of recording until after beep finishes 2017-04-26 08:59:50 +12:00
Brad Hefta-Gaub
1962a49f3b Merge pull request #10225 from sethalves/bullet-constraints-1 
Bullet constraints + far-grab bootstrap fix
 2017-04-25 13:36:47 -07:00
Zach Pomerantz
d2bfcce3f7 Merge pull request #10242 from zzmp/fix/display-log 
Send changed_display_mode after it changes
 2017-04-25 16:36:12 -04:00
humbletim
a833912399 cleanup and documentation 2017-04-25 16:30:05 -04:00
humbletim
760113f9c9 add doppleganger example/placeholder icons 2017-04-25 16:29:34 -04:00
Stephen Birarda
cd023e0384 force domain-server to use new ID if node requests connect 2017-04-25 13:10:54 -07:00
Chris Collins
5036e63cb8 Changed Qt version for android 2017-04-25 13:05:59 -07:00
Brad Hefta-Gaub
0783433d75 Merge pull request #10251 from birarda/edit-baked-column 
add a column to edit.js to identity baked models
 2017-04-25 13:04:48 -07:00
howard-stearns
ee9b953b1c typo 2017-04-25 12:12:26 -07:00
samcake
fe7cec1734 Testing on windows running 4.1 backend, all good 2017-04-25 12:04:12 -07:00
samcake
dff3a3bb34 fixing the mac crash 2017-04-25 11:34:01 -07:00
Chris Collins
71bc8804ec Merge pull request #10274 from highfidelity/RC-37-HOTFIX 
Build 37.1 Hotfix to fix a crash bug for graphics and tablet
 2017-04-25 10:54:06 -07:00
Dante Ruiz
8c020a0ec2 saving work 2017-04-25 18:01:19 +01:00
Ken Cooke
d7bf42c77a Merge pull request #10276 from mnafees/21222 
CR for Job #21222 - Clean up plugins/hifiCodec dependencies
 2017-04-25 06:16:51 -07:00
David Rowe
d682924b00 Temporary fix for recording audio 2017-04-25 21:08:10 +12:00
Mohammed Nafees
3382f9f5eb Remove unnecessary dependencies from hifiCodec 2017-04-25 00:42:45 -04:00
Philip Rosedale
eaa2102d3f Code review fixes 2017-04-24 21:03:17 -07:00
Philip Rosedale
663e682f23 Merge branch 'halfDuplex' of https://github.com/PhilipRosedale/hifi into springHold 2017-04-24 20:46:48 -07:00
David Rowe
79346673ed Log user activity events in record and playback scripts 2017-04-25 13:43:28 +12:00
David Rowe
4c30c0d722 Make UserActivityLogger available to AC scripts 2017-04-25 13:42:12 +12:00
David Rowe
c05954ee4b Add logAction() method to UserActivityLogger JavaScript API 2017-04-25 13:40:57 +12:00
ZappoMan
d179135a87 remove dead code 2017-04-24 18:21:22 -07:00
ZappoMan
95a3e0a092 fix whitespace 2017-04-24 18:06:33 -07:00
ZappoMan
382645ddd0 more cleanup 2017-04-24 18:01:54 -07:00
Andrew Lowry
5ffb8eba86 Initialize background color for color picker correctly. 2017-04-24 20:37:43 -04:00
ZappoMan
aa955ee360 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-24 17:36:30 -07:00
ZappoMan
c9aad6b762 new approach to the tpose fix, as well as other improvements 2017-04-24 17:36:05 -07:00
Dante Ruiz
ef03ca2a2c tablet cpp ownership 2017-04-24 17:21:18 -07:00
Dante Ruiz
0705f23009 remove debug statments 2017-04-24 17:21:09 -07:00
Dante Ruiz
d03f44ff24 crash fix 2017-04-24 17:20:47 -07:00
Dante Ruiz
adc0c8086e check for null when we dont 2017-04-24 17:20:32 -07:00
Anthony J. Thibault
4336e22f5a clang warning fix 2017-04-24 17:06:02 -07:00
Anthony J. Thibault
937f308ba8 code cleanup 2017-04-24 17:04:16 -07:00
Anthony J. Thibault
8b16a7c7e1 Added hipsIkTest.js test script 2017-04-24 16:40:24 -07:00
Clément Brisset
77cd2d08b2 Merge pull request #10106 from MrRoboman/W-21204-tetherball-toy 
Added tetherball create and entity scripts
 2017-04-24 16:36:21 -07:00
humbletim
6f178ee1ec initial checkin of doppleganger module and tablet app scripts 2017-04-24 19:28:03 -04:00
humbletim
3641ca3816 add support for jointRotations/jointTranslations to ModelOverlay 2017-04-24 19:24:54 -04:00
humbletim
28b3eef7aa add getJointTranslations() methods 2017-04-24 19:22:02 -04:00
Atlante45
24f4107c92 Unload script when replaced with empty URL 2017-04-24 15:56:37 -07:00
Atlante45
d292451f91 Remove unnecessary const 2017-04-24 15:43:36 -07:00
Dante Ruiz
2a997f2a4d fix for ubuntu build error 2017-04-24 23:08:02 +01:00
Anthony J. Thibault
8adbe34c27 added comment 2017-04-24 14:36:56 -07:00
Anthony J. Thibault
deca26e9eb Fix for HMDHead tip constraint 2017-04-24 14:33:14 -07:00
Dante Ruiz
b023356fb7 added javascript file 2017-04-24 22:29:13 +01:00
Dante Ruiz
8705db07e5 removed dead code 2017-04-24 22:22:49 +01:00
Anthony J. Thibault
1cd0f03242 Restore master version of computeHipsOffset() and special case for HeadHMD target type 2017-04-24 14:19:06 -07:00
Dante Ruiz
249862141a Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-24 22:09:09 +01:00