Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-06 04:40:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73313 commits 21 branches 0 tags 1.2 GiB
Commit graph

73313 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gondelman
312f336210
Merge pull request #14302 from SamGondelman/queryAACube 
Don't update QueryAACube in setParentID if _parentID didn't change
 2018-10-31 11:46:16 -07:00
Roxanne Skelly
b5a48d31b6 Fix code-review spacing issue 2018-10-31 10:18:04 -07:00
Roxanne Skelly
628ec8ec2b Removed QmlCommerce.cpp, Ledger.cpp changes as requested 2018-10-31 10:09:01 -07:00
Wayne Chen
67539bc87a Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-31 09:00:37 -07:00
NissimHadar
93cff8dfda Corrected indentation. 2018-10-31 08:48:42 -07:00
Wayne Chen
03c39eb92f more wip 2018-10-31 07:45:55 -07:00
Roxanne Skelly
e5f06690b5 Strip out references to 'my purchases' vs 'my items' code 2018-10-30 17:31:31 -07:00
sabrina-shanman
becee7f010 Re-name FBXGeometry to HFMGeometry and do the same for related classes 2018-10-30 17:28:42 -07:00
Roxanne Skelly
0e639f4e34 Merge branch 'oculus-store-commerce' of https://github.com/howard-stearns/hifi into oculus-store-commerce 2018-10-30 16:29:43 -07:00
Roxanne Skelly
91b199a456 Checkpoint Proofs Filter in Inventory 2018-10-30 16:29:20 -07:00
Zach Fox
b6344acc1d Big checkpoint. be aware - things may be broken 2018-10-30 15:08:13 -07:00
SamGondelman
e64a4d0536 try to fix unnecessary queryAACube updates 2018-10-30 12:47:44 -07:00
NissimHadar
959c544fcd Made path to VCPKG relative. 2018-10-30 12:05:41 -07:00
Wayne Chen
43b269b612 testing tablet implementation 2018-10-30 11:48:22 -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
Wayne Chen
8e4837f8c8 Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-10-30 10:23:25 -07:00
Wayne Chen
54fe9eec87 adding overlay 2018-10-30 10:19:11 -07:00
David Kelly
015b5fa681 Don't attempt purchase of sold out items 2018-10-30 08:01:22 -07:00
SamGondelman
df005eedbf fix shape not getting marked changed 2018-10-29 17:43:16 -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
Wayne Chen
ed847203ea wip for getting hmd overlay 2018-10-29 11:33:28 -07:00
Wayne Chen
6e0b89f0a6 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-29 08:48:02 -07:00
Wayne Chen
11dc82a5cf Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-10-29 08:47:25 -07:00
Wayne Chen
c4aabfda44 adding prototype functions 2018-10-29 08:47:09 -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
Wayne Chen
af04630642 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-26 17:53:13 -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
Wayne Chen
955b0a580e adding hooks for application for pause/resume 2018-10-25 17:25:44 -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
Wayne Chen
5e73fe3e41 more wip 2018-10-25 14:11:55 -07:00
John Conklin II
7227547b6a
Merge pull request #14279 from dback2/removeParticleExplorer 
Remove particle explorer
 2018-10-25 13:37:22 -07:00