Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-14 12:07:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57183 commits 17 branches 0 tags 1.1 GiB
Commit graph

57183 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
6237b5fc0a Camera faces you, but offset 2017-07-12 16:24:56 -07:00
Zach Fox
b5a1c65622 New model, smaller filesize 2017-07-12 16:10:20 -07:00
Zach Fox
aab04042b2 Merge pull request #10960 from zfox23/spectatorCamera_MarketplacePreparation 
Spectator camera marketplace preparation
 2017-07-12 16:02:47 -07:00
Zach Fox
5f50f29060 New model 2017-07-12 15:56:39 -07:00
Zach Fox
8294df8b76 != to !== 2017-07-12 15:37:06 -07:00
Zach Fox
e6f7457d0c Fixes 2017-07-12 15:17:23 -07:00
Zach Fox
d37789234d Remove from default scripts 2017-07-12 14:37:57 -07:00
Zach Fox
63b0e70833 Prepare for marketplace submission 2017-07-12 14:19:08 -07:00
Zach Fox
8553277c56 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-12 14:18:50 -07:00
Zach Fox
d6798c070e Merge pull request #10957 from zfox23/spectatorCamera_noFarClipMagicNumbers 
Cleanup; no magic numbers for default cam params
 2017-07-12 12:35:14 -07:00
Zach Fox
bd4fe416b4 Cleanup; no magic numbers for default cam params 2017-07-12 12:08:36 -07:00
Zach Fox
34d0363ae5 Merge pull request #10955 from zfox23/spectatorCamera_farClipDistance 
Make far clip plane distance equal to main camera's
 2017-07-12 11:37:43 -07:00
Zach Fox
9fe6fbd811 View frustums are strange. 2017-07-12 11:37:18 -07:00
Stephen Birarda
d347eab42c Merge pull request #10952 from highfidelity/revert-10922-revert-10835-bug/invisible-avatars 
Revert "Revert "fix for invisible avatars after radius ignore""
 2017-07-12 11:20:16 -07:00
Zach Fox
79cf242fc9 Make far clip plane distance equal to main camera's 2017-07-12 10:51:14 -07:00
Stephen Birarda
f6d9a79fb5 Revert "Revert "fix for invisible avatars after radius ignore"" 2017-07-12 10:36:53 -07:00
Ken Cooke
77705c5ffa Merge pull request #10948 from Tingjin/Tingjin-V1 
Change AudioDevices.cpp
 2017-07-12 08:38:06 -07:00
Tingjin
80916b62bb Remove unnecessary code 
Remove two lines of unnecessary code.
 2017-07-11 20:52:28 -07:00
Zach Fox
d786820670 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-11 16:16:37 -07:00
Zach Fox
5af5b4516a Merge pull request #10943 from zfox23/spectatorCamera_removeAvatarEntityWorkaround 
Workaround the bug where Avatar Entities can't get deleted after switching domains
 2017-07-11 16:12:21 -07:00
Zach Fox
a27644ae4d Magic numbers 2017-07-11 15:52:12 -07:00
Zach Fox
51c22eb7db Also re-enable spectator camera after switching domains 2017-07-11 15:38:10 -07:00
Zach Fox
1001097f92 Fix button state 2017-07-11 15:29:00 -07:00
Zach Fox
b0639be8bd Use function pointers correctly 2017-07-11 15:23:50 -07:00
Zach Fox
c4a4623ba8 Workaround the bug where Avatar Entities can't get deleted after switching domains 2017-07-11 15:18:08 -07:00
Andrew Meadows
782155e9ea Merge pull request #10876 from Atlante45/fix/ac-crash 
Fix AC crash (buffer overflow)
 2017-07-11 14:26:08 -07:00
Seth Alves
d05b353942 Merge pull request #10940 from druiz17/qt-mouse-events 
Fix tablet scrolling for QT 5.9 and  QT 5.6
 2017-07-11 14:06:53 -07:00
Dante Ruiz
2f192fd48a added scroll fix for qt 5.6 2017-07-11 21:19:06 +01:00
Dante Ruiz
01ca192613 fixed tablet scrolling 2017-07-11 21:16:13 +01:00
David Kelly
8fd02c1d0c Merge pull request #10938 from davidkelly/dk/hmdPreviewFix 
fix hmd preview image
 2017-07-11 12:27:18 -07:00
David Kelly
e2426c538e Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/noPreviewAfterDismissing 2017-07-11 11:01:58 -07:00
David Kelly
e1df3feb5c fix hmd preview 2017-07-11 10:54:35 -07:00
Zach Fox
5bec6cc7f5 Merge pull request #10936 from zfox23/spectatorCamera_activeButtonWhenOn 
Make Spectator Camera icon active when Camera is on
 2017-07-11 10:31:29 -07:00
Zach Fox
2e8bd3c9cb Make Spectator Camera icon active when Camera is on 2017-07-11 10:16:55 -07:00
Zach Fox
ea62ef165c Fix image container background 2017-07-10 16:13:45 -07:00
Zach Fox
5ce409e2e2 Merge pull request #10935 from zfox23/spectatorCamera_tabletButtonFix 
Ensure tablet button shows up; protections for controller mapping; Ensure instructions show
 2017-07-10 15:52:21 -07:00
Zach Fox
5823efce76 Cleanup 2017-07-10 15:51:27 -07:00
Zach Fox
4a74522884 Ensure tablet button shows up; protections for controller mapping 2017-07-10 15:16:16 -07:00
Atlante45
c32f4ab0d3 CR 2017-07-10 14:24:53 -07:00
Seth Alves
4a35ad105b Merge pull request #10615 from amvmoody/21358 
WL 21358 Create a Laser Pointer app
 2017-07-10 14:21:54 -07:00
Chris Collins
24edbc5c43 Merge pull request #10934 from Atlante45/new-master 
Stable => Master
 2017-07-10 13:46:36 -07:00
Zach Fox
78d12f27ed Merge pull request #10933 from zfox23/spectatorCamera_forceMonoPreview 
Force Mono Preview when using Spectator Camera
 2017-07-10 13:29:22 -07:00
Atlante45
d28fc5603d Merge branch 'stable' 2017-07-10 13:28:25 -07:00
David Kelly
339cfed3c4 Merge pull request #10932 from davidkelly/dk/noPreviewAfterDismissing 
Ensure spectator camera preview is up when reopening tablet
 2017-07-10 13:28:01 -07:00
Zach Fox
303a3d1e4c Force Mono Preview when using Spectator Camera 2017-07-10 13:27:45 -07:00
David Kelly
fcf4bfd59a spacing issue 2017-07-10 13:25:33 -07:00
David Kelly
b87d69b15d Insure spectator camera preview is up when reopening tablet 2017-07-10 13:16:08 -07:00
Stephen Birarda
f6d0122550 Merge pull request #10791 from birarda/bug/adding-dead-upstream-agent 
don't add missing replicated node from kill packet
 2017-07-10 12:53:21 -07:00
Chris Collins
a1a0e411ce Merge pull request #10923 from highfidelity/RC-47 
Beta Release 47 - Includes up to Developer Release 6825
 2017-07-10 12:53:20 -07:00
druiz17
78ba2102f4 Merge pull request #10931 from druiz17/fix-goto-hmd-keyboard 
Fixed goto hmd keyboard not entering text
 2017-07-10 12:50:01 -07:00