Anthony Thibault
|
e3c342aa77
|
Merge pull request #10595 from hyperlogic/feature/spine-spline
Spline IK target support
|
2017-06-08 18:09:55 -07:00 |
|
Seth Alves
|
485df396ef
|
Merge pull request #10628 from jherico/qt59
Fixes for Qt 5.9 compatibility
|
2017-06-08 16:51:08 -07:00 |
|
Seth Alves
|
73a88236a0
|
Merge pull request #10586 from ctrlaltdavid/21202
Relax hands to default position/rotation when controller tracking is lost
|
2017-06-08 16:38:08 -07:00 |
|
Seth Alves
|
d87b858c0a
|
Merge pull request #10619 from NeetBhagat/4869-Entity-resize-issue
4869 entity resize issue
|
2017-06-08 16:34:07 -07:00 |
|
Seth Alves
|
9fa74029c7
|
Merge pull request #10633 from mnafees/21299
CR for Job #21299 - Save category on Marketplace when using back button
|
2017-06-08 16:10:56 -07:00 |
|
Anthony J. Thibault
|
8334dff610
|
compute rotation from derivative of spline
This should fix bad rotation values for the spine during bowing/touching toes.
|
2017-06-08 15:00:12 -07:00 |
|
Clément Brisset
|
dd3a7f7249
|
Merge pull request #10641 from highfidelity/stable
stable -> master after sandbox PID hotfix
|
2017-06-08 10:57:28 -07:00 |
|
Stephen Birarda
|
71bb55f661
|
Merge pull request #10642 from seefo/fb4399
Resolved FB4399
|
2017-06-08 10:42:12 -07:00 |
|
seefo
|
110a2f5d03
|
Resolved FB#4399
|
2017-06-08 10:35:50 -07:00 |
|
Stephen Birarda
|
f4d0bc69b1
|
Merge pull request #10630 from seefo/oven
Added CLI to Oven tool
|
2017-06-08 10:13:08 -07:00 |
|
seefo
|
0c7ffa0ac6
|
Replaced baker in OvenCLI with an std::unique_ptr
|
2017-06-08 09:48:30 -07:00 |
|
Howard Stearns
|
5352e85418
|
Merge pull request #10553 from howard-stearns/do-not-get-stuck-in-floor
Do not get stuck in floor
|
2017-06-07 20:11:38 -07:00 |
|
Stephen Birarda
|
f884de87ad
|
Merge pull request #10637 from highfidelity/RC-42-Hotfix
Build 42.1 Hotfix Update server-console to watch interface via pid rather than marker
|
2017-06-07 19:05:40 -07:00 |
|
seefo
|
8d5b90afe7
|
Merge pull request #10600 from seefo/snapshot
Added Polaroid Feature to Snapshot
|
2017-06-07 17:05:29 -07:00 |
|
seefo
|
26bd6b67ae
|
Final touches to polaroid feature
|
2017-06-07 16:52:16 -07:00 |
|
howard-stearns
|
9cf027a68c
|
pr feedback
|
2017-06-07 16:44:13 -07:00 |
|
howard-stearns
|
fa74daf875
|
Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor
|
2017-06-07 16:43:25 -07:00 |
|
howard-stearns
|
9b5b352bc7
|
Merge branch 'do-not-get-stuck-in-floor' of https://github.com/howard-stearns/hifi into do-not-get-stuck-in-floor
|
2017-06-07 16:21:08 -07:00 |
|
Ryan Huffman
|
2146f96091
|
Replace static use of qApp with QCoreApplication
|
2017-06-07 15:33:44 -07:00 |
|
Ryan Huffman
|
f10f717ea2
|
Add clarifying comment to use of kill in isProcessRunning
|
2017-06-07 15:33:37 -07:00 |
|
Ryan Huffman
|
3888385a72
|
Remove the runningMarker timer
|
2017-06-07 15:33:29 -07:00 |
|
Ryan Huffman
|
ccd473ad0c
|
Remove shutdownWatcher option inside sandbox
|
2017-06-07 15:33:22 -07:00 |
|
Ryan Huffman
|
37321814b6
|
Rename watchProcessShutdown to shutdownWith
|
2017-06-07 15:33:16 -07:00 |
|
Ryan Huffman
|
34630f839f
|
Fix isProcessRunning error in strict mode
|
2017-06-07 15:33:09 -07:00 |
|
Ryan Huffman
|
a654bfa692
|
Update server-console to watch interface via pid rather than marker
|
2017-06-07 15:33:02 -07:00 |
|
seefo
|
99e9e10882
|
Made requested changes to OvenCLI constructor
|
2017-06-07 11:36:56 -07:00 |
|
Anthony J. Thibault
|
606c6415ae
|
Merge branch 'master' into feature/spine-spline
|
2017-06-07 10:53:46 -07:00 |
|
Anthony Thibault
|
0bbbcbba67
|
Merge pull request #10594 from sethalves/head-controller
Head controller
|
2017-06-07 10:53:13 -07:00 |
|
Seth Alves
|
69520ff3db
|
pull from upstream, code review
|
2017-06-07 10:28:02 -07:00 |
|
Seth Alves
|
b1c7c251ac
|
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
|
2017-06-07 10:09:46 -07:00 |
|
Mohammed Nafees
|
608becef7d
|
Make the back button work again, uses the browser history directly now.
|
2017-06-07 15:52:06 +05:30 |
|
Brad Hefta-Gaub
|
e5ac3eeea7
|
Merge pull request #10548 from NeetBhagat/21255
On Oculus Rift on/off, switch automatically to/from desktop mode
|
2017-06-06 18:05:56 -07:00 |
|
David Kelly
|
06527ac0a2
|
Merge pull request #10611 from davidkelly/dk/4873
protect _text member of Text3DOverlay with mutex
|
2017-06-06 16:50:57 -07:00 |
|
seefo
|
a3d2fa2630
|
Made requested changed to Oven CLI
|
2017-06-06 16:13:18 -07:00 |
|
Stephen Birarda
|
d7b1f882c4
|
Merge pull request #10627 from seefo/readme
Updated Windows build guide's markdown
|
2017-06-06 15:22:26 -07:00 |
|
seefo
|
aa13812e3f
|
Fixed multiline in BUILD_WIN.md
|
2017-06-06 15:20:26 -07:00 |
|
seefo
|
46400f4122
|
Cleaned up oven CLI
|
2017-06-06 15:05:26 -07:00 |
|
Bradley Austin Davis
|
b4bbf98fe3
|
Suppress TBB warnings
|
2017-06-06 15:02:16 -07:00 |
|
Bradley Austin Davis
|
fc6a278217
|
Fixing dangling thread issues, consolidating thread management
|
2017-06-06 15:02:16 -07:00 |
|
Bradley Austin Davis
|
a36727732f
|
Fix bad initializer
|
2017-06-06 15:02:16 -07:00 |
|
Brad Davis
|
171d3212fe
|
Merge pull request #10623 from jherico/qml_engine_singleton
Migrate to single QML engine
|
2017-06-06 15:00:43 -07:00 |
|
seefo
|
9bc1bc47a2
|
Added CLI to Oven tool
|
2017-06-06 14:57:42 -07:00 |
|
Stephen Birarda
|
0ccd0d3fd6
|
Merge pull request #10621 from highfidelity/stable
Merge Stable back into Master
|
2017-06-06 10:39:03 -07:00 |
|
seefo
|
40823bf582
|
Updated Windows build guide's markdown
|
2017-06-06 10:11:46 -07:00 |
|
NeetBhagat
|
c3621d7c32
|
Resolved two issues:
1) While in HMD mode -> open Tablet -> Click Desktop. Desktop mode will be on.
2) Menu sync problem while switching modes.
|
2017-06-06 22:31:14 +05:30 |
|
Seth Alves
|
ad1ee97324
|
remove cruft
|
2017-06-06 09:50:40 -07:00 |
|
Andrew Meadows
|
f1dd5fbb14
|
Merge pull request #10613 from hyperlogic/bugfix/teleport-with-no-feet
teleport.js should still function on avatars with no feet.
|
2017-06-06 09:33:00 -07:00 |
|
Anthony J. Thibault
|
90d241ca3c
|
Account for avatar scale
|
2017-06-06 09:10:46 -07:00 |
|
seefo
|
b729707ce7
|
Removed old comments in SnapshotReview.js
|
2017-06-06 09:10:25 -07:00 |
|
NeetBhagat
|
ae9a928740
|
Merge branch 'master' into 21255
# Conflicts:
# interface/src/Application.cpp
|
2017-06-06 19:06:50 +05:30 |
|