Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-09 09:58:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66718 commits 69 branches 58 tags 1.2 GiB
Commit graph

4075 commits

Author SHA1 Message Date
John Conklin II
bcd2de3bf8
Merge pull request #12660 from alexiamandeville/awayImage-update 
Update away image and image paths
 2018-03-27 12:46:37 -07:00
unknown
194b00d732 fix translate arrow normals 2018-03-26 16:31:58 -07:00
Cristian Luis Duarte
6cb5cd7f92 Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera 2018-03-26 11:19:42 -03:00
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
Liv Erickson
c66badc53c replace accidentally deleted line 2018-03-23 11:42:39 -07:00
Liv Erickson
9dd91ea31e style fixes and fix for grid color changes not applying 2018-03-23 11:39:44 -07:00
John Conklin II
563ff61325
Merge pull request #12661 from SamGondelman/android 
Android: Stats, disable IK, reduce impact of InputRecorder
 2018-03-23 11:08:50 -07:00
Howard Stearns
113670e33b
Merge pull request #12638 from zfox23/commerce_upgrades_1 
Commerce: Item Updates!
 2018-03-22 15:40:22 -07:00
Clément Brisset
feec59655c
Merge pull request #12692 from highfidelity/stable 
Merge stable back into master
 2018-03-22 15:08:30 -07:00
David Rowe
05efc5a231 Revert "Remove Overlays.getOverlayObject() from JavaScript API" 
This reverts commit 8e2a3e8c99.
 2018-03-21 15:36:39 +13: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
Zach Fox
daa68768b9 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-19 12:18:10 -07:00
David Back
3f2a49d243 fix list of tablet IDs ray cast checks in edit.js 2018-03-17 10:59:18 -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
Zach Fox
a792bcc3d3 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-16 13:24:17 -07:00
Alexia Mandeville
921b19139d Updating indentation 2018-03-16 11:09:53 -07:00
Alexia Mandeville
74c654690f Updating image path in script for HMD 2018-03-15 16:55:41 -07:00
Alexia Mandeville
700d828b67 Updating away image and image path in away script 2018-03-15 16:46:21 -07:00
SamGondelman
0fa73c73ce stats 2018-03-15 16:05:46 -07:00
Zach Fox
eb2f8aa169 New notification flow for item updates 2018-03-15 16:03:49 -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
vladest
3e00243c37 Merge branch 'master' into bubblu_button_blink_fix 2018-03-15 19:45:33 +01:00
vladest
c385bf26e9 Do not use timer for switching bubble button active state 2018-03-15 19:43:00 +01: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
Zach Fox
74e24ec289 Final touches? 2018-03-14 10:58:18 -07:00
Gabriel Calero
884da98466 Change default mode to My View (android) 2018-03-14 14:50:44 -03:00
Zach Fox
98cdbbb3e6 Small update to dot before merging in filterBar 2018-03-14 09:45:42 -07:00
Zach Fox
e2326a3733 Initial work for 'messages waiting' light 2018-03-13 17:05:16 -07:00
Zach Fox
7b6b08fd26 Upgrade specific edition 2018-03-13 13:51:10 -07:00
Zach Fox
f42255f46b Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-13 13:42:42 -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
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
Atlante45
69fb830480 Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-08 17:23:17 -08: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
Zach Fox
4df58f1e67 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-08 12:58:08 -08: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
Zach Fox
08b2be85d2 Don't pass isUpdating around 2018-03-07 11:44:54 -08:00
Zach Fox
d07d02b2bc Take certID from backend instead of query params; Better loading; Uninstall app before updating 2018-03-07 11:10:47 -08:00
David Back
2047437893 Merge branch 'RC65' of https://github.com/highfidelity/hifi into RC65 2018-03-07 10:30:18 -08:00
Zach Fox
91e0af9b46 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-07 10:16:10 -08:00
Dante Ruiz
2d448d7208 tablet scale and position changes 2018-03-07 10:02:35 -08: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
Zach Fox
ee28983334 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-06 11:13:40 -08:00
Elisa Lupin-Jimenez
15c1f5ba30 fixed log spam undefined error 2018-03-06 11:01:50 -08:00
Zach Fox
35b23cc954 It's working! 2018-03-05 15:54:17 -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
Dante Ruiz
1997cd27bd correctly use default values 2018-03-05 11:26:37 -08:00
Zach Fox
4046c873bd Still need to send correct thing to metaverse 2018-03-05 11:24:59 -08:00
Zach Fox
f5a8187fe2 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-05 10:01:55 -08:00
Zach Fox
f10f9aa939 Continued progress 2018-03-05 10:01:40 -08:00
Dante Ruiz
654770af51 fix controller dispatacher error 2018-03-05 09:39:26 -08:00
John Conklin II
3f751bb5ca
Merge pull request #12546 from druiz17/fix-hyperlink 
Fix hyperlink when far/near grabbing enitities
 2018-03-05 08:23:51 -08:00
NissimHadar
8536b44c61 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 16:09:06 -08:00
Zach Fox
f53aba2a32 Initial progress 2018-03-02 15:53:06 -08:00
John Conklin II
ed07b3c28b
Merge pull request #12531 from AndrewMeadows/use-pick-not-raypick 
Purge RayPick and LaserPointers from default scripts
 2018-03-02 14:59:32 -08:00
Dante Ruiz
d12a4f0c18 little change 2018-03-02 14:30:02 -08:00
Dante Ruiz
5dc336bfae remove dead code and eslint files 2018-03-02 14:23:35 -08:00
Dante Ruiz
05fb3cfd9a fixing hyper link for entities 2018-03-02 14:03:24 -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
Dante Ruiz
1f4aed31f1 adding hyperlink 2018-03-01 16:16:47 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
LaShonda Hopper
fde1ca6262 [Case 4315] Ensures that Particle Tab Color Pickers obey colpick visual styling. 
Changes Committed:
    modified:   scripts/system/particle_explorer/particleExplorer.html
 2018-03-01 16:42:56 -05:00
LaShonda Hopper
b2c7ddbd05 [Case 4315] Particle System Tab has additional color picker support (details below). 
* Adds 3 additional keys/properties to hifi-entity-ui's specification support for
color pickers.
    * layoutType:  This correlates to colpick's layout property.  This is expected
        to be a string.  Valid values are those supported by colpick, see colpick.js for
        additional details.
           * Within hifi-entity-ui, if this value isn't specified the default is
             "hex" as was previously hard coded.
    * layoutColorScheme:  This correlates to colpicks's colorScheme property.  This is
        expected to be a string.  Valid values are those supported by colpick, see colpick.js
        for additional details.
            * Within hifi-entity-ui, if this value isn't specified the default is
              "dark" as was previously hard coded.
    * useSubmitButton:  This correlates to colpick's submit property.  This is expected
        to be a boolean.  See colpick.js for additional details.
            * Within hifi-entity-ui, if this value isn't specified the default is
              true as was previously hard coded.
* Amends particleExplorer.js color picker descriptors to make use of the new
  keys to bring the color pickers within the Particle Tab inline with the appearance
  of the Properties Tab color pickers submitted within PR #12241 which don't utilize
  the OK button.

Changes Committed:
    modified:   scripts/system/particle_explorer/hifi-entity-ui.js
    modified:   scripts/system/particle_explorer/particleExplorer.js
 2018-03-01 16:42:56 -05: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
Andrew Meadows
27c6e7915e purge LaserPointers refs from scripts that don't use it 2018-03-01 08:43:30 -08:00
Andrew Meadows
b4f941af03 finish purge of RayPick from grab.js 2018-03-01 08:42:08 -08:00
Andrew Meadows
181944d5db fix bugs in controllerDispatcher.js 2018-03-01 08:41:13 -08:00
Cristian Luis Duarte
9acb83632c Android - Make joystick move up when showing the bottom bar 2018-02-28 18:52:13 -03: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
Elisa Lupin-Jimenez
061a189e9f
Merge pull request #12520 from elisa-lj11/selection_tool_log_spam 
Fixed log spam undefined error
 2018-02-28 09:37:17 -08:00
Thijs Wenker
6bf1c9878f
Merge pull request #12473 from misslivirose/fix-log-spam 
Logspam fix for editing in HMD mode
 2018-02-28 01:59:25 +01:00
Elisa Lupin-Jimenez
b8fd640ddf fixed log spam undefined error 2018-02-27 16:44:45 -08:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -08:00
Howard Stearns
0e4f3460b3
Merge pull request #12497 from howard-stearns/end-seeding 
End seeding
 2018-02-27 13:18:13 -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
Brad Davis
6254e2b569 PR feedback 2018-02-27 09:11:40 -08:00
Elisa Lupin-Jimenez
b56c78d36c image has correct orientation and is collisionless 2018-02-26 14:44:46 -08:00