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

5470 commits

Author SHA1 Message Date
Olivier Prat
648e6a6c9b Added description for each event 2018-03-29 10:47:18 -04:00
Olivier Prat
07cb1c1f9e Moved gradient invert checkbox 2018-03-29 10:19:24 -04:00
Olivier Prat
3c8cd48dfb Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-29 07:21:01 -04:00
Sam Gondelman
d2a74e5713
Merge pull request #12686 from gcalero/android_ui_not_move_camera 
Android - Prevent Camera movement with UI (especially Windows and Radar mode)
 2018-03-28 17:14:42 -07:00
Olivier Prat
9a7f88cd78 Moved save / load buttons to top 2018-03-28 19:23:09 -04:00
Cristian Luis Duarte
fe9481b28d Cleanup code, comment out log, simplify radar is valid touch code (no more flag) 2018-03-28 19:50:44 -03:00
Olivier Prat
6639a245df Object picking / edition for transitions are activate / deactivated when transition editor window is shown / hidden 2018-03-28 18:20:10 -04:00
John Conklin II
790162c88b
Merge pull request #12689 from ctrlaltdavid/21808 
Reinstate Overlays.getOverlayObject API function
 2018-03-28 14:00:28 -07:00
Olivier Prat
e4416db06f Added save/file dialog for transition configurations in transition editor 2018-03-28 16:54:53 -04:00
Cristian Luis Duarte
f0bcaa47c8 Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera 2018-03-28 16:47:21 -03:00
Olivier Prat
7fa5e384b9 Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-28 11:21:07 -04:00
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
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
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
Olivier Prat
6b44d79f90 Proposal to improve fade editing with some extra visual cues 2018-03-20 17:48:41 -07:00
Olivier Prat
143a315f1d Fade edited objects are now selected with ray picking 2018-03-20 15:29:50 -07: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
Zach Fox
daa68768b9 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-19 12:18:10 -07:00
John Conklin II
9219868406
Merge pull request #12667 from jherico/fix/web_overlay_crash 
HOTFIX RC65: Fix invalid QML surface cache interaction
 2018-03-19 10:37:48 -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
Brad Davis
ca38b9fe34 Fix invalid QML surface cache interaction 2018-03-16 10:53:59 -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
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
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
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