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 |
|
Liv Erickson
|
0b0040a4be
|
Merge branch 'master' of github.com:highfidelity/hifi into clone-server
|
2018-05-16 09:35:08 -07:00 |
|
Sam Gateau
|
523d57d948
|
Merge pull request #13162 from AndrewMeadows/avatar-collisions
avatars collide again
|
2018-05-16 09:25:05 -07:00 |
|
Liv Erickson
|
a1bdc12163
|
Merge branch 'cloneables' of https://github.com/dback2/hifi into clone-server
|
2018-05-16 09:18:04 -07:00 |
|
Cristian Luis Duarte
|
b5e8adfc39
|
Use availableSize() to get screen size instead of size() as it returns a wrong screen size on some Samsung devices (misplacing controls that are relative to screen size)
|
2018-05-16 12:53:39 -03:00 |
|
Gabriel Calero
|
5afc9c6df3
|
Merge remote-tracking branch 'upstream/master' into android_new_login
|
2018-05-16 12:45:17 -03:00 |
|
vladest
|
72838f6d34
|
Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons
|
2018-05-16 17:06:31 +02:00 |
|
vladest
|
5127cb0ea6
|
Merge branch 'master' into menu-updates
|
2018-05-16 14:37:00 +02:00 |
|
vladest
|
a9930d53a9
|
Reorder VR menu
|
2018-05-16 14:25:58 +02:00 |
|
David Back
|
1e2d2819d5
|
tweaks
|
2018-05-15 17:36:39 -07:00 |
|
David Back
|
f8fc7bedd7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
|
2018-05-15 17:31:43 -07:00 |
|
David Back
|
f74e219029
|
rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete
|
2018-05-15 17:24:14 -07:00 |
|
samcake
|
179801dab6
|
FIxing the transparent ambient lighting bug
|
2018-05-15 17:22:28 -07:00 |
|
Liv Erickson
|
73b6233c3c
|
Merge branch 'cloneables' of https://github.com/dback2/hifi into clone-server
|
2018-05-15 16:54:00 -07:00 |
|
John Conklin II
|
aca261af3e
|
Merge pull request #12939 from Cristo86/android_places_goto
Android Search & Go To
|
2018-05-15 16:43:38 -07:00 |
|
John Conklin II
|
808fb5a5d9
|
Merge pull request #13173 from Zvork/taabug
TAA fix for highlight
|
2018-05-15 15:32:20 -07:00 |
|
David Rowe
|
f571e90ef5
|
Merge branch 'master' into 21872-b
|
2018-05-16 10:20:53 +12:00 |
|
David Rowe
|
f629022b8c
|
AvatarList API JSDoc stubs
|
2018-05-16 10:16:13 +12:00 |
|
John Conklin II
|
1313d28b9d
|
Merge pull request #13112 from sethalves/fix-overlay-asan-warning
Fix overlay asan warning
|
2018-05-15 14:51:05 -07:00 |
|
Zach Fox
|
d904bcd1cd
|
UX improvements
|
2018-05-15 14:39:07 -07:00 |
|
Gabriel Calero
|
4a3001be18
|
Fix clipping on the right edge of login italic text views
|
2018-05-15 18:21:37 -03:00 |
|
David Rowe
|
fdeb0e3305
|
Avatar API JSDoc stubs
|
2018-05-16 09:20:54 +12:00 |
|
luiscuenca
|
4b09f1dc30
|
Fix vector transformation when calculating flying hip position
|
2018-05-15 14:19:17 -07:00 |
|
John Conklin II
|
a6cda2166a
|
Merge pull request #13158 from highfidelity/stable
RC67.1 stable mergeback to master
|
2018-05-15 14:01:06 -07:00 |
|
Andrew Meadows
|
c5773cbe84
|
restore 'virtual' keyword for overrides
|
2018-05-15 13:59:22 -07:00 |
|
John Conklin II
|
ce1231910c
|
Merge pull request #13140 from Cristo86/android_avatar_name
@SamGondelman We just do a quick 5-10 minute Windows check, just to make sure Windows/Mac weren't broken by the change.
|
2018-05-15 13:22:15 -07:00 |
|
Zach Fox
|
9632498422
|
Bugfixes and Settings button
|
2018-05-15 13:16:42 -07:00 |
|
vladest
|
7ea6181520
|
Merge branch 'master' into menu-updates
|
2018-05-15 21:54:45 +02:00 |
|
vladest
|
dd05afa974
|
Remove double setting
|
2018-05-15 21:43:43 +02:00 |
|