Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 08:56:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65910 commits 74 branches 59 tags 1.2 GiB
Commit graph

24311 commits

Author SHA1 Message Date
Seth Alves
a4599fe7ce Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 20:07:35 -07:00
Sam Gondelman
b96f398274
Merge pull request #12593 from gcalero/android_joystick_rotate_move 
Android joystick rotate move
 2018-03-16 17:24:15 -07:00
Seth Alves
50b9716a17 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 14:45:49 -04:00
Brad Hefta-Gaub
634e642db3
Merge pull request #12634 from sethalves/overlay-visible-in-2nd-cam 
Overlays visible in 2nd cam
 2018-03-16 10:07:26 -07:00
Seth Alves
4f72503d2d put default home back to sandbox 2018-03-16 09:39:42 -07:00
Seth Alves
e3022da787 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 09:34:38 -07:00
Atlante45
d96f7553d9 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-03-15 15:22:43 -07:00
Cristian Luis Duarte
03cbadece5 Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move 2018-03-15 17:11:40 -03:00
Seth Alves
a5b94f22fa works now 2018-03-15 10:31:55 -07:00
Seth Alves
b22e0f6209 use TAG_BITS_1 for cam rather than TAG_BITS_ALL 2018-03-15 09:55:42 -07:00
Seth Alves
afcbb6751b disable loading of serverless-domains over http(s), for now 2018-03-14 15:53:35 -07:00
Seth Alves
e63558dc05 code review 2018-03-14 14:33:17 -07:00
Seth Alves
93978209d8 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-14 13:49:46 -07:00
Seth Alves
21088cfbcc Merge branch 'master' of github.com:highfidelity/hifi into overlay-visible-in-2nd-cam 2018-03-14 09:00:21 -07:00
Seth Alves
602bc37b1a oops 2018-03-13 16:39:56 -07:00
Seth Alves
271badfa62 provide an overlay property to control if the overlay is visible in the secondary camera view 2018-03-13 16:33:32 -07:00
SamGondelman
4adc357534 apply taa to text and web entities/overlays 2018-03-13 11:57:14 -07:00
Cristian Luis Duarte
a3811c2844 Coding style corrections 2018-03-13 15:56:13 -03:00
Seth Alves
b39c7eadd2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-13 09:24:18 -07:00
John Conklin II
5be2f0acc7
Merge pull request #12490 from Zvork/taa 
Temporal Anti-Aliasing
 2018-03-13 09:03:50 -07:00
Gabriel Calero
3117ec9015 Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec 2018-03-12 19:44:24 -03:00
Sam Gondelman
c59d29f4ee
Merge pull request #12623 from SamGondelman/android 
Android: Fix corruption on startup
 2018-03-12 15:03:07 -07:00
John Conklin II
7f7d20738a
Merge pull request #12553 from vladest/mac_combobox_misplaced 
Fix CheckBox on Mac
 2018-03-12 14:47:39 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709 
Entities API JSDoc
 2018-03-12 14:40:09 -07:00
Gabriel Calero
7778ddfdcb Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec 2018-03-12 18:33:05 -03:00
SamGondelman
9953e7051f Merge remote-tracking branch 'upstream/master' into android 2018-03-12 14:15:31 -07:00
SamGondelman
4bef033d6f cleanup, don't compress rcc file to fix corruption 2018-03-12 13:05:03 -07:00
Cristian Luis Duarte
9e429e9f03 Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move 2018-03-12 15:51:46 -03:00
Olivier Prat
aad571f6bd Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-03-12 14:22:57 -04:00
Cristian Luis Duarte
b87a07a7d0 Android - Improve View controller making it like a drag rather than like a joystick (reference touch is updated at every frame and is not only the initial touch anymore) 2018-03-12 14:55:20 -03:00
samcake
10016756b7 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-03-09 16:32:37 -08:00
Cristian Luis Duarte
ce0d76be2b Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move 2018-03-09 20:51:21 -03:00
Seth Alves
c781f88239 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-09 15:43:14 -08:00
Seth Alves
5b5ea11a18 changes to openUrl aren't needed for serverless domains 2018-03-09 15:43:05 -08:00
samcake
c78df4d967 Setting the correct Job config for ssao check box and fixing typo 2018-03-09 15:41:56 -08:00
Cristian Luis Duarte
f0e68ecffa Android - Touch to rotate inverted X and Y axis and less sensitive. 2018-03-09 20:33:06 -03:00
samcake
fec30b8363 Fixing the menu for Shadow and AO to do the correct path to engine config 2018-03-09 15:04:14 -08:00
John Conklin II
42a686ad93
Merge pull request #12578 from druiz17/use-correct-audio-api 
use correct scripting api  for audio in Audio.qml
 2018-03-09 13:41:20 -08:00
samcake
10447bf10e Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there 2018-03-09 13:04:04 -08:00
Sam Gateau
d0de5b2d96
Merge pull request #12496 from AndrewMeadows/faster-raypick 
faster per-entity raypick culling and time-boxed picks
 2018-03-09 13:01:52 -08:00
Cristian Luis Duarte
3d933e1810 Android - Joystick hidden when opening login and shown after Cancel. 2018-03-09 17:41:05 -03:00
Seth Alves
621e6a62d6 merge from upstream 2018-03-09 12:07:24 -08:00
Seth Alves
58bc42990c merge from upstream 2018-03-09 12:03:26 -08:00
John Conklin II
25b93d9fd7
Merge pull request #12606 from ElderOrb/FB12956_RC65 
Fix for broken 'toggle audio meter' button
 2018-03-09 11:20:27 -08:00
Dante Ruiz
e21c4988fb stereo checkbox text change 2018-03-09 10:11:25 -08:00
Dante Ruiz
3a39fca268 made requested changes 2018-03-09 10:09:51 -08:00
John Conklin II
6969f014fc
Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one 
clear wallet when picking a new one
 2018-03-09 10:09:41 -08:00
John Conklin II
407dfec342
Merge pull request #12603 from howard-stearns/RC65-clear-wallet-when-picking-a-new-one 
clear wallet when picking a new one
 2018-03-09 10:09:24 -08:00
John Conklin II
209dd7fb43
Merge pull request #12602 from zfox23/RC65_fixFontsAgain 
RC65: Fix font loading for MacOS via completely different font loading method
 2018-03-09 09:53:46 -08:00
Zach Fox
2b137f94a6
Merge pull request #12596 from zfox23/fixFontsAgain 
Fix font loading for MacOS via completely different font loading method
 2018-03-09 09:49:56 -08:00