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

80640 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony Thibault
2857086861
Merge pull request #16136 from hyperlogic/feature/3x3-blend 
Directional Blending Support
 2019-09-06 11:10:56 -07:00
milad
b352d53083 removed space made on accident 2019-09-06 11:00:14 -07:00
Sam Gateau
bc0f719b71 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-06 10:58:35 -07:00
Sam Gateau
85c18f1033 Adding a clamp to 0 to the computed y coordinate while unpacking the normal map 2019-09-06 10:57:54 -07:00
milad
1d8bbc3529 removed startup time var 2019-09-06 10:55:35 -07:00
milad
1576a29916 toggled flag for discconecting from wearable signal 2019-09-06 10:53:17 -07:00
milad
120c678557 added a wearable check for avimojis on startup 2019-09-06 10:51:12 -07:00
Matt Hardcastle
b239ad1ae3 Support updater in Contents/{MacOS,Resources} 
Codesigning fails when binaries are in the `Resources` directory. This
change moves updater and ensures HQLauncher can handle the updater at
both paths.
 2019-09-06 10:37:24 -07:00
Shannon Romano
db0c2da516
Merge pull request #16142 from MattHardcastle/launcher-urldecode 
Percent decode URL from Thunder
 2019-09-06 10:34:52 -07:00
Sam Gateau
acf51ad217
Merge pull request #16137 from jherico/fix/bugz-1398 
BUGZ-1398: Tablet access to local HTML
 2019-09-06 09:59:22 -07:00
Anthony J. Thibault
aa848df227 warning fixes 2019-09-05 17:43:07 -07:00
dooglifeSF
b5d2675a05 Merge branch 'master' into Sitting_emote_variants 2019-09-05 16:45:24 -07:00
dooglifeSF
5061aca487 Update sitting_emote_raisehand03_all.fbx 2019-09-05 16:44:13 -07:00
Shannon Romano
5d316a9fd6
Merge pull request #16140 from jherico/fix/webrtc_debug_build 
Fix webrtc link errors in debug builds
 2019-09-05 16:09:26 -07:00
Matt Hardcastle
4e6198d784 Percent decode URL from Thunder 
URLs from Thunder's API may be percent encoded.
 2019-09-05 16:01:16 -07:00
dooglifeSF
9cfa4753d9 sitting emote acknowledge and dismiss added, also went through emote_agree set and pushed them per Josh feedback. Fixed point glitch stand/sit 2019-09-05 15:31:07 -07:00
Anthony J. Thibault
c35640f739 Warning fixes and small bug fix to anim stats 2019-09-05 14:54:19 -07:00
Shannon Romano
19c7502998
Merge pull request #16138 from MattHardcastle/check-zip-size 
Check macOS Launcher's zip size before unzipping
 2019-09-05 14:43:57 -07:00
Shannon Romano
b3c7ca6e8f
Merge pull request #16127 from amerhifi/master 
case DEV-492:  Ensure launcher cannot be pinned
 2019-09-05 14:29:38 -07:00
Brad Davis
7c84d897ba Fix webrtc link errors in debug builds 2019-09-05 14:16:52 -07:00
amerhifi
9e69b79e2a adding the space back 2019-09-05 13:41:51 -07:00
amerhifi
2a3b99daa6 removing flags 2019-09-05 13:40:29 -07:00
Matt Hardcastle
43237e1409 Check macOS Launcher's zip size before unzipping 
The Launcher can download an error page rather than the full Launcher.
When this happens, the error page file is passed directly to unzip,
which promptly fails with the following message:

  End-of-central-directory signature not found.  Either this file is not
  a zipfile, or it constitutes one disk of a multi-part archive.  In the
  latter case the central directory and zipfile comment will be found on
  the last disk(s) of this archive.
  unzip:  cannot find zipfile directory in one of NewHQLauncher.zip or
          NewHQLauncher.zip.zip, and cannot find NewHQLauncher.zip.ZIP, period.

This change improves the error message by checking the size of the
Launcher download and failing if the Launcher is smaller than the
smallest Launcher we've released. The smallest Launcher we've had is
308KB, so I picked 250KB as the limit because it's a nice rounder number
below that.
 2019-09-05 12:35:24 -07:00
Brad Davis
0511f87bad BUGZ-1398: Tablet access to local HTML https://youtu.be/7EWQOeQf32U 2019-09-05 11:43:43 -07:00
MiladNazeri
21b8e268c1
Merge pull request #16135 from MiladNazeri/bugz-1395/emoji-stuck-on-start 
[bugz-1415] :: Emoji App trying to shut down twice
 2019-09-05 11:14:11 -07:00
Anthony J. Thibault
29de8a8d9f remove ajt comment 2019-09-05 11:11:10 -07:00
Anthony J. Thibault
b6f28a6732 Switch additive animation deltas from a pre multiply to a post multiply. 2019-09-05 11:09:03 -07:00
Anthony J. Thibault
92df5cccdc AnimBlendDirectional node 2019-09-05 11:09:02 -07:00
Anthony J. Thibault
6274ab4aa7 3x3 blend wip 2019-09-05 11:09:00 -07:00
milad
531dceae4d changed status indicator to be similar to nametag and emoji 2019-09-05 10:29:25 -07:00
Shannon Romano
ef9b81ca0d
Merge pull request #16032 from sethalves/fix-polyvox-state-machine 
BUGZ-1176: rework polyvox state-machine
 2019-09-05 10:04:47 -07:00
Seth Alves
404b42c41e remove unneeded call to tellNeighborsToRecopyEdges 2019-09-05 08:04:09 -07:00
milad
57a309db53 small formatting changes 2019-09-04 20:58:20 -07:00
Seth Alves
d86944baf4 rework polyvox state-machine 2019-09-04 20:14:11 -07:00
milad
408656f6ec added line break 2019-09-04 17:06:00 -07:00
milad
c73ea11b37 lowecase object 2019-09-04 17:00:30 -07:00
milad
3f2d2996a0 removed comment region sections 2019-09-04 16:59:14 -07:00
Shannon Romano
96f6793a87
Merge pull request #16118 from hyperlogic/feature/aim-offset-blend 
Additive animation support
 2019-09-04 16:55:50 -07:00
milad
1a8d005220 Merge branch 'master' of github.com:highfidelity/hifi into bugz-1395/emoji-stuck-on-start 2019-09-04 16:49:58 -07:00
milad
252e8a2ed6 removed commented out code 2019-09-04 16:49:46 -07:00
milad
79b7271729 removed startup/unload apis from the 3 main modules 2019-09-04 16:48:24 -07:00
milad
d316f014eb fixed double scriptEnding being called 2019-09-04 15:51:07 -07:00
jennaingersoll
afad148894
Merge pull request #16134 from ctrlaltdavid/DOC-134 
DOC-134: Fix some miscellaneous JSDoc issues
 2019-09-04 15:21:14 -07:00
Zach Fox
df3f7fcb72
Merge pull request #16132 from MiladNazeri/dev-486/emote-ui-toggle-fix 
Dev-486 : emote indicator should still be showing
 2019-09-04 13:11:24 -07:00
milad
5fdcf0ecaf updated setting name and changed default value to true for show tray 2019-09-04 12:59:17 -07:00
Shannon Romano
6fda12583b
Merge pull request #16128 from MattHardcastle/err-handling 
Error handling for Launcher's update
 2019-09-04 09:53:16 -07:00
Shannon Romano
ffc6d4a1e2
Merge pull request #16131 from samcake/yellow 
BUGZ-1114: Fixing Luci issues related to zone not rendering and other minor clean up
 2019-09-04 09:43:55 -07:00
Shannon Romano
24faa4a7cb
Merge pull request #16124 from MattHardcastle/call-interface-highfidelity 
Call Interface "High Fidelity" on macOS
 2019-09-04 09:34:35 -07:00
David Rowe
672e61c49d Fix typo in Entities.EntityProperties-Material example 2019-09-04 21:06:49 +12:00
David Rowe
6474705ca2 Reformat "supported script types" in Entities and Scripts signals 2019-09-04 21:06:30 +12:00