John Conklin II
b02e2c8123
Merge pull request #14081 from SamGondelman/blendshapes
...
Improve ModelBlender queuing
2018-09-26 15:10:02 -07:00
Zach Fox
9a21354c27
Merge branch 'notificationsForFourApps' of github.com:zfox23/hifi into notificationsForFourApps
2018-09-26 15:08:20 -07:00
Howard Stearns
940db4f112
fix recently introduced bug
2018-09-26 15:01:30 -07:00
Howard Stearns
6fdae83f1b
fix recent refactoring bug
2018-09-26 14:59:53 -07:00
Howard Stearns
e1659ed520
fix old bad merge, and if told referrer while already setup, follow
...
immediately
2018-09-26 14:57:47 -07:00
Zach Fox
6877af04f1
Fix GOTO notifs; fix WALLET notifs (pending backend change)
2018-09-26 14:57:32 -07:00
Ryan Huffman
09b2565e76
Remove UndoStack API
...
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
2018-09-26 14:43:11 -07:00
sam gateau
1e112d3c84
bringing back a bug fix from samuel
2018-09-26 14:15:42 -07:00
sam gateau
b5a47b2e76
Finalizing the renaming from Skinned to Deformed
2018-09-26 14:11:22 -07:00
Wayne Chen
db41a1c16b
error state signal for 404/interstitial
2018-09-26 13:48:15 -07:00
sam gateau
09dae5aee3
Addressing merge conflict in HighlightEffect.cpp
2018-09-26 13:24:21 -07:00
Roxanne Skelly
45a3df114f
Merge branch 'sysTraySetup' of https://github.com/roxanneskelly/hifi into sysTray
2018-09-26 13:05:30 -07:00
Roxanne Skelly
5949679c0a
Add mac interface-run detection to server-console
2018-09-26 13:00:37 -07:00
Roxanne Skelly
2c6e9349eb
SysTray Setup. server-console.exe should be included in client-only
...
installs.
By default, on new install, tray notifier should be enabled.
2018-09-26 12:59:15 -07:00
John Conklin II
c1dc0ff2ec
Merge pull request #14077 from sabrina-shanman/crash_ray-pick-dtor_pointer-only
...
Prevent thread issues with PickResults modified by Pointers
2018-09-26 12:12:58 -07:00
Gabriel Calero
6908107979
Apply UI changes in android signup
2018-09-26 16:00:14 -03:00
John Conklin II
7df90881cd
Merge pull request #14007 from kkurian/marketplace-item-tester
...
Marketplace item tester interface
2018-09-26 11:25:53 -07:00
John Conklin II
6c47ba0dc7
Merge pull request #13990 from SimonWalton-HiFi/chrono-timestamps
...
Use C++ chrono system_clock for timestamps
2018-09-26 11:22:49 -07:00
John Conklin II
d1771b2928
Merge pull request #14058 from danteruiz/fix-dispacther-module-order
...
fix equip while keeping new functionality
2018-09-26 11:06:45 -07:00
Dante Ruiz
7e138ebfff
update to new enabling method
2018-09-26 10:52:45 -07:00
Roxanne Skelly
be87773b2c
Checkpoint sysTray Installer
2018-09-26 10:47:33 -07:00
Roxanne Skelly
7257a99414
Checkpoint sysTray Installer
2018-09-26 10:46:19 -07:00
sabrina-shanman
4011660435
Merge branch 'master' into stt_parenting2
2018-09-26 10:17:45 -07:00
John Conklin II
0de433c7c7
Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master
...
fix for deadlock in other avatar entity removal from tree
2018-09-26 09:58:26 -07:00
Seth Alves
ff2a47e7e6
fix several uninitialized reads
2018-09-26 09:33:12 -07:00
Dante Ruiz
fa5dfb6e28
Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial
2018-09-26 09:18:12 -07:00
Wayne Chen
4a87773986
fixing interstitial page, clearing up debug statements
2018-09-26 07:41:18 -07:00
David Rowe
b98bd741b8
Indent and reword jumping and flying checkbox
2018-09-26 18:14:02 +12:00
David Rowe
053ae0e0ed
Use radio buttons for VR advanced movement options
2018-09-26 17:42:44 +12:00
David Rowe
496e0a6304
Update teleport FBX models
2018-09-26 17:20:56 +12:00
Wayne Chen
de5614500a
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialImprovements
2018-09-25 21:52:01 -07:00
John Conklin II
c5ff72bd20
Merge pull request #14024 from wayne-chen/toggle404Redirect
...
Toggle going to 404 redirect domain
2018-09-25 20:44:57 -07:00
Wayne Chen
3e5e324c7e
parenting text to head
2018-09-25 20:39:22 -07:00
Wayne Chen
e552b69f4c
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialImprovements
2018-09-25 20:27:31 -07:00
Wayne Chen
54f800fbda
including images/parent buttons to text
2018-09-25 20:21:05 -07:00
Kerry Ivan Kurian
28ec98be9e
Uninstall marketplace item tester on wallet shutdown
2018-09-25 19:24:46 -07:00
Wayne Chen
42579f3d16
fixing oops dialog text index lookups
2018-09-25 18:21:51 -07:00
Wayne Chen
26b6967ba6
adding overlays to redirect domain
2018-09-25 18:16:18 -07:00
sam gateau
efa1dd0274
rename the files from skin to deformed
2018-09-25 17:32:04 -07:00
luiscuenca
754653b093
Fix warnings
2018-09-25 17:31:18 -07:00
luiscuenca
82b08f1a93
Wait until skeleton is loaded to locate the avatar
2018-09-25 16:21:05 -07:00
John Conklin II
3d71dfc467
Merge pull request #14072 from SamGondelman/highlight
...
Fix avatar highlighting
2018-09-25 16:13:14 -07:00
Kerry Ivan Kurian
e6249e690e
Remove duplicate line
2018-09-25 15:52:26 -07:00
Seth Alves
87a67a3f0c
call saveRecordingToAsset callback on correct thread
2018-09-25 15:50:47 -07:00
John Conklin II
19438d143e
Merge pull request #14073 from jherico/fix/18069_test
...
Working on Vive shutdown issues
2018-09-25 15:41:32 -07:00
Kerry Ivan Kurian
276125937c
Eliminate double equals
2018-09-25 15:18:12 -07:00
Kerry Ivan Kurian
4e7b03883f
Use triple equals
2018-09-25 15:13:26 -07:00
Roxanne Skelly
3deb3bc771
Coding standard issue found during CR
2018-09-25 14:17:15 -07:00
Roxanne Skelly
cbb4bff2db
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-25 14:16:43 -07:00
Roxanne Skelly
ac2ad7fc81
Fix some coding standard issues found during CR
2018-09-25 14:13:25 -07:00
