Commit graph

80190 commits

Author SHA1 Message Date
Zach Fox
d29cdffe8c Toggle reaction bugfix 2019-08-15 14:42:27 -07:00
Zach Fox
2149f1acc7 Reaction logic now nice and stable! 2019-08-15 14:40:33 -07:00
RebeccaStankus
af97384948 Adding icon swaps to emoteIndicator 2019-08-15 14:21:03 -07:00
Zach Fox
0497c10d69 Ensure mask covers non-circular emoji 2019-08-15 13:20:09 -07:00
Zach Fox
9ae5eba12a Remove reliance on QML timer - still need to fix non-circular emoji mask 2019-08-15 13:04:50 -07:00
Zach Fox
dcae607cfb Applause sound and fixup handler 2019-08-15 12:46:30 -07:00
Zach Fox
38743f924f Autofocus Emoji search text field 2019-08-15 12:23:29 -07:00
Zach Fox
0338b0258c Add Search to Emoji window and clean up some code 2019-08-15 12:21:29 -07:00
RebeccaStankus
078ff223a4 Emote animations start and stop correctly 2019-08-15 12:01:25 -07:00
Zach Fox
143c3e966c Big optimizations to Emoji window 2019-08-15 10:58:13 -07:00
Zach Fox
2c604d2c5b Simpler code! 2019-08-15 09:58:45 -07:00
Zach Fox
bfb4c0c49a Fixup emote indicator 2019-08-15 09:21:42 -07:00
RebeccaStankus
46a8e804b3 Working on tray functionality 2019-08-15 09:11:52 -07:00
RebeccaStankus
bc67241100 Finished changes for CR feedback 2019-08-14 14:09:48 -07:00
RebeccaStankus
ee435b6ce4 Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd 2019-08-14 13:29:32 -07:00
RebeccaStankus
0645796e74 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-14 13:28:08 -07:00
RebeccaStankus
9a5812d72c Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-14 12:04:20 -07:00
RebeccaStankus
8728640f60 Initial CR changes 2019-08-14 12:03:49 -07:00
Andy Howell
03e3f38ff1
Merge pull request #16056 from Atlante45/fix/requesjs
BUGZ-1239: Delete reply after the callback is executed
2019-08-12 17:35:39 -07:00
Clement
90aeb636bd Delete reply after the callback is executed 2019-08-12 17:21:22 -07:00
Ryan Huffman
6f76098a2c
Merge pull request #16051 from Atlante45/feat/add-version-to-oven
DEV-352: Add --version to the Oven
2019-08-12 15:45:09 -07:00
Shannon Romano
ee57d25df9
Merge pull request #16055 from zfox23/removeLoDShortcut
BUGZ-1233: Remove keyboard shortcut to LoD tools
2019-08-12 12:20:10 -07:00
Shannon Romano
54671da230
Merge pull request #16054 from jherico/fix/bugz-919
BUGZ-919: Skybox broken on older AMD drivers
2019-08-12 12:15:59 -07:00
Zach Fox
a225a009cd BUGZ-1233: Remove keyboard shortcut to LoD tools 2019-08-12 11:27:34 -07:00
Brad Davis
a01f115357 Disable use of DSA to load cubemaps 2019-08-12 10:34:37 -07:00
Brad Davis
44e2037e15 Quiet warnings, add convenience function 2019-08-12 10:34:07 -07:00
Shannon Romano
1011880698
Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation
(BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away
2019-08-09 17:28:46 -07:00
Clement
97038a7196 Fix tracing warning spam 2019-08-09 17:20:41 -07:00
Clement
be534f2127 Add --version to the Oven 2019-08-09 17:11:07 -07:00
sabrina-shanman
16593ec3c9 Remove invalid deprecated comment 2019-08-09 16:32:31 -07:00
Anthony Thibault
1b225a777a
Merge pull request #16048 from luiscuenca/rotationOnlyInterpolationFix
DEV-332: Ramp on and off Head IK to make reactions smoother
2019-08-09 16:18:12 -07:00
sabrina-shanman
07ea79689e Fix build warnings 2019-08-09 13:34:55 -07:00
Shannon Romano
29cc7e848e
Merge pull request #16044 from SimonWalton-HiFi/count-dropped-packets
BUGZ-1161: Report count of dropped packets in Socket::checkForReadyReadBackup()
2019-08-09 13:16:42 -07:00
Shannon Romano
0b71cac84b
Merge pull request #16043 from sethalves/fix-linux-build-shared-nitpick
BUGZ-1205: fix Linux builds when -DBUILD_SHARED_LIBS=ON
2019-08-09 13:15:47 -07:00
sabrina-shanman
49f1ecb1bf Fix new bugs in TabletLODTools.qml 2019-08-09 11:41:11 -07:00
Anthony Thibault
c2fbfd70c4
Merge pull request #16045 from hyperlogic/feature/reaction-intro-loop-outro
Higher quality standing and seated reactions
2019-08-09 11:16:49 -07:00
Simon Walton
4de720a456 Enable the event-queue hack on Linux in addition to Windows 2019-08-09 11:12:33 -07:00
luiscuenca
73b3419c75
store rotations when interpolating 2019-08-09 11:02:20 -07:00
luiscuenca
e3ec87a8f8
Add in/out interpolation between RotationOnly and Unknown types 2019-08-09 10:46:48 -07:00
Brad Hefta-Gaub
555a875405
Merge pull request #16047 from jherico/fix/bugz-1097
BUGZ-1097: Fix invalid rendering of splash frame on AMD based macs
2019-08-09 09:51:38 -07:00
Simon Walton
dbc2a67758 Log event-queue size on readRead timeout 2019-08-09 09:46:09 -07:00
Shannon Romano
1993ff6277
Merge pull request #15922 from SimonWalton-HiFi/min_threadpool_2
BUGZ-993: Bump minimum threadpool size to 2
2019-08-09 09:20:55 -07:00
Shannon Romano
183bd11054
Merge pull request #16033 from jherico/fix/vs2019
BUGZ-1187: Allow developers to bootstrap vcpkg via the traditional method
2019-08-09 09:14:33 -07:00
Shannon Romano
5e5c5a27ab
Merge pull request #16041 from Atlante45/fix/oom
BUGZ-830: Fix memory leak in the ESS
2019-08-09 09:03:56 -07:00
Anthony J. Thibault
733d7455f4 new seated talking anim 2019-08-09 08:52:38 -07:00
Brad Davis
c28d850514 BUGZ-1097: Fix invalid rendering of splash frame on AMD based macs 2019-08-09 08:13:20 -07:00
Anthony J. Thibault
b4869508a0 updated clap 2019-08-08 14:47:31 -07:00
Shannon Romano
9b4c1dbe0f
Merge pull request #16037 from huffman/fix/orbit-duplicate
BUGZ-1184: Fix create duplication key conflicting with camera orbit
2019-08-08 14:42:12 -07:00
sabrina-shanman
8347d9d23e Update LODManager setter in TabletLODTools.qml 2019-08-08 13:59:50 -07:00
Clement
29d017bb65 CR 2019-08-08 13:49:15 -07:00