Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54962 commits 71 branches 56 tags 1.2 GiB
Commit graph

54962 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
03ba3f5944 minimize diff 2.0 2017-05-09 00:31:13 +01:00
Dante Ruiz
00546c55bb minimize diff 2017-05-09 00:30:06 +01:00
Dante Ruiz
2d3eb7ba07 Merge branch 'master' of github.com:highfidelity/hifi into config-pucks 2017-05-09 00:28:09 +01:00
Dante Ruiz
23c3a75116 finally fixed rotation issue 2017-05-09 00:27:30 +01:00
Thijs Wenker
6da925a626 Merge pull request #10410 from huffman/fix/sphinx-copyright 
Update copyright in sphinx scripts
 2017-05-09 01:03:58 +02:00
Ryan Huffman
773e4346f9 Update copyright in sphinx scripts 
These were meant to be updated before the PR was merged, but I
overlooked it.
 2017-05-08 15:59:29 -07:00
Ryan Huffman
b7af9e20c9 Merge pull request #10211 from Delamare2112/InteractionJS 
Just the interaction JS scripts
 2017-05-08 15:54:16 -07:00
humbletim
ef0e32643d update refactored logic to match previous application behavior 2017-05-08 18:53:47 -04:00
Seth Alves
1346ce22b9 don't crash if imported entities make a reference to an unknown entity 2017-05-08 15:51:25 -07:00
Ryan Huffman
e670037198 Adjust copyright on Limitless Sphinx script 2017-05-08 15:49:42 -07:00
Seth Alves
94dfbc81f3 entity export/import involving constraints now works 2017-05-08 15:44:31 -07:00
Anthony J. Thibault
2166d8c159 Added setSolutionSource to AnimInverseKinematics node. 2017-05-08 15:06:31 -07:00
Anthony J. Thibault
712fcbe27a Removed cruft/debug code & comments 2017-05-08 15:06:30 -07:00
Anthony J. Thibault
7af93f9fea Hooked up IK constraint rendering 2017-05-08 15:06:29 -07:00
Anthony J. Thibault
e992d6703a WIP: debug render joint constraints. 2017-05-08 15:06:28 -07:00
Anthony J. Thibault
a260163aee WIP commit, first pass at generating limit center joints + debug draw 2017-05-08 15:06:27 -07:00
anshuman64
f10535d991 Merge pull request #10395 from ctrlaltdavid/21319 
Fix browser "back" button in tablet snapshot and goto "i" pages
 2017-05-08 14:51:18 -07:00
Anthony J. Thibault
b276970258 Hand controller lasers work better in thirdPerson camera mode. 2017-05-08 14:32:50 -07:00
David Rowe
116175cf9f Fix going back from Twitter password recovery page 2017-05-09 09:03:48 +12:00
David Rowe
c8328e9b9f Merge branch 'master' into 21319 2017-05-09 08:04:27 +12:00
Andrew Meadows
e44c2c8da3 init zero gravity to agree with init hover state 2017-05-08 12:47:32 -07:00
Vladyslav Stelmakhovskyi
fa9a4053ca Save selected device in settings to make sure it will not be changed back in Menu 2017-05-08 21:24:46 +02:00
David Kelly
7d0494dd56 use new images in api/v1/users response json 2017-05-08 12:15:03 -07:00
Thijs Wenker
5aed960c4c Merge pull request #10389 from AndrewMeadows/render-collision-shapes-002 
fix render of debug collision shapes
 2017-05-08 20:35:59 +02:00
Mike Moody
dae652d3db v1 HMD duplication overlay. 2017-05-08 11:25:24 -07:00
Ryan Huffman
c73c59baee Move changes in AC audio searcher from tutorial content into git 2017-05-08 11:19:05 -07:00
Brad Hefta-Gaub
d52daf3445 Merge pull request #10378 from samcake/orange 
Adding a test to protect Uniform Buffer binding at wrong slot
 2017-05-08 11:16:56 -07:00
Vladyslav Stelmakhovskyi
d0111ac0bb Merge branch 'master' into audio-source-sync 2017-05-08 20:09:34 +02:00
Seth Alves
c8cdad5b4e Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-08 11:02:42 -07:00
Seth Alves
fd238f5438 working on fixing action/constraint export/import 2017-05-08 11:02:35 -07:00
Andrew Meadows
d9e893ac21 minior optimization/cleanup 2017-05-08 11:02:11 -07:00
Andrew Meadows
0f643b7d66 add check to avoid divide by zero 2017-05-08 10:59:15 -07:00
Clément Brisset
8df8ed568f Merge pull request #10342 from huffman/feat/tutorial-update 
DNM Tutorial update
 2017-05-08 10:54:19 -07:00
Andrew Meadows
f00a3cafb6 cleanup logic to be more readable 2017-05-08 10:52:54 -07:00
Ryan Huffman
9b098a4bf7 Fix randFloat error in ac audio searcher 2017-05-08 10:51:13 -07:00
Chris Collins
4bfb23b5d2 Merge pull request #10388 from humbletim/21308 
CR #21308 Fix Script.print
 2017-05-08 10:46:49 -07:00
Chris Collins
1264c34f6c Merge pull request #10349 from birarda/machine-guid-fingerprint 
use MachineGuid for slightly safer windows machine fingerprint
 2017-05-08 10:42:14 -07:00
Chris Collins
d88d52cd2e Merge pull request #9735 from humbletim/21190-fix-unit-tests 
CR 21190 unit_tests: add support for jasmine.done() and pending
 2017-05-08 09:19:01 -07:00
Chris Collins
0351ac1575 Merge pull request #10401 from jherico/fix_benny_hill_animations 
Fix sped up animations
 2017-05-08 09:11:23 -07:00
Chris Collins
b4118e5619 Merge pull request #10394 from zzmp/fix/local-audio-prep 
Guard against local audio crashes
 2017-05-08 09:04:41 -07:00
Seth Alves
cfe118e2c6 start on code to remap constraint IDs during import 2017-05-07 19:42:24 -07:00
Seth Alves
7a1a9d6496 start on code to remap constraint IDs during import 2017-05-07 19:42:04 -07:00
Rob Kayson
1873558df1 added floating lantern box that spawns floating lanterns 2017-05-06 18:41:57 -07:00
Mike Moody
03490c81da v1 with bug, looking into. 2017-05-06 15:36:18 -07:00
Brad Davis
b63015eaea Fix sped up animations 2017-05-06 14:34:28 -07:00
Seth Alves
5d539bcc17 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-06 07:49:02 -07:00
Seth Alves
9e0845f17e Merge pull request #10387 from vladest/tablet-performance 
Decrease CPU usage in tabletUI periodical updates
 2017-05-06 07:07:29 -07:00
Vladyslav Stelmakhovskyi
b2be22f0e0 Maerge broke the logic. Fixed now 2017-05-06 10:28:57 +02:00
Clément Brisset
37f339858e Merge pull request #10397 from huffman/feat/baked-tutorial 
Update content set URL
 2017-05-05 17:34:41 -07:00
Chris Collins
0a16831395 Merge pull request #10396 from Atlante45/master 
Stable -> Master
 2017-05-05 16:47:51 -07:00