Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 05:21:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
65273 commits 76 branches 59 tags 1.2 GiB
Commit graph

26846 commits

Author SHA1 Message Date
Gabriel Calero
109fa1d832 Add the url of each qml as on-screen debug info 2018-03-07 17:18:37 -03: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
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
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
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
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
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
samcake
b8fb97c824 Resolving conflicts 2018-03-02 10:36:55 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -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
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
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
Cristian Luis Duarte
55d52f92df Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows) 2018-02-28 15:55:50 -03:00
NissimHadar
faad930e35 WIP. 2018-02-28 08:44:01 -08:00
NissimHadar
7ae37c21e0 Merge branch 'master' of github.com:highfidelity/hifi into fixDualQuats 2018-02-28 08:13:00 -08:00
NissimHadar
5764a21c4a WIP. 2018-02-28 08:12:48 -08:00
Ken Cooke
328b5a1e8b
Merge pull request #12479 from kencooke/audio-nearfield-hrtf 
Near-field HRTF
 2018-02-28 07:44:24 -08:00
Ken Cooke
bc7b983f48 Fast approximation of the azimuth parallax correction 2018-02-28 04:44:20 -08:00
Seth Alves
31115b3cb6 make sure rezzer doesn't ignore adjustment 2018-02-27 20:14:00 -08:00
Seth Alves
9d131a6547 if a node can't change locks, don't allow them to create an already-locked entity 2018-02-27 19:53:54 -08:00
NissimHadar
7cae04883e WIP. 2018-02-27 17:19:02 -08:00
NissimHadar
f52f146db5 WIP. 2018-02-27 16:28:46 -08:00
Cristian Luis Duarte
428f4b7b9d Android - Make the virtual pad (joystick) position fixed. Change assets. 2018-02-27 21:24:21 -03:00
Elisa Lupin-Jimenez
17ddf21028 fixed line length 2018-02-27 15:05:51 -08:00
NissimHadar
00f3682bbe NOT WORKING YET. 2018-02-27 14:09:31 -08:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -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
Ken Cooke
41ccf6afd8 Compensate the near-field azimuth correction for the parallax baked into the HRTF dataset 2018-02-27 12:49:32 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
Gabriel Calero
1dfdc0ce1b Hide the selection cursor (android only) 2018-02-27 16:25:04 -03:00
Gabriel Calero
efba05b9a0 Merge branch 'android' into android_bubble_fix 2018-02-27 16:23:51 -03:00
Stephen Birarda
9cc348ef27 Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-27 09:59:37 -08:00
John Conklin II
abe7c29b5e
Merge pull request #12492 from thoys/fix/exportBooleanPropertiesProperly 
Export boolean entity properties properly
 2018-02-27 09:18:46 -08:00
Brad Davis
6254e2b569 PR feedback 2018-02-27 09:11:40 -08:00
Brad Davis
f01c42dcc9 Fixing merged dual-quat pipelines 2018-02-27 08:54:46 -08:00