Commit graph

80273 commits

Author SHA1 Message Date
Zach Fox
14a04dfb1a Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-19 13:52:35 -07:00
RebeccaStankus
e690d4f7ef Limited distance to rez a point reticle 2019-08-19 13:40:50 -07:00
RebeccaStankus
4787785660 first version of pointing reticle 2019-08-19 13:19:01 -07:00
Zach Fox
072261f551
Merge pull request #16074 from zfox23/helpQuickFixes
BUGZ-1295: Fix typo in Help > Controls > Turn Right
2019-08-19 13:15:10 -07:00
Zach Fox
36dffb7dc8
Merge pull request #16073 from zfox23/micIconFix
Fix some engine bugs that fix muted state in all UIs including simplifiedUI
2019-08-19 13:09:43 -07:00
Zach Fox
35a2cb7f27 BUGZ-1295: Fix typo in Help > Controls > Turn Right 2019-08-19 13:08:42 -07:00
Zach Fox
05abff1c0b
Merge pull request #16071 from zfox23/helpApp1
Help App: Phase 1
2019-08-19 11:16:44 -07:00
Zach Fox
ca2cdfc533 Fix some engine bugs that fix muted state in all UIs including simplifiedUI 2019-08-19 11:13:11 -07:00
Zach Fox
42705c2fea
Combine conditional statements 2019-08-19 11:04:54 -07:00
Zach Fox
2b86947d4a Mipmap images; better padding 2019-08-19 10:32:08 -07:00
RebeccaStankus
44d0e0ba1a Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-19 09:16:19 -07:00
RebeccaStankus
0699433df8 Emoji app updates emoteIndicator 2019-08-16 16:34:08 -07:00
Zach Fox
3de9f44bf3 It's working 2019-08-16 16:00:30 -07:00
Zach Fox
4c006c50aa Controls almost done 2019-08-16 15:53:30 -07:00
Zach Fox
3b138fe031
Merge pull request #16067 from zfox23/fixMutedBanner
Fix BUGZ-1263 and probably BUGZ-1273: Fix input device muted banner
2019-08-16 14:57:42 -07:00
Zach Fox
30d552919a Merge branch 'master' of github.com:highfidelity/hifi into helpApp1 2019-08-16 14:06:58 -07:00
Zach Fox
a274e5c2b1 Fix BUGZ-1263 and probably BUGZ-1273: Fix input device muted banner 2019-08-16 12:31:50 -07:00
Zach Fox
301dca6937 Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd 2019-08-16 12:14:52 -07:00
Zach Fox
c13697803d Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-16 12:14:44 -07:00
RebeccaStankus
18a9f3fbfb Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd 2019-08-16 12:09:17 -07:00
Zach Fox
4ac0c5902d 52px emojis and custom emoji 2019-08-16 12:08:30 -07:00
RebeccaStankus
2357934d49 Working tooltips 2019-08-16 12:08:26 -07:00
Howard Stearns
65ee21bb01
Merge pull request #16063 from Atlante45/fix/requesjs
BUGZ-1242: Fix linux specific script engine crash
2019-08-16 11:52:14 -07:00
Simon Walton
85da916a3b
Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown
BUGZ-984: Wait for client entity-scripts to unload when shutting down
2019-08-16 10:12:38 -07:00
Zach Fox
b06b0b51df Mipmap the emoteIndicator Image 2019-08-16 10:07:22 -07:00
Zach Fox
92c5ca2d75 Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd 2019-08-16 09:58:44 -07:00
RebeccaStankus
73941f1ece Fixed bug with emote indicator icon not restoring 2019-08-16 09:46:46 -07:00
RebeccaStankus
c64da85344 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-16 09:11:03 -07:00
RebeccaStankus
a06cb85f9e Indicator image swapping 2019-08-15 17:20:27 -07:00
Zach Fox
6176214d45 Remove extra log 2019-08-15 17:00:59 -07:00
Zach Fox
a053f9ed9e Impelement settingChanged; clean up some emoteIndicatorVisible code 2019-08-15 17:00:27 -07:00
RebeccaStankus
876ae771d4 Tray buttons swap color on hover 2019-08-15 16:44:50 -07:00
Zach Fox
98eff6ebb6 Mipmap the emoji bar images 2019-08-15 16:32:59 -07:00
RebeccaStankus
64dcb48925 Removed extra file, moved qml images 2019-08-15 16:31:37 -07:00
RebeccaStankus
f93d754f15 Button label characters are now images 2019-08-15 16:25:25 -07:00
RebeccaStankus
2fc603b85e Replacing button label characters with images 2019-08-15 15:35:41 -07:00
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
Clement
5be1cfcb36 Fix linux specific script engine crash 2019-08-15 13:07:43 -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
Anthony Thibault
4d2e7eaaba
Merge pull request #16059 from luiscuenca/fixMultisphereCrash
BUGZ-1156: Allow collapsing of all multi spheres
2019-08-15 10:40:29 -07:00
Zach Fox
2c604d2c5b Simpler code! 2019-08-15 09:58:45 -07:00
Brad Hefta-Gaub
b0b406adda
Merge pull request #16015 from HifiExperiments/renderUpdate
BUGZ-902: Drastically reduce locking and branching necessary for render updates
2019-08-15 09:35:17 -07:00