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
73459 commits 29 branches 0 tags 1.1 GiB
Commit graph

73459 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
a1276ba899 Don't poll for history notifs if limitedCommerce is true 2018-10-31 13:31:29 -07:00
SamGondelman
c4c4d2c98d possibly fix mac issues 2018-10-31 13:28:07 -07:00
Zach Fox
efcda129b7 Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce 2018-10-31 13:24:06 -07:00
Zach Fox
448be8847f Notifications are working! 2018-10-31 13:23:58 -07:00
SamGondelman
8633dc0f66 disable interstitial on android 2018-10-31 12:34:20 -07:00
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
Dante Ruiz
b3539b101b faster loading bar interpolation once physics is enabled 2018-10-31 11:33:53 -07:00
Roxanne Skelly
2482bb9731 Add logging for install options 2018-10-31 11:07:26 -07:00
Roxanne Skelly
35eb1e5156 Merge branch 'master' of https://github.com/highfidelity/hifi into SetupLogging 2018-10-31 10:38:43 -07:00
Thijs Wenker
92888e9d3e tooltip CR changes 2018-10-31 18:26:23 +01:00
Andrew Meadows
225e8e0556 always zero velocity on far-grab release of non-dynamic 2018-10-31 10:20:21 -07:00
Roxanne Skelly
b5a48d31b6 Fix code-review spacing issue 2018-10-31 10:18:04 -07:00
Dante Ruiz
0279eef3a4 improving interstitial loading bar 2018-10-31 10:13:32 -07:00
Roxanne Skelly
628ec8ec2b Removed QmlCommerce.cpp, Ledger.cpp changes as requested 2018-10-31 10:09:01 -07:00
NissimHadar
93cff8dfda Corrected indentation. 2018-10-31 08:48:42 -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
Andrew Meadows
90e944f130 always zero velocity on near-grab release of non-dynamic 2018-10-30 16:20:33 -07:00
Cristian Luis Duarte
bc7e49482a Add Android for the condition of _meshBlendshapeBuffer usage 2018-10-30 19:44:39 -03: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
SamGondelman
e64a4d0536 try to fix unnecessary queryAACube updates 2018-10-30 12:47:44 -07:00
Cristian Luis Duarte
a09b1adb6c Android temporal change - Bring back GLESBackend TEX_UNIT constants 2018-10-30 16:45:25 -03: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
SamGondelman
df005eedbf fix shape not getting marked changed 2018-10-29 17:43:16 -07:00
Cristian Luis Duarte
f00f1931f3 Merge branch 'master' into gles_use_tbo_no_ssbo 2018-10-29 20:06:32 -03: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
Gabriel Calero
a1221ebd69 Add Keep me logged in option 2018-10-26 17:17:03 -03: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