Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-24 15:01:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65917 commits 6 branches 1 tag 1.1 GiB
Commit graph

4267 commits

Author SHA1 Message Date
Seth Alves
f61504b814 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-19 14:59:18 -07:00
John Conklin II
47437c9564
Merge pull request #12651 from ctrlaltdavid/21799 
Fix "text" overlay not clipping to right and bottom margins
 2018-03-19 14:12:20 -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
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
David Rowe
a7cd5a240a Fix "text" overlay not clipping to right and bottom margins 2018-03-15 17:31:02 +13: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
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
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709 
Entities API JSDoc
 2018-03-12 14:40:09 -07:00
Olivier Prat
aad571f6bd Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-03-12 14:22:57 -04: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
Seth Alves
58bc42990c merge from upstream 2018-03-09 12:03:26 -08:00
Olivier Prat
da6bd92ff6 Merged with master 2018-03-09 10:07:25 +01:00
David Rowe
b461a422c6 Merge branch 'master' into 21709 2018-03-09 14:18:42 +13:00
Alexander Ivash
b427d6c326 FB12956 - Audio Meter Toggle Button Broken 2018-03-09 02:20:34 +03:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android 
Android Tip
 2018-03-08 10:18:35 -08:00
Seth Alves
fca510c9f7 move start json to a new directory 2018-03-07 18:45:45 -08:00
Seth Alves
9f2be4db8f Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-07 15:04:38 -08:00
Sam Gondelman
f51a35455a
Merge pull request #12515 from SamGondelman/scriptableMaterials 
Material reflection
 2018-03-07 14:29:31 -08:00
Seth Alves
e583d3d104
Merge pull request #26 from druiz17/serverless-domains 
Serverless domains
 2018-03-07 13:40:55 -08:00
Dante Ruiz
8382d842e1 changing to resources path 2018-03-07 12:51:26 -08:00
Seth Alves
8a08039efe Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-07 11:44:48 -08:00
David Rowe
a62b6b7150 Merge branch 'master' into 21709 2018-03-07 17:34:53 +13:00
Atlante45
edeed95ccc Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-06 15:33:12 -08:00
Gabriel Calero
069d3e40bc Merge branch 'android' into android_bubble_fix 2018-03-06 18:58:49 -03:00
Seth Alves
fdb53b6543 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-02 19:27:53 -08:00
Seth Alves
bdd926f89e cleanups 2018-03-02 10:38:35 -08:00
SamGondelman
e3b65a9201 Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-03-01 16:39:31 -08:00
Zach Fox
877fa52034 Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading 2018-03-01 10:14:23 -08:00
Zach Fox
67034274fa Improve font loading by using QRC instead of relative paths 2018-02-28 17:59:37 -08:00
samcake
9e5ed7b905 Add more timing stats in explanded mode 2018-02-28 10:48:35 -08:00
David Rowe
a782b6779a Merge branch 'master' into 21709 
# Conflicts:
#	interface/src/ui/overlays/Overlays.h
#	interface/src/ui/overlays/Shape3DOverlay.cpp
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/EntityScriptingInterface.h
 2018-02-28 12:42:05 +13:00
samcake
e290f2fc3c Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-02-27 14:54:11 -08:00
John Conklin II
b4000c04bc
Merge pull request #12432 from highfidelity/feat/content-settings 
Add content archives to domain server web interface
 2018-02-27 13:30:53 -08:00
SamGondelman
cc53b338db Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-02-27 13:30:03 -08:00
Howard Stearns
0e4f3460b3
Merge pull request #12497 from howard-stearns/end-seeding 
End seeding
 2018-02-27 13:18:13 -08:00
Stephen Birarda
9cc348ef27 Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-27 09:59:37 -08:00
Zach Fox
9170244312 Make WindowScriptingInterface available to tablet 2018-02-27 09:36:02 -08:00
samcake
efba6bb524 Adding a counter for the other parts of the gameloop 2018-02-27 09:11:14 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting 
Leopoly_Phase1_010 Graphics Scripting
 2018-02-27 07:53:25 -08:00
SamGondelman
6fe2d46d7c merge 2018-02-26 12:40:14 -08:00