Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 00:56:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73432 commits 76 branches 59 tags 1.2 GiB
Commit graph

73432 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
90e944f130 always zero velocity on near-grab release of non-dynamic 2018-10-30 16:20:33 -07:00
Zach Fox
b6344acc1d Big checkpoint. be aware - things may be broken 2018-10-30 15:08:13 -07:00
sam gateau
592c2b267d Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-30 15:07:20 -07:00
NissimHadar
418a578e28 Can start Interface 2018-10-30 13:02:13 -07:00
SamGondelman
e64a4d0536 try to fix unnecessary queryAACube updates 2018-10-30 12:47:44 -07:00
Roxanne Skelly
1dc96fec79 Implement CR comments for installer text logging 2018-10-30 12:13:46 -07:00
NissimHadar
959c544fcd Made path to VCPKG relative. 2018-10-30 12:05:41 -07:00
NissimHadar
67097194c3 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-10-30 11:36:14 -07:00
Sam Gondelman
2dc761a57a
Merge pull request #14295 from SamGondelman/shape 
Fix shape not getting marked changed
 2018-10-30 11:04:32 -07:00
Roxanne Skelly
d67598e540 Merge branch 'master' of https://github.com/highfidelity/hifi into SetupLogging 2018-10-30 10:03:05 -07:00
David Kelly
015b5fa681 Don't attempt purchase of sold out items 2018-10-30 08:01:22 -07:00
NissimHadar
1213f3f658 Can run the installer 2018-10-29 17:51:41 -07:00
SamGondelman
df005eedbf fix shape not getting marked changed 2018-10-29 17:43:16 -07:00
NissimHadar
98441b2328 WIP - installing High Fidelity from command line. 2018-10-29 15:49:46 -07:00
John Conklin II
db87fe9696
Merge pull request #14288 from luiscuenca/avatarTransitFreezeFix 
Fix avatars remain stuck in place for other users intermittently
 2018-10-29 15:03:43 -07:00
Zach Fox
d47fd44a47 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-29 14:57:23 -07:00
John Conklin II
e01401294f
Merge pull request #14286 from ctrlaltdavid/M17988 
Fix Interface eating memory when minimized
 2018-10-29 12:52:10 -07:00
luiscuenca
e49e9cdc56 Set avatar client sooner 2018-10-29 07:25:22 -07:00
luiscuenca
056fe338e1 Apply transit logic if avatar instance is client side 2018-10-27 07:15:31 -07:00
luiscuenca
767f4e9d6d Return server position 2018-10-26 17:16:43 -07:00
luiscuenca
62e4b3fead Avatar mixer gets the updated position 2018-10-26 16:02:17 -07:00
David Rowe
1cca975b37 Fix Interface eating memory when minimized 2018-10-27 11:40:02 +13:00
Sam Gateau
439452f9ee
Merge pull request #14123 from jherico/fix/mac_gl2 
Additional Mac OpenGL work
 2018-10-26 15:38:23 -07:00
Ryan Huffman
c6403a44cb
Merge pull request #14281 from dback2/collidesPropertyFix 
Fix Collides With subproperties
 2018-10-26 13:46:52 -07:00
John Conklin II
fa2fb3a87a
Merge pull request #14246 from sethalves/sync-grab-props 
keep userData and new grab properties in sync
 2018-10-26 11:52:47 -07:00
Brad Davis
a3a952265a Fix android crash 2018-10-26 11:23:30 -07:00
Brad Davis
36edb939c3 Try to fix android crash 2018-10-26 11:23:30 -07:00
Brad Davis
7ca8b54039 Fix crash on startup on windows / android 2018-10-26 11:23:30 -07:00
Brad Davis
9a30073f27 Only enable debug GL context on demand 2018-10-26 11:23:29 -07:00
Brad Davis
405ec228b8 Fix mac warning 2018-10-26 11:23:29 -07:00
Bradley Austin Davis
28b45ce1d9 Resolve compositing glitches 2018-10-26 11:23:29 -07:00
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