Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:33:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80241 commits 71 branches 56 tags 1.2 GiB
Commit graph

80241 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Shannon Romano
d9f78499ef
Merge pull request #16053 from samcake/toulouse 
BUGZ-1173, BUGZ-1175: On Windows, Fix black edges on whiteboard lines in Forward and more issues in GL41Backend
 2019-08-15 09:34:03 -07:00
Brad Hefta-Gaub
1e5c81c251
Merge pull request #16058 from jherico/fix/bugz-1119 
BUGZ-1119: workaround for race condition crash in QML rendering
 2019-08-15 09:32:31 -07:00
Brad Hefta-Gaub
95f3fcbae2
Merge pull request #16060 from samcake/yellow 
BUGZ-1081: Put Macs into "Low" rendering tier if INtel GPU
 2019-08-15 09:31:30 -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
Sam Gateau
eb24667218 Remove useless variable 2019-08-14 11:54:39 -07:00
Sam Gateau
a5e2cacb98 Apply the new tiering rule for macos: if intel gpu go low, else stick to mid 2019-08-14 11:45:27 -07:00
Sam Gateau
f4c33d8392 Refining the look of the enable button of the TaskPropView 2019-08-14 11:33:30 -07:00
Sam Gateau
5e57e53db2 Address errors sent from running the ENgine Inspector.js 2019-08-14 11:15:52 -07:00
Sam Gateau
99f62f61a9 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-08-14 10:37:47 -07:00
Sam Gateau
44a3deacb1 Merge branch 'yellow' of github.com:samcake/hifi into yellow 2019-08-14 10:37:30 -07:00
Sam Gateau
859016bf37 Addressing review comments 2019-08-14 10:28:42 -07:00
luiscuenca
02e730a4d9
fix size_t warning 2019-08-14 08:08:32 -07:00
Sam Gateau
5c085bd08d CLean the code of the task::COnfig changes 2019-08-13 18:58:35 -07:00
Sam Gateau
4a93b23d83 Address the procedural to populate all reflection versions with user uniforms bindings and make EnigneInspector works correctly 2019-08-13 18:47:57 -07:00
luiscuenca
1570c59a45
Allow collapsing of all multi spheres 2019-08-13 16:06:44 -07:00
Brad Davis
3e862950a8 BUGZ-1119: workaround for race condition crash in QML rendering 2019-08-13 15:47:59 -07:00
Sam Gateau
224e9590ec avoid using explicit dialects when we want just a default one 2019-08-13 15:45:24 -07:00
Sam Gateau
9a1e1a001a Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-13 10:00:59 -07:00
Sam Gateau
0b470b9ab8 Fixing the bad location assignment on gl41 on windows with Austin's help 2019-08-13 00:22:17 -07:00