Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
65342 commits 2 branches 0 tags 1.1 GiB
Commit graph

26874 commits

Author SHA1 Message Date
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
NissimHadar
a703b5a3b5 Added check to correct crashing when selecting ambient occlusion from menu. 2018-03-08 12:15:26 -08:00
Brad Hefta-Gaub
d2e264ab32
Merge pull request #12583 from samcake/punk 
Fix Local lights not showing anymore
 2018-03-08 10:31:58 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android 
Android Tip
 2018-03-08 10:18:35 -08:00
John Conklin II
1341774450
Merge pull request #12482 from SimonWalton-HiFi/declare-metatype 
Add a Q_DECLARE_METATYPE in TextureCache.
 2018-03-08 09:37:06 -08:00
Clément Brisset
b7ac07f590
Merge pull request #12589 from highfidelity/RC65 
merge back RC65 to master after RC hotfixes
 2018-03-07 17:22:41 -08:00
Sam Gondelman
f51a35455a
Merge pull request #12515 from SamGondelman/scriptableMaterials 
Material reflection
 2018-03-07 14:29:31 -08:00
SamGondelman
0aacdcd558 docs 2018-03-07 13:34:48 -08:00
samcake
923c81ae28 Swap order of the ZoneRendererJob with DrawLocalLights to fix the local lights 2018-03-06 17:38:27 -08:00
Cristian Luis Duarte
bde2ba9272 Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed 2018-03-06 22:02:23 -03:00
Simon Walton
17c12fde9c Fix for HandshakeRequest logic 2018-03-06 16:32:04 -08:00
NissimHadar
d72f46ec3e Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 16:24:53 -08:00
Atlante45
edeed95ccc Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-06 15:33:12 -08:00
NissimHadar
dbf1be5de3 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 15:22:40 -08:00
Gabriel Calero
069d3e40bc Merge branch 'android' into android_bubble_fix 2018-03-06 18:58:49 -03:00
Cristian Luis Duarte
0bb56d837d Android - Use a different variable to save the reported dpi by qt in TouchscreenVirtualPadDevice 2018-03-05 18:08:06 -03:00
John Conklin II
7bc3848c36
Merge pull request #12533 from druiz17/stereo-checkbox 
Adding Stereo checkbox in Audio settings
 2018-03-05 12:45:01 -08:00
Cristian Luis Duarte
c091bc0bb3 Fix warnings regarding float to double conversion 2018-03-05 17:08:38 -03:00
Brad Davis
8bfc610cfb Merge remote-tracking branch 'upstream/master' into android 2018-03-05 11:48:58 -08:00
NissimHadar
1eb0dde3d2 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-05 11:36:39 -08:00
Atlante45
85b4c3b422 Protect session UUID from concurrent read/writes 2018-03-02 17:34:18 -08:00
Sam Gateau
8856d4af4f
Merge pull request #12530 from samcake/punk 
Fixing the graphics bugs introduced since last recent dual quaternion change
 2018-03-02 16:12:23 -08:00
NissimHadar
8536b44c61 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 16:09:06 -08:00
John Conklin II
8f403ebc23
Merge pull request #12543 from zfox23/improveFontLoading 
Improve font loading via QRC instead of file path
 2018-03-02 14:22:17 -08:00
samcake
fc8f1c1e65 Resolving conflicts 2018-03-02 14:20:33 -08:00
Brad Hefta-Gaub
762e36ef19
Merge pull request #12545 from birarda/bug/fix-nlpacket-ascii 
fix ASCII art for packet headers in NLPacket
 2018-03-02 13:49:27 -08:00
Cristian Luis Duarte
76e4a5bef2 Android - Change for test, this cast should avoid crashes due to SIGSEV in ToneMappingDeferred::run inputs.get1(). 2018-03-02 18:46:14 -03:00
Brad Hefta-Gaub
746f43c0fc
Merge pull request #12538 from huffman/fix/gzipped-json-export 
Fix Edit -> Export Entities exporting gzipped json
 2018-03-02 13:34:23 -08:00
Gabriel Calero
01699e26a5 Fix QML debug info: print last QML loaded file instead of Desktop.qml 2018-03-02 18:04:36 -03:00
Stephen Birarda
4f151a4237 fix ASCII art for packet headers in NLPacket 2018-03-02 12:41:22 -08:00
Brad Davis
9e8368e50e Disable virtual trackpad rendering on non-Android builds 2018-03-02 11:12:44 -08:00
Dante Ruiz
55d8cfd4c1 make sure dont make audio devices that don't use stereo use stereo 2018-03-02 10:56:44 -08:00
samcake
b8fb97c824 Resolving conflicts 2018-03-02 10:36:55 -08:00
NissimHadar
000b08f7c0 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 08:07:01 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -08:00
SamGondelman
a66125fbb7 scriptablematerial -> scriptablemateriallayer 2018-03-01 16:56:51 -08:00
Ryan Huffman
70bdedc4b3 Fix Edit -> Export Entities exporting gzipped json 
We were not respecting the doGzip flag.
 2018-03-01 16:42:41 -08:00
SamGondelman
e3b65a9201 Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-03-01 16:39:31 -08:00
Brad Hefta-Gaub
d24cea2f07
Merge pull request #12521 from sethalves/no-prelocked-for-non-lockers 
if a node can't change locks, don't allow it to create an already-locked entity
 2018-03-01 14:56:29 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
Cristian Luis Duarte
b5c3b78d57 Android - Virtual Pad - Limit joystick inside base circle. 2018-03-01 17:58:23 -03:00
samcake
a227cf1edb Fixing bad key/pipeline pair 2018-03-01 10:49:58 -08:00
samcake
5440f62860 fixing a bad key /pipeline pair 2018-03-01 10:46:47 -08:00
Zach Fox
877fa52034 Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading 2018-03-01 10:14:23 -08:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update 
Image entity has correct orientation and is collisionless
 2018-03-01 09:57:08 -08:00
Zach Fox
67034274fa Improve font loading by using QRC instead of relative paths 2018-02-28 17:59:37 -08:00
samcake
dc286544c5 Merging with nissim's pr 2018-02-28 17:54:54 -08:00
samcake
a7542d5b90 fixing the shadow 2018-02-28 17:46:22 -08:00
Cristian Luis Duarte
9acb83632c Android - Make joystick move up when showing the bottom bar 2018-02-28 18:52:13 -03:00
NissimHadar
5d7e6651a7 Use correct pixel shader. 2018-02-28 11:05:02 -08:00