Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
80402 commits 29 branches 0 tags 1.1 GiB
Commit graph

80402 commits

This branch
This branch
All branches
Author SHA1 Message Date
danteruiz
476b7605d5 working on ui pages 2019-08-28 20:18:51 -07:00
danteruiz
1689096967 working on launcher app 2019-08-28 14:24:13 -07:00
danteruiz
2a6252584f starting HFControls 2019-08-28 13:10:55 -07:00
danteruiz
bb5e62dafd update gitignore 2019-08-27 16:17:11 -07:00
danteruiz
6d62613888 fixing root.qml 2019-08-27 16:15:10 -07:00
danteruiz
96e0b0cf21 fixing up resources 2019-08-27 16:11:34 -07:00
danteruiz
d5bfe49cd0 get windows qt cmake working 2019-08-27 12:05:14 -07:00
danteruiz
0a2b546017 working on windows cmake version 2019-08-26 16:26:23 -07:00
danteruiz
06d3bb2a34 start qt launcher work 2019-08-26 15:19:23 -07:00
Zach Fox
83ef260941
Merge pull request #16093 from zfox23/emoteTweaks 
BUGZ-1346: Tons of changes to Emote/Emoji system
 2019-08-26 10:15:03 -07:00
Zach Fox
497edf6068 Add a comment 2019-08-26 09:03:10 -07:00
Zach Fox
701dd679c7 Change the icons' 2019-08-23 15:18:45 -07:00
Zach Fox
27574dd3f3 Prepare for new emote indicator icon 2019-08-23 14:48:49 -07:00
Zach Fox
860b5d0970
Merge pull request #16092 from RebeccaStankus/MuteIssues 
Fix for PTT not working
 2019-08-23 14:47:59 -07:00
Zach Fox
98626b564c Couple more changes 2019-08-23 14:40:39 -07:00
Zach Fox
dfcf70b9b5 Tons of Emote/Emoji changes 2019-08-23 14:14:53 -07:00
RebeccaStankus
f6a32b9318 Fix for PTT not working comments 2019-08-23 13:46:46 -07:00
RebeccaStankus
f109edbd48 Fix for PTT not working comments 2019-08-23 13:45:32 -07:00
RebeccaStankus
63038d12c2 Fix for PTT not working comments 2019-08-23 13:43:15 -07:00
Shannon Romano
264abe7d0c
Merge pull request #16046 from huffman/feat/mac-launcher-tags 
DEV-316: Add build tags to Mac launcher
 2019-08-23 13:41:52 -07:00
Shannon Romano
c31d463b6a
Merge pull request #16038 from huffman/feat/win-launcher-tags 
DEV-256: Add build tags to Windows launcher
 2019-08-23 13:40:38 -07:00
RebeccaStankus
85ee61af9d Fix for PTT not working 2019-08-23 13:35:58 -07:00
Andrew Meadows
b33e5a60c2
Merge pull request #16086 from AndrewMeadows/opaque-polylines 
BUGZ-1170: improved render bounding box for PolyLines; use opaque pipeline when possible
 2019-08-23 11:41:19 -07:00
Shannon Romano
af46a180ab
Merge pull request #16091 from luiscuenca/reactionsRefCountFix 
BUGZ-1265: Don't allow reactions refcount go bellow 0
 2019-08-23 10:57:56 -07:00
Shannon Romano
74363a4382
Merge pull request #16065 from luiscuenca/fixDuplicatedJoint 
BUGZ-186: Make sure joint names are unique
 2019-08-23 10:55:58 -07:00
Shannon Romano
86518d222d
Merge pull request #16089 from RebeccaStankus/MuteIssues 
Push To Talk Bugs 1207/1208
 2019-08-23 10:42:16 -07:00
Shannon Romano
e50081b54d
Merge pull request #16090 from jennaingersoll/api-docs 
Fix formatting in API docs (DOC-112, DOC-113, DOC-142, DOC-143)
 2019-08-23 10:11:24 -07:00
luiscuenca
19d85ba824
MyAvatar.endReaction return false when no reaction has been trigger previously 2019-08-23 09:07:27 -07:00
Ryan Huffman
cf64492185 Fix default_tag in win32 launcher not working 2019-08-23 08:47:35 -07:00
Ryan Huffman
328896b9ed Fix calls to setFailed in win32 launcher 2019-08-23 08:47:35 -07:00
Ryan Huffman
da1b2e9ec8 Add method for overriding builds API url in win32 launcher 2019-08-23 08:47:34 -07:00
luiscuenca
da9163616a
Don't allow reactions ref count got bellow 0 2019-08-23 08:46:59 -07:00
Ryan Huffman
83bc5e3fd6 Add build tags to Windows launcher 2019-08-23 08:44:37 -07:00
luiscuenca
07d17343bf
fix warnigns 2019-08-23 07:21:19 -07:00
Shannon Romano
4d71891763
Merge pull request #16072 from luiscuenca/improveSphereCollapsing 
BUGZ-1156: Improve sphere collapsing mode
 2019-08-22 16:10:53 -07:00
Andy Howell
f5767168ed
Merge pull request #16035 from MiladNazeri/emojiAppAdd 
Using my superpowers to get this in the build.
 2019-08-22 16:10:22 -07:00
Howard Stearns
26256c383a
Merge pull request #16081 from SimonWalton-HiFi/avatar-thrashing 
DEV-336: Fixes for avatar-verify failures with rapid avatar selection
 2019-08-22 15:58:24 -07:00
ingerjm0
7ffcee35dd Fix formatting in API docs (DOC-112, DOC-113, DOC-142, DOC-143) 2019-08-22 15:37:34 -07:00
Ryan Huffman
1eaba67f67 Remove use of build version in mac launcher settings 2019-08-22 15:07:12 -07:00
Zach Fox
fb95d1b2d9
Merge pull request #16088 from zfox23/clipPTT 
BUGZ-1327: Fix PTT icon when PTTing and clipping
 2019-08-22 14:02:08 -07:00
Zach Fox
44ac3f3a7a Don't use entity creation library (reduce risk); use remote URL for broadcast image entity URLs 2019-08-22 13:58:35 -07:00
RebeccaStankus
6e96b800b6 Engine handles turning PTT off if unmuting 2019-08-22 13:22:45 -07:00
luiscuenca
4b1b61ae5b
Keep new offset rotation method and resolve duplicates at the end 2019-08-22 13:16:32 -07:00
Zach Fox
7c4a0545c4 BUGZ-1327: Fix PTT icon when PTTing and clipping 2019-08-22 12:51:34 -07:00
Zach Fox
a086d6fe6d Fix triggered reactions not showing their icon in the emote indicator 2019-08-22 11:54:28 -07:00
Zach Fox
177590614e Fix emote bar always visible on MacOS; small logic cleanup 2019-08-22 11:44:09 -07:00
Shannon Romano
e328fc3766
Merge pull request #16087 from mattr1x/add-mac-user-agent-launcher 
Add platform to Mac Launcher's user-agent string
 2019-08-22 11:30:44 -07:00
Shannon Romano
36132677cd
Merge pull request #16083 from huffman/feat/win-launcher-useragent-version 
DEV-418: Add version to UserAgent on Win launcher
 2019-08-22 11:30:22 -07:00
Zach Fox
63d27fb002 Much smaller emoji wrt filesize; Fix emoji toolbar not sticking to window on MacOS 2019-08-22 11:00:15 -07:00
Zach Fox
330b8ceb91 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-22 10:24:00 -07:00