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

68034 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Conklin II
bb7d8463fc
Merge pull request #13177 from highfidelity/RC67.2 
Beta Release 67.2 - branched at Developer Release 8265
 2018-05-17 10:27:40 -07:00
Gabriel Calero
e10b716507 Revert audio fix 2018-05-17 14:26:36 -03:00
Gabriel Calero
5a73da6fdf Bugfix: stop audio when app starts 2018-05-17 14:05:49 -03:00
David Back
900b373c96 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-17 09:04:28 -07:00
Liv Erickson
10f48bef2f Merge branch 'master' of github.com:highfidelity/hifi into clone-server 2018-05-17 08:59:52 -07:00
Gabriel Calero
96da032b16 Add missing js to haptic feedback change 2018-05-17 11:49:44 -03:00
Gabriel Calero
8741c5e6a4 Make haptic pulse duration configurable in VirtualPadDevice 2018-05-17 11:37:13 -03:00
vladest
95cd9476c3 Fixed modality in Desktop 2018-05-17 16:11:28 +02:00
David Rowe
d20cd6ad44 Add missing JSDoc of parameter in takeSecondaryCamera360Snapshot() 2018-05-17 20:25:25 +12:00
David Rowe
6db4dd8673 Merge branch 'master' into 21872-b 
# Conflicts:
#	interface/src/ui/Snapshot.h
 2018-05-17 20:11:14 +12:00
David Rowe
145d73aa76 OverlayWebWindow JSDoc fixes 2018-05-17 19:18:00 +12:00
David Rowe
6c3174ccf1 Make particle / light icon translate x-z when inside bounding box 2018-05-17 17:04:12 +12:00
David Rowe
801a4b9aba Make laser click in sky deselect entity 2018-05-17 15:09:23 +12:00
John Conklin II
1cba2edb03
Merge pull request #13185 from samcake/rc67.2-taaOn 
Rc67.2 Provide a toggle switch for TAA in the menu developer/render to opt-out
 2018-05-16 16:46:52 -07:00
Gabriel Calero
65a9b98b97 Use android.os.Vibrator to perform haptic feedback in Android 2018-05-16 20:07:10 -03:00
Dante Ruiz
c4c4490bc4
Merge pull request #7 from druiz17/menu-updates 
remove option for mouse sensivtity
 2018-05-16 15:48:26 -07:00
Dante Ruiz
2a6204ca8d remove option for mouse sensivtity 2018-05-16 15:47:55 -07:00
John Conklin II
4ce4afe0b1
Merge pull request #13180 from Cristo86/android_no_joystick_fix 
Fix Joystick/Control not showing up in Samsung after typing address (Android)
 2018-05-16 15:41:24 -07:00
samcake
ade1d6c056 use the correct call to toggle the debugFXAA on the AaConfig 2018-05-16 15:37:13 -07:00
Liv Erickson
ef6bf54f54 Merge branch 'cloneables' of https://github.com/dback2/hifi into clone-server 2018-05-16 15:29:03 -07:00
Zach Fox
ec29948b15
Merge pull request #13181 from zfox23/MS15103_snapFolderCrash 
Fix MS15103: Interface crashes on snap if snap dir is deleted
 2018-05-16 15:16:58 -07:00
Dante Ruiz
8bd37a61d6
Merge pull request #6 from druiz17/menu-updates 
Menu updates
 2018-05-16 15:08:55 -07:00
Dante Ruiz
f8e9afb115 fixing damn build issues 2018-05-16 15:08:09 -07:00
Dante Ruiz
3be4b01d2c move overlays menu back 2018-05-16 14:36:55 -07:00
Gabriel Calero
5370cb7725 Change login option UI 2018-05-16 18:15:31 -03:00
Cristian Luis Duarte
49f4ce9053 Android - Filter domains by tag 'mobile' in Search 2018-05-16 18:15:11 -03:00
Zach Fox
486f33b4bd Merge branch 'master' of github.com:highfidelity/hifi into MS15103_snapFolderCrash 2018-05-16 14:14:35 -07:00
Dante Ruiz
5432e8e7a4
Merge pull request #5 from druiz17/menu-updates 
Menu updates
 2018-05-16 13:50:39 -07:00
Dante Ruiz
237b0d7483 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-16 13:49:02 -07:00
Dante Ruiz
fbc3d97af3 adding back overlay menu and avatar size 2018-05-16 13:48:29 -07:00
Zach Fox
585957409d
Merge pull request #13141 from zfox23/spectatorCameraImprovements 
Spectator Camera V2
 2018-05-16 13:38:07 -07:00
samcake
adc8a07d3c Merge branch 'RC67.2' of https://github.com/highfidelity/hifi into rc67.2-taaOn 2018-05-16 13:14:14 -07:00
samcake
21e069c90c Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa 2018-05-16 13:09:55 -07:00
David Rowe
b74f42dc23 Merge branch 'master' into 21863 2018-05-17 07:44:39 +12:00
John Conklin II
8d437892cb
Merge pull request #13175 from luiscuenca/fixAvatarDisappearing 
Fix hips position when flying
 2018-05-16 12:37:07 -07:00
John Conklin II
9c9f375bb5
Merge pull request #13178 from samcake/rc67.2-translucents 
Rc67.2 : Fixing translucents objects in ambient lighting
 2018-05-16 12:18:15 -07:00
vladest
8c146521cf remove double crash options 2018-05-16 21:10:51 +02:00
vladest
7501b8818e removed shadows quality 2018-05-16 21:01:50 +02:00
David Back
06fa4efe05 add comment 2018-05-16 11:39:53 -07:00
David Back
6c946d7ac5 prevent continuous clone calls 2018-05-16 11:36:57 -07:00
David Back
6484c866f3 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-16 11:35:34 -07:00
Gabriel Calero
fe5da24483 Fix spaces 2018-05-16 15:12:42 -03:00
Zach Fox
f8215b5999 Fix final? crash 2018-05-16 11:05:21 -07:00
Vladyslav Stelmakhovskyi
df2b428053
Merge pull request #4 from druiz17/menu-updates 
More menu fixes
 2018-05-16 19:57:20 +02:00
Zach Fox
c3ea176b58 Give me my reticle back! 2018-05-16 10:54:58 -07:00
Dante Ruiz
37c51a7246 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-16 10:41:40 -07:00
Dante Ruiz
e676348c4f fixing some menu reog bugs 2018-05-16 10:40:28 -07:00
luiscuenca
7b48dc2370 normalize vector 2018-05-16 10:17:38 -07:00
Zach Fox
c34605f686 GIF snapshots using the Snap app are still weird, but the bug is fixed 2018-05-16 10:15:51 -07:00
Zach Fox
012ae741a5 Fix MS15103: Interface crashes on snap if snap dir is deleted 2018-05-16 09:52:19 -07:00