Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 12:23:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
65801 commits 69 branches 56 tags 1.2 GiB
Commit graph

5427 commits

Author SHA1 Message Date
Cristian Luis Duarte
686af4ff77 Clean code that manually checked for windows coordinates to disable radar touch 2018-03-23 20:02:51 -03:00
Cristian Luis Duarte
242b009562 Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events. 2018-03-23 18:59:55 -03:00
Cristian Duarte
d7081b261b Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera 2018-03-20 18:52:20 -03:00
Sam Gateau
5cc0e24921
Merge pull request #12666 from jherico/fix/web_overlay_crash 
Fix invalid QML surface cache interaction
 2018-03-20 14:26:39 -07:00
Cristian Duarte
0d6bfada40 Prevent Go To and Avatar windows to move Radar Mode's camera when touched or interacted with 2018-03-20 17:24:38 -03:00
John Conklin II
91db0ab00f
Merge pull request #12650 from ctrlaltdavid/21798 
Messages API JSDoc
 2018-03-19 13:56:57 -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
Brad Davis
ca38b9fe34 Fix invalid QML surface cache interaction 2018-03-16 10:53:59 -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
a64f0d2779 if tablet wasn't visible when wallet passphrase screen hid it, don't show it when passphrase page is done. 2018-03-15 11:39:05 -07:00
Seth Alves
8a0b8aa034 make tablet invisible in secondary-camera if wallet passphrase page is up 2018-03-15 11:01:13 -07:00
David Rowe
63e07f1a7f Fix typo in developer Messages test script 2018-03-15 15:23:46 +13:00
Gabriel Calero
884da98466 Change default mode to My View (android) 2018-03-14 14:50:44 -03: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
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
Olivier Prat
bafd6340a2 Removed unused fonts in scripts 2018-03-12 14:21:48 -04:00
Cristian Luis Duarte
ce0d76be2b Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move 2018-03-09 20:51:21 -03:00
Cristian Luis Duarte
3d933e1810 Android - Joystick hidden when opening login and shown after Cancel. 2018-03-09 17:41:05 -03:00
NissimHadar
317d9a8dbc Correct can cast shadow flag being visible on entities that can't cast shadows. 2018-03-09 11:45:39 -08:00
Brad Hefta-Gaub
8e44b429d8
Merge pull request #12472 from 1P-Cusack/FogBugz/Case_4315_VFXTabSupport 
[Case 4315] Resolves Particle Tab Color Picker visual inconstency
 2018-03-09 08:49:07 -08:00
Olivier Prat
da6bd92ff6 Merged with master 2018-03-09 10:07:25 +01:00
Atlante45
69fb830480 Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-08 17:23:17 -08:00
David Rowe
b461a422c6 Merge branch 'master' into 21709 2018-03-09 14:18:42 +13:00
John Conklin II
cad53a0203
Merge pull request #12585 from druiz17/small-tablet-changes 
tablet scale and position changes
 2018-03-08 15:36:06 -08:00
Cristian Luis Duarte
4c3ee195de Android - hide joystick when opening the Avatar window and disable it in cases is hidden (it was working with ui windows in front). 2018-03-08 19:58:15 -03:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android 
Android Tip
 2018-03-08 10:18:35 -08:00
David Back
554c37d14b removed undefined event checks in scaling 2018-03-07 19:34:08 -08:00
David Back
9681f0eb77 restore old scale math, disable avatar collisions while scaling 2018-03-07 18:20:26 -08:00
David Back
2047437893 Merge branch 'RC65' of https://github.com/highfidelity/hifi into RC65 2018-03-07 10:30:18 -08:00
Dante Ruiz
2d448d7208 tablet scale and position changes 2018-03-07 10:02:35 -08:00
David Rowe
a62b6b7150 Merge branch 'master' into 21709 2018-03-07 17:34:53 +13:00
Cristian Luis Duarte
4f0cecefc3 Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed 2018-03-06 22:03:39 -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
243e79df4a Fix merge of radar.js 2018-03-06 21:59:59 -03:00
NissimHadar
d72f46ec3e Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 16:24:53 -08:00
NissimHadar
05e9aa52c9 Moved can-cast-shadow checkbox to behaviour section. 2018-03-06 16:22:54 -08:00
Zach Fox
04a230c20f
Merge pull request #12491 from ElderOrb/FB12523 
fix for not re-enabling preview on leaving security-sensitive pages in marketplace
 2018-03-06 16:19:39 -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
David Back
47e8e26255 CR indent fixes 2018-03-06 14:05:24 -08:00
Gabriel Calero
069d3e40bc Merge branch 'android' into android_bubble_fix 2018-03-06 18:58:49 -03:00
David Back
b74be92fd8 redo scale handles to fix scaling into avatar collision causing chaos 2018-03-06 12:27:51 -08:00
Elisa Lupin-Jimenez
15c1f5ba30 fixed log spam undefined error 2018-03-06 11:01:50 -08:00
John Conklin II
16bb992d8d
Merge pull request #12557 from druiz17/correctly-use-defaults-values 
correctly use default values and don't delete userData in entitiesProperties.js
 2018-03-05 13:15:23 -08:00
Thijs Wenker
d7725f1d73 make the grabbable checkbox again, respect default true setting 2018-03-05 20:54:08 +01: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