Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 18:10:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73290 commits 25 branches 0 tags 1.1 GiB
Commit graph

73290 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bradley Austin Davis
95d160a170 Working on mac GL issues 2018-10-26 11:23:29 -07:00
Sam Gondelman
7339a43536
Merge pull request #14278 from SamGondelman/macbs 
Mac: Possibly fix a completely different blendshapes bug
 2018-10-26 09:26:30 -07:00
NissimHadar
28338a8307 Minor cleanup. 2018-10-25 17:40:39 -07:00
NissimHadar
e931041501 Corrected #ifdef 2018-10-25 17:39:06 -07:00
NissimHadar
c3b1f8c332 Should be able to download Mac installer 2018-10-25 17:22:45 -07:00
NissimHadar
7bf6e9cda9 Simplified, and seems to work 2018-10-25 16:19:25 -07:00
NissimHadar
d2e31b3f67 Use fromPercentEncoding to download URL (attempting to get download to run on Mac). 2018-10-25 15:18:29 -07:00
NissimHadar
47ce1573eb Corrected use of _snapshotFolder. 2018-10-25 15:17:07 -07:00
David Back
13acfb325a fix collides with properties, fix ordering for start/finish/spread properties 2018-10-25 15:06:15 -07:00
John Conklin II
2dfd63f4e7
Merge pull request #14229 from thoys/feat/create/tooltips 
MS19052 [CreateApp]: Tooltips
 2018-10-25 14:52:16 -07:00
SamGondelman
7dff015585 maybe? 2018-10-25 14:40:58 -07:00
John Conklin II
7227547b6a
Merge pull request #14279 from dback2/removeParticleExplorer 
Remove particle explorer
 2018-10-25 13:37:22 -07:00
NissimHadar
028d1cf237 Minor cleanup. 2018-10-25 13:36:15 -07:00
Howard Stearns
9095df4641 fix getting inventory back after showing my items 2018-10-25 12:59:49 -07:00
Howard Stearns
936c2b2cab don't show price for free items 2018-10-25 12:46:30 -07:00
Jeff Clinton
946d68af6a
Merge pull request #14262 from SamGondelman/particleLoad 
Fix and expose Particle Entity emitRadiusStart
 2018-10-25 12:41:02 -07:00
Howard Stearns
3503d79b05 missed a buy/purchase 2018-10-25 12:39:33 -07:00
Howard Stearns
e3b1e14db6 nix "buy" where possible. 2018-10-25 12:37:08 -07:00
Howard Stearns
8b79795247 nix the word "purchase" where possible 2018-10-25 12:31:01 -07:00
John Conklin II
2eb801bdc6
Merge pull request #14035 from SimonWalton-HiFi/avatar-mixer-improvements 
Further avatar-mixer improvements
 2018-10-25 12:25:32 -07:00
David Back
eb347c5596 remove particle explorer 2018-10-25 11:30:18 -07:00
Howard Stearns
6284c902be use the switch 2018-10-25 11:29:10 -07:00
Howard Stearns
c85dbb8233 limitedCommerce switch 2018-10-25 11:25:56 -07:00
SamGondelman
faff5f11e8 Merge remote-tracking branch 'upstream/master' into particleLoad 2018-10-25 10:56:11 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter 
Quality Improvements to Avatars driven by Vive Trackers
 2018-10-25 08:51:59 -07:00
Jeff Clinton
736dc47934
Merge pull request #14274 from huffman/feat/silence-defaults-in-script-log 
Add optional default scripts log suppression to the script debug window
 2018-10-25 08:50:25 -07:00
Seth Alves
b8f1c96685 rats 2018-10-25 07:47:16 -07:00
Seth Alves
b93807b1a7 remove conversion code from equipEntity.js 2018-10-25 07:47:16 -07:00
Seth Alves
c5aafd4644 fix spatialKey conversion 2018-10-25 07:47:16 -07:00
Seth Alves
387a8ce933 fix QJsonArray handling 2018-10-25 07:47:15 -07:00
Seth Alves
252e504ab9 attempt to keep userData and new grab properties in sync 2018-10-25 07:47:15 -07:00
Seth Alves
b9f8c59f61
Merge pull request #13904 from alexiamandeville/menu-updates 
Resorting Developer menu organization
 2018-10-24 19:41:22 -07:00
Sam Gateau
6afd9a1dca
Merge pull request #14269 from SamGondelman/bs 
Possible fix for yet another blendshape crash
 2018-10-24 17:51:23 -07:00
Thijs Wenker
13cad17793 better style js attributes 2018-10-25 02:46:16 +02:00
Thijs Wenker
bb7d1f8afb fix broken and missing tooltips 2018-10-25 02:46:16 +02:00
Thijs Wenker
83051940a8 Fix QA feedback 2018-10-25 02:46:15 +02:00
Thijs Wenker
358b0b76d1 tooltip delay of 500ms 2018-10-25 02:46:15 +02:00
Thijs Wenker
a3b874f9aa property tooltips 2018-10-25 02:46:14 +02:00
John Conklin II
7db7131ef4
Merge pull request #14172 from dback2/entityPropertiesRefactor 
Entity properties refactor / reorder and merge particle explorer into properties
 2018-10-24 17:39:17 -07:00
Jeff Clinton
67fe43ebb1
Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars 
Small avatars now have a minimum jump height of 0.25 meters
 2018-10-24 17:08:28 -07:00
Ryan Huffman
5c5a5c9cd2 Add optional default scripts log suppression 2018-10-24 16:23:10 -07:00
NissimHadar
14216bdeca Starting v7.0 
Increased a button size for Mac.
 2018-10-24 16:22:12 -07:00
NissimHadar
68eadc4111 Merge branch 'MAC' of github.com:NissimHadar/hifi into MAC 2018-10-24 15:58:00 -07:00
NissimHadar
34a03bfc99 Python executable for MAC is python 2018-10-24 15:57:06 -07:00
NissimHadar
936c3beea0 Exit if Python executable not found 2018-10-24 15:56:29 -07:00
NissimHadar
e5f3bae746 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-10-24 15:51:35 -07:00
David Back
a88678fb70 fix bad css merge, add particle property debounce 2018-10-24 15:07:47 -07:00
Seth Alves
4d34b12f06 rather than do checkDevices to find new audio devices every 2 seconds, do each check 2 seconds after the previous one has completed. This is done to avoid swamping the thread pool when the check takes a long time 2018-10-24 14:00:23 -07:00
Simon Walton
b6f259fc42 Fix incorrect merge-resolution 2018-10-24 13:17:45 -07:00
luiscuenca
b8cd5045c7 Extra joints on soft entities keep their local transform 2018-10-24 12:54:09 -07:00