Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
68048 commits 2 branches 0 tags 1.1 GiB
Commit graph

68048 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
931c8f5abe
Merge pull request #13110 from ctrlaltdavid/21866 
Don't unnecessarily scroll HTML content when keyboard is raised
 2018-05-15 11:00:38 -07:00
Seth Alves
79b5882c73 quiet compiler when building with clang on Linux 2018-05-15 11:00:08 -07:00
Seth Alves
78a8e8e500 quiet asan warning 2018-05-15 11:00:08 -07:00
Seth Alves
24404afe26
Merge pull request #13115 from sethalves/fix-autoAdjustLOD-asan 
fix divide-by-zero asan warning in LODManager::autoAdjustLOD
 2018-05-15 10:58:00 -07:00
Seth Alves
6da59d15e5
Merge pull request #13167 from dback2/lowercaseUnequip 
Desktop equip: fix unequipping with capital U
 2018-05-15 10:55:19 -07:00
John Conklin II
574a52fdbe
Merge pull request #13154 from NissimHadar/perfTest_1 
Added method to test namespace to save JSON object to a file.
 2018-05-15 10:30:34 -07:00
John Conklin II
e9cb46a2a5
Merge pull request #13169 from hyperlogic/bug-fix/remove-unused-menu-item 
OpenVR: Remove reference to HMD Standing Mode menu item
 2018-05-15 10:30:00 -07:00
John Conklin II
a76be78386
Merge pull request #13163 from sethalves/fix-near-grab-to-hips 
fix near-grab attaching entity to hips
 2018-05-15 10:28:36 -07:00
Howard Stearns
39ccfc86ef
Merge pull request #13168 from zfox23/MS_15090 
MS15090: Fix gifting when running marketplaces.js separately
 2018-05-15 10:12:29 -07:00
David Back
623410a0aa Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-15 09:53:24 -07:00
Zach Fox
906678123c Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-15 09:43:43 -07:00
vladest
a6ef459723 Open browser within Interface 2018-05-15 16:07:32 +02:00
vladest
fee3cc0aca Implemented backend for About dialog 2018-05-15 15:49:20 +02:00
Olivier Prat
d10b5a16f2 Turned off jitter with FXAA 2018-05-15 15:09:02 +02:00
Olivier Prat
bed7752a1a Fixed bug with highlighting and TAA 2018-05-15 12:27:04 +02:00
David Rowe
1ca6bd2f0b location getter/setter JSDoc 2018-05-15 17:37:45 +12:00
David Rowe
b7a0ff523a LaserPointers API JSDoc stubs 2018-05-15 17:36:23 +12:00
David Rowe
8e9799b80f Pointers API JSDoc fix up 2018-05-15 16:36:42 +12:00
Thijs Wenker
b20741baba web-scripting globals 2018-05-15 06:36:01 +02:00
vladest
58f04121b7 Correct link colors 2018-05-15 06:22:10 +02:00
Thijs Wenker
82befc8862 ignore 0.5 and 2 as magic-numbers 2018-05-15 06:21:26 +02:00
Vladyslav Stelmakhovskyi
3f0688db41
Merge pull request #2 from druiz17/menu-updates 
fixinig the controller settings page and have edit > entities on by default
 2018-05-15 06:16:59 +02:00
Dante Ruiz
82422edb59 fixinig the controller settings page and have menu option on by default 2018-05-14 18:51:39 -07:00
Zach Fox
a54ce96ac2 Clement's CR 2018-05-14 17:46:58 -07:00
Zach Fox
e607c68bea Thanks Mukul! 2018-05-14 16:48:40 -07:00
David Rowe
9040e45be7 RayPick API JSDoc stubs 2018-05-15 11:43:49 +12:00
NissimHadar
d4d2f3c957 Moved ownership of test location into the Test Scripting class. 2018-05-14 16:32:04 -07:00
NissimHadar
8e3844a235 Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1 2018-05-14 16:23:36 -07:00
David Rowe
36752ee701 PickType API JSDoc fix up 2018-05-15 11:23:29 +12:00
David Rowe
3fb6fd1afb Picks API JSDoc stubs 2018-05-15 11:22:47 +12:00
Zach Fox
e15a800639
Merge pull request #13166 from zfox23/showInvalidItemsInPurchases 
Show invalidated items in My Purchases
 2018-05-14 15:42:29 -07:00
David Rowe
8ea3a733ca Resource API JSDoc stub 2018-05-15 10:32:36 +12:00
Zach Fox
0c76659324 Starting changes per Mukul! 2018-05-14 15:28:53 -07:00
Simon Walton
454978a9c2 Add more locking of _conicalViews vector 2018-05-14 15:15:58 -07:00
Zach Fox
43254e2981 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-14 15:12:44 -07:00
Howard Stearns
d7121265d0
Merge pull request #13150 from howard-stearns/fix-lastEdited-vs-pal 
fix lastEdited vs pal
 2018-05-14 15:12:07 -07:00
Thijs Wenker
50f76dd4df added more missing globals 2018-05-15 00:11:34 +02:00
David Rowe
a1de44310f tabletInterface API JSDoc 2018-05-15 10:02:38 +12:00
vladest
2a3004079e About UI 2018-05-14 23:22:06 +02:00
Anthony J. Thibault
ed726c9d77 OpenVR: Remove reference to HMD Standing Mode menu item 
This menu item has not existed for over a year.
I was sometimes seeing a crash on startup when the display plugin
attempted to reference this menu item.
 2018-05-14 13:51:13 -07:00
John Conklin II
c57b0a957d
Merge pull request #13138 from AndrewMeadows/avoid-div-by-zero 
avoid div by zero when measuring RigidBody effective acceleration
 2018-05-14 13:41:08 -07:00
Zach Fox
83cae54601 Show 'invalidated' label for valid = false 2018-05-14 13:34:20 -07:00
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