Seth Alves
|
1e1968357a
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-09 09:24:50 -07:00 |
|
David Kelly
|
d40984b475
|
Merge pull request #10384 from davidkelly/dk/minorHandshakeImprovement
Some minor handshake improvements
|
2017-05-09 09:14:31 -07:00 |
|
Andrew Meadows
|
e92e710cdc
|
Merge pull request #10413 from humbletim/fix_lookat_regression
Fix lookAt eye snapping
|
2017-05-09 08:51:10 -07:00 |
|
Ken Cooke
|
a96a89f9f6
|
Merge pull request #10320 from kencooke/audio-wasapi-qt562
Update WASAPI audio plugin for Qt5.6.2
|
2017-05-09 07:57:23 -07:00 |
|
Seth Alves
|
4816e4f826
|
what does VS mean when it uses words?
|
2017-05-08 21:39:41 -07:00 |
|
humbletim
|
29b1ac3572
|
optimizations per feedback
|
2017-05-08 21:50:24 -04:00 |
|
humbletim
|
68ca0d921e
|
use assert rather than whole if block
|
2017-05-08 21:34:55 -04:00 |
|
humbletim
|
42d1498d20
|
call Model::updateRig (not Parent::updateRig)
|
2017-05-08 21:19:18 -04:00 |
|
Andrew Meadows
|
2835a73c6b
|
Merge pull request #10071 from AndrewMeadows/walk-up-steps
avatar can walk up steps
|
2017-05-08 18:17:16 -07:00 |
|
Ken Cooke
|
807a6d5831
|
Bugfix: new threading changes in the Qt5.7.1 plugin were causing deadlock
|
2017-05-08 18:03:50 -07:00 |
|
Ken Cooke
|
746ae6dfd3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-wasapi-qt562
|
2017-05-08 17:56:19 -07:00 |
|
Seth Alves
|
55056e730a
|
guard slider and cone-twist constraints against zero-length axisq
|
2017-05-08 17:02:37 -07:00 |
|
Seth Alves
|
f8cab08b19
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-08 16:37:19 -07:00 |
|
Seth Alves
|
de589a32f3
|
clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring
|
2017-05-08 16:36:51 -07: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Ryan Huffman
|
4895f51dc1
|
Update content set URL
|
2017-05-05 16:41:32 -07:00 |
|
Chris Collins
|
820ed5049b
|
Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire
Fix -- dont send non-entity edits to entity-server
|
2017-05-05 16:37:27 -07:00 |
|
Atlante45
|
d4bd145786
|
Merge branch 'stable' of https://github.com/highfidelity/hifi
|
2017-05-05 16:36:21 -07:00 |
|
David Rowe
|
1b26ba22cb
|
Fix browser history in goto "i" pages on tablet
|
2017-05-06 11:13:13 +12:00 |
|