Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 13:20:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67903 commits 25 branches 0 tags 1.1 GiB
Commit graph

67903 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
fbec285923 Merge branch 'master' of github.com:highfidelity/hifi into showInvalidItemsInPurchases 2018-05-14 13:17:46 -07:00
Zach Fox
a881d07e59 MS15090: Fix gifting when running marketplaces.js separately 2018-05-14 13:12:58 -07:00
Sam Gateau
aa75af5ca4
Merge pull request #12814 from Zvork/shadow 
Shadow bug fix : incorrect shadow map far plane when casting shadow on non-'shadow casters'
 2018-05-14 13:00:15 -07:00
David Back
ac78e14585 fix unequipping with capital U 2018-05-14 11:44:25 -07:00
Cristian Luis Duarte
e7abf3c7be Android - Display Names - Use my avatar uuid directly when finding ray intersection 2018-05-14 15:26:57 -03:00
Thijs Wenker
20fb9034f8 no magic numbers, except -1, 0, 1 2018-05-14 20:11:55 +02:00
NissimHadar
b5096758fb Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1 2018-05-14 10:44:57 -07:00
Cristian Luis Duarte
97a493d113 Android - Delay workaround to avoid joystick/controls issues 2018-05-14 14:41:31 -03:00
Sam Gateau
d57ddbd3bf
Merge pull request #13139 from NissimHadar/missingImagesMDfiles 
Autotester: Now remembers the previous folder.
 2018-05-14 10:40:00 -07:00
NissimHadar
5f219e27f7 Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1 2018-05-14 10:35:48 -07:00
Andrew Meadows
a30e06d594 don't blend avatar position when far from target 2018-05-14 09:58:16 -07:00
Zach Fox
2a1c2ba7b1 PurchasedItem logic 2018-05-14 09:54:05 -07:00
Zach Fox
81ebb681bb Show invalidated items in My Purchases 2018-05-14 09:35:34 -07:00
NissimHadar
a9a783588b Fixed typo. 2018-05-14 09:25:17 -07:00
NissimHadar
e69871f499 Merge branch 'master' of github.com:highfidelity/hifi into missingImagesMDfiles 2018-05-14 09:23:38 -07:00
David Rowe
77021f3236 Fix up Stats JSDoc 2018-05-14 17:32:18 +12:00
David Rowe
d0596f8205 Fix Wallet JSDoc stubs 2018-05-14 10:43:55 +12:00
David Rowe
c97d7c9d73 Expand and fix ToolbarProxy and ToolbarButtonProxy JSDoc stubs 2018-05-14 10:43:38 +12:00
David Rowe
71355840b9 Expand OverlayWindow and OverlayWebWindow JSDoc stubs 2018-05-14 09:57:35 +12:00
David Rowe
cad5b3fb15 Expand AudioEffectOptions JSDoc stubs 2018-05-14 09:28:50 +12:00
David Rowe
5378d64913 Remove erroneously added function declarations 2018-05-13 18:06:30 +12:00
David Rowe
9fdce4df65 OverlayWindow and OverlayWebWindow API JSDoc stubs 2018-05-13 16:38:38 +12:00
David Rowe
7cef329939 Render API JSDoc stubs 2018-05-13 11:53:57 +12:00
David Rowe
176dbb5557 Wallet API JSDoc stubs 2018-05-13 11:02:09 +12:00
David Rowe
46ebb0457e Toolbars API JSDoc stubs 2018-05-13 10:56:21 +12:00
David Rowe
fb1f7fea90 Steam API JSDoc stubs 2018-05-13 10:32:46 +12:00
David Rowe
81a621890a Stats API JSDoc stubs 2018-05-12 18:01:55 +12:00
David Rowe
74617822fa Snapshot API JSDoc stubs 2018-05-12 16:32:33 +12:00
David Rowe
b445371ad8 Resources API JSDoc stubs 2018-05-12 16:24:34 +12:00
David Rowe
11f984f05b OffscreenFlags API JSDoc stubs 2018-05-12 15:08:41 +12:00
David Rowe
841161068c Midi API JSDoc stubs 2018-05-12 15:01:52 +12:00
David Rowe
6e1a091447 Mat4 API JSDoc stubs 2018-05-12 14:44:38 +12:00
David Rowe
bf7863ad10 LocationBookmarks API JSDoc stubs 2018-05-12 14:23:03 +12:00
Cristian Luis Duarte
aaa6038d28 Prevent calling ending on displayNames if was never started 2018-05-11 22:27:58 -03:00
Cristian Luis Duarte
3fd8a02375 Prevent this name implementation to appear in radar mode 2018-05-11 21:58:12 -03:00
David Rowe
a2bb9de441 Graphics API JSDoc stubs 2018-05-12 12:53:43 +12:00
Cristian Luis Duarte
9e9e1092d6 Add Opaques tasks into RenderForwardTask 2018-05-11 21:37:28 -03:00
Cristian Luis Duarte
d39f7f7a58 Simplified avatar touch code + Fix Typo + Add my avatar to the exclusion list + Explain mouse events 2018-05-11 21:27:42 -03:00
Simon Walton
9bb966dd1d Push down OctreeQueryNode lock to OctreeQuery and use for conical views 
Possibly related to
https://highfidelity.manuscript.com/f/cases/14165/entity-server-doesn-t-always-relay-added-entities-to-clients
 2018-05-11 17:12:53 -07:00
Seth Alves
898dec29cb don't cache value of getControllerJointIndex at startup, because the script may run before the data is available. Instead, refresh the data every few seconds 2018-05-11 17:07:51 -07:00
Andrew Meadows
6de175e794 avatars collide again 2018-05-11 17:01:48 -07:00
David Rowe
6d000f3362 JSDoc parameter for AudioEffectOptions constructor 2018-05-12 11:41:42 +12:00
Cristian Luis Duarte
f97155b6cd Revert virtualpad code. It works on Pixel XL 2018-05-11 20:34:43 -03:00
Cristian Luis Duarte
3f49046f1c Merge remote-tracking branch 'cristo86/android_places_goto' into android_places_goto 2018-05-11 20:33:23 -03:00
MiladNazeri
ea26512793
Merge pull request #13147 from ctrlaltdavid/21872-a 
Fix JSDoc function definitions specifying properties instead of params
 2018-05-11 16:20:06 -07:00
David Rowe
cf9053c873 Merge branch 'master' into 21872-b 2018-05-12 10:50:31 +12:00
Gabriel Calero
0f8c666647 Trying to fix virtualpad textures corruption 2018-05-11 19:50:00 -03:00
Seth Alves
ca56449c1d
Merge pull request #13159 from sethalves/fix-action-assert 
don't assert when unserializing a 'spring' action
 2018-05-11 15:15:51 -07:00
Cristian Luis Duarte
e3d7d65186 Merge remote-tracking branch 'origin/master' into android_avatar_name 2018-05-11 18:48:34 -03:00
Gabriel Calero
9b5da09dc7 Fix connection issue syncing two AccountManagers 2018-05-11 18:08:56 -03:00