Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-16 21:20:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68372 commits 25 branches 0 tags 1.1 GiB
Commit graph

4306 commits

Author SHA1 Message Date
David Rowe
3c2bee757a Remove calls to function that's been removed 2018-05-05 12:14:40 +12:00
Gabriel Calero
1330132a32 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-04 18:35:51 -03:00
Dante Ruiz
0e92bb41bf fix-another-highlighting-issue 2018-05-04 14:30:38 -07:00
Liv
e4b6686e1c
Merge pull request #13075 from ctrlaltdavid/21862 
Clear entity selection handles and update list when entities are deleted
 2018-05-04 14:23:37 -07:00
Dante Ruiz
607de3dfb4 Merge branch 'RC67' of github.com:highfidelity/hifi into RC67 2018-05-04 14:20:57 -07:00
Dante Ruiz
6414fcaae5 fix-another-highlighting-issue 2018-05-04 14:20:17 -07:00
Gabriel Calero
868b58e66d Un-expose Application from javascript. Restore displayplugin deactivation when goes to background 2018-05-04 18:01:01 -03:00
Zach Fox
1da840984b Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-04 10:24:28 -07:00
Dante Ruiz
d44882e6dc fix entity highlighting during edit mode 2018-05-04 09:01:24 -07:00
Dante Ruiz
a57c72df6e fix entity highlighting during edit mode 2018-05-04 08:53:49 -07:00
David Rowe
dd8eac8cb2 Remove superfluous keyboardControl.js file and references 
The raiseAndLowerKeyboard.js script is automatically injected into these pages, instead.
 2018-05-04 16:14:42 +12:00
RebeccaStankus
7a7474baca moved checkEditPermissionsAndUpdate function to higher scope 2018-05-03 13:34:55 -07:00
Dante Ruiz
a6eab29b14 fixing edge case 2018-05-03 13:09:45 -07:00
Dante Ruiz
cffb008c31 fixing edge case 2018-05-03 13:07:32 -07:00
Zach Fox
c3d3cdca3d Add cubemap output format 2018-05-03 12:57:00 -07:00
Dante Ruiz
c258e8c248 fix highlighting issues 2018-05-03 11:38:59 -07:00
Dante Ruiz
4793cddde6 fix highlighting issues 2018-05-03 11:27:07 -07:00
David Rowe
ebd46f1861 Fix intermittent ability to select particle and light entities 2018-05-03 14:43:54 +12:00
Cristian Luis Duarte
4ec68f6f76 Merge remote-tracking branch 'origin/master' into android_avatar_name 2018-05-02 18:48:04 -03:00
David Rowe
5312c81a6f Match style of surrounding code 2018-05-03 08:49:18 +12:00
David Rowe
4a96dc2fdc Refactor 2018-05-03 08:48:17 +12:00
Gabriel Calero
d0ab81d1f9 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-02 17:00:32 -03:00
Gabriel Calero
c15ef56d90 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 14:38:10 -03:00
Zach Fox
ecae3ceb9d Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-02 10:05:15 -07:00
vladest
53350b471b Merge branch 'master' into menu-updates 2018-05-02 19:02:11 +02:00
Gabriel Calero
e83f1a8ec7 Merge branch 'android_new_login' of https://github.com/gcalero/hifi into android_new_login 2018-05-02 12:20:23 -03:00
Gabriel Calero
0f08bd8fa1 Use a single AccountManager for android. 2018-05-02 12:11:11 -03:00
Cristian Luis Duarte
3322622c84 Merge remote-tracking branch 'origin/master' into android_avatar_name 2018-05-02 10:58:09 -03:00
Gabriel Calero
3a1bfefc22 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-02 10:09:56 -03:00
David Rowe
f27e363b68 Remove entity from list when it deletes; handle multiple deletions 2018-05-02 15:23:13 +12:00
David Rowe
5a064d3499 Remove selection handles and list highlight when entity deletes 2018-05-02 14:13:15 +12:00
David Rowe
1b99946c5f Fix entity not highlighted in list after creating or undoing delete 2018-05-02 12:38:29 +12:00
vladest
aef62d09c7 Merge branch 'master' into menu-updates 2018-05-01 21:47:46 +02:00
vladest
617b49fe14 Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode 2018-05-01 21:22:48 +02:00
Liv Erickson
7db07db9e2 remove menu item at cleanup 2018-04-30 13:55:01 -07:00
Zach Fox
aafcf056c4 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-04-30 12:36:00 -07:00
Cristian Luis Duarte
c0ad6dc17d Merge remote-tracking branch 'origin/master' into android_avatar_name 2018-04-30 16:32:14 -03:00
Zach Fox
a2b84c0fbb It's working!! 2018-04-30 12:11:46 -07:00
John Conklin II
47f68364d2
Merge pull request #13012 from misslivirose/fix/particle-prop-caps 
Limits for alpha sliders in particle explorer
 2018-04-30 10:13:05 -07:00
David Back
61afd12eeb change to not left button 2018-04-27 16:06:27 -07:00
David Back
0962e1fc16 ignore right clicks 2018-04-27 16:06:14 -07:00
David Back
729f3366ff
Merge pull request #13033 from dback2/desktopEquip 
Desktop equip - ignore right clicks
 2018-04-27 14:36:26 -07:00
David Back
8d49d1c118 change to not left button 2018-04-27 13:32:05 -07:00
Zach Fox
684d2b08ba Finalize work on MS14295 and MS14559 2018-04-27 12:03:54 -07:00
David Back
78436ebcbf ignore right clicks 2018-04-27 11:30:45 -07:00
Zach Fox
bbc15cdc63 Finalize work on MS14295 and MS14559 2018-04-27 11:04:46 -07:00
Zach Fox
fc324f67bd MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC 2018-04-26 15:09:53 -07:00
Liv Erickson
ef275485c0 fix alpha sliders for particles 2018-04-26 12:54:37 -07:00
David Back
71dc75b208 fix disconnect clear entities 2018-04-24 14:25:33 -07:00
Gabriel Calero
d33855b860 Advance the haptic feedback from onClick to onPressDown 2018-04-24 17:15:05 -03:00
Gabriel Calero
51f9b763ff Merge remote-tracking branch 'origin/android_goto_splash' into android_new_login 2018-04-24 13:18:28 -03:00
Gabriel Calero
103e9f92fa Add haptic feedback to back, view and mic buttons 2018-04-24 11:56:01 -03:00
David Back
e21c451815 ensure deleted or cleared entities properly unequipped 2018-04-23 16:56:18 -07:00
John Conklin II
2e6a563c87
Merge pull request #12959 from davidkelly/dk/14375 
Don't populate user list in pal until you connect the events up
 2018-04-23 14:47:31 -07:00
Gabriel Calero
8923c16b08 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-04-23 17:04:06 -03:00
David Kelly
d84ea6bf0f Don't populate user list in pal until you connect the events up 2018-04-20 16:09:20 -07:00
David Back
8950c31378 fix mouse equipping while someone else far grabbing 2018-04-19 16:29:49 -07:00
Gabriel Calero
adfbaac18f Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-19 19:40:00 -03:00
Gabriel Calero
f2184bf456 Handle android back button. Remove unused resources. Fix compilation errors. 2018-04-19 17:31:25 -03:00
David Back
f7723a5bba Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip 2018-04-19 11:17:34 -07:00
David Back
8cbe0f4633 safer clear grab actions 2018-04-19 11:17:26 -07:00
Seth Alves
6f420ffae2
Merge pull request #12936 from druiz17/more-tablet-changes 
Change tablet model and spawn position
 2018-04-19 10:25:34 -07:00
John Conklin II
5ef90b242e
Merge pull request #12925 from thoys/fix/create-errorOnShutdown 
Create app: Save light selection menu option properly
 2018-04-19 10:16:40 -07:00
David Back
d1bb11562b Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip 2018-04-19 09:36:19 -07:00
Gabriel Calero
c8fe45eb8f Remove debug statements and unused code. Put JNI code in a separated file. 2018-04-19 11:41:59 -03:00
John Conklin II
e557e0ae52
Merge pull request #12844 from druiz17/feature-entity-highlighting 
Highlight grabbable and equippable entities.
 2018-04-18 15:35:46 -07:00
John Conklin II
51a98961a6
Merge pull request #12920 from thoys/fix/create-dontCloneOthersAvatarEntities 
edit.js - remove ability to clone non-owned avatar-entities
 2018-04-18 15:27:09 -07:00
David Back
bf21a4cf56 tabs 2018-04-18 15:05:29 -07:00
David Back
666653dd96 tabs 2018-04-18 15:01:14 -07:00
David Back
4a37c4ba18 add entityIsEquipped utils for grab.js check 2018-04-18 15:00:10 -07:00
John Conklin II
eedc8a8c0a
Merge pull request #12929 from misslivirose/fix/misc-edit-bugs 
Fix edit icon behavior
 2018-04-18 13:46:38 -07:00
Zach Fox
e0012ed5dc
Merge pull request #12924 from zfox23/MS12292_snapshotResourcesPath 
Fix paths to various Snapshot resource files
 2018-04-18 13:44:53 -07:00
Dante Ruiz
86d3ba658f Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting 2018-04-18 13:30:24 -07:00
Dante Ruiz
cf22f61361 adding cleanup of selection 2018-04-18 13:30:14 -07:00
Zach Fox
3ef0598871
Merge pull request #12923 from zfox23/MS10864_preventSnapshotSpam 
Don't allow users to spam Still Only snapshot capture
 2018-04-18 13:19:36 -07:00
Dante Ruiz
9d6fc13a04 Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes 2018-04-18 13:06:51 -07:00
Dante Ruiz
a65f5f7917 making tablet changes 2018-04-18 13:06:26 -07:00
Gabriel Calero
472cc1b29a Fix code spacing 2018-04-18 16:44:49 -03:00
David Back
3afde111c4 Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip 2018-04-18 10:18:28 -07:00
Liv Erickson
e795af03dd move function out of global scope 2018-04-18 09:56:39 -07:00
Liv Erickson
2a055429cd handle edit changes 2018-04-17 17:31:16 -07:00
Liv Erickson
e35efccfa3 make icon slightly more robust 2018-04-17 17:11:37 -07:00
Liv Erickson
6c1872caba remove old dependency on domain changed message to fix issue with edit icon not handling domain changes 2018-04-17 16:38:29 -07:00
unknown
46e040ca7b Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip 2018-04-17 16:26:42 -07:00
unknown
278a6b763f ensure target mouse entity has equip data 2018-04-17 16:26:33 -07:00
unknown
9e4914975b missing reset flag on end equip, remove mouseEquip check on unequip via U 2018-04-17 16:13:10 -07:00
Liv Erickson
abe8a3e6d9 correct implementation that doesn't interfere with other app status 2018-04-17 15:41:03 -07:00
Liv
071396bed0 move logic for disconnecting out of initalize() and into setActive() 2018-04-17 15:40:59 -07:00
Liv
7a7438b648 space for synxtax 2018-04-17 15:40:57 -07:00
Liv
7f01dded79 add handler to refused domain change connections 2018-04-17 15:40:55 -07:00
Liv
6f020a7ec8 return tablet to home on change domain 2018-04-17 15:40:54 -07:00
Thijs Wenker
e6f0bfbf4c get proper checkbox value from the allow light selection menu option 2018-04-18 00:10:49 +02:00
Zach Fox
95ee3c82f5 Fix paths to various Snapshot resource files 2018-04-17 14:13:14 -07:00
Zach Fox
4e48008ba1 Don't allow users to spam Still Only snapshot capture 2018-04-17 12:39:46 -07:00
Thijs Wenker
b741888d77 CR feedback (for real) 2018-04-17 20:31:30 +02:00
Thijs Wenker
91467b6059 CR feedback 2018-04-17 20:30:00 +02:00
Thijs Wenker
0aa0f53925 edit.js - remove ability to clone non-owned avatar-entities 2018-04-17 19:46:45 +02:00
Triplelexx
86cfb1448a move inspect script 2018-04-16 21:54:14 +01:00
David Back
e86ef1c2d6 fix bracket 2018-04-16 13:33:17 -07:00
David Back
ad85e2b053 pre PR adjustments 2018-04-16 13:12:33 -07:00
David Back
78c0ec5770 remove animations 2018-04-16 12:56:22 -07:00
Zach Fox
02aa8ac566 Bugfixes per QA 2018-04-16 11:53:37 -07:00
Gabriel Calero
e3b94b163c Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-16 14:55:16 -03:00
Zach Fox
071bf35683 Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018 2018-04-16 10:11:44 -07:00
Dante Ruiz
08ea72d71f Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting 2018-04-13 15:39:14 -07:00
David Back
76c7ec69ce Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip 2018-04-13 14:28:14 -07:00
John Conklin II
08ca30cf43
Merge pull request #12870 from druiz17/fix-grab-js 
fix grab.js unable to grab other entities
 2018-04-13 12:17:46 -07:00
John Conklin II
98f6899c3d
Merge pull request #12839 from SamGondelman/matMigrate 
Migrate materials from userData to materialData
 2018-04-12 18:24:33 -07:00
Gabriel Calero
476e1cf7ae Adjust UI with pixel perfect precision. Support devices with on-screen bars. 2018-04-12 17:59:38 -03:00
David Back
243b3637c4 fix grab.js change 2018-04-12 12:41:36 -07:00
Dante Ruiz
43b92299d6 changing highlighting percentage 2018-04-12 10:35:29 -07:00
David Back
09f3b845a8 Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip 2018-04-12 10:17:17 -07:00
Gabriel Calero
8010fd2420 New view selector behaviour. Update icons 2018-04-11 18:43:39 -03:00
Dante Ruiz
7243160dac making requested changes 2018-04-11 14:42:26 -07:00
Dante Ruiz
cdc248129c fix grab.js 2018-04-11 14:25:06 -07:00
Dante Ruiz
ba9d5d18bc make requested changes 2018-04-11 13:30:21 -07:00
Gabriel Calero
578012b662 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-11 16:30:53 -03:00
John Conklin II
2f4bc5bd04
Merge pull request #12701 from misslivirose/fix-edit-grid-color 
Fix for grid color changes not applying
 2018-04-11 12:06:09 -07:00
John Conklin II
28168e6e45
Merge pull request #12699 from misslivirose/fix/save-settings-for-editing 
Fix for edit preferences not persisting
 2018-04-11 11:59:58 -07:00
David Back
59971869f5 desktop equip 2018-04-10 19:06:27 -07:00
Zach Fox
095b4ba5f2 Reduce logging from some Commerce/Discovery features 2018-04-10 16:02:58 -07:00
Zach Fox
01fec2edc7 Prevent the Bubble icon from ever blinking as per 14026 2018-04-10 16:00:35 -07:00
Zach Fox
a2f5891a0b Cleanup 'Private' HMD Preview State Machine Logic 2018-04-10 16:00:18 -07:00
Zach Fox
a9b9a1cb10 Commerce: Gifts 2018-04-10 15:54:19 -07:00
Gabriel Calero
7ee067de35 Merge remote-tracking branch 'upstream/master' into fix_radar_zoom_in 2018-04-10 19:23:55 -03:00
Gabriel Calero
63e17e87b0 Fix radar initial position. Clean radar.js 2018-04-10 19:21:23 -03:00
Liv
c7be6e0934
Update edit.js 
remove the unneeded manual removal of the create setting - it's handled with the rest of the menu items now, and this was causing it to default to false every start..

tested locally but might have gotten in a weird state, so fixing in GH editor.
 2018-04-10 12:15:57 -07:00
Dante Ruiz
54c3f48e65 Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting 2018-04-10 09:32:40 -07:00
Dante Ruiz
447163bd07 clean up scripts 2018-04-10 09:23:40 -07:00
Liv Erickson
20ee169054 two more spaces 2018-04-10 09:23:14 -07:00
Liv Erickson
6c15577653 style fixes for eslint 2018-04-10 09:18:54 -07:00
Dante Ruiz
2e1ebac03f clean up functionality 2018-04-09 18:07:03 -07:00
Dante Ruiz
1113202a90 reverting file 2018-04-09 16:51:20 -07:00
SamGondelman
9b07880aab migrate materials from userData to materialData 2018-04-09 12:49:03 -07:00
Cristian Duarte
d5c252c9ad
Use MyAvatar.goToLocation in radar teleport. 
Use MyAvatar.goToLocation in radar teleport to prevent synchronization issues that make it fail occasionally when directly modifying its world position. It will work just as teleport.js does.
 2018-04-09 16:24:03 -03:00
Gabriel Calero
b30cb25a3f Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-09 12:20:35 -03:00
Gabriel Calero
e85f5c97dc Remove bottom bar. Apply new design for android 2018-04-09 11:41:00 -03:00
Dante Ruiz
2c20593b6d editing equip code 2018-04-06 16:30:45 -07:00
Dante Ruiz
fd47832857 saving changes 2018-04-06 11:47:09 -07:00
Dante Ruiz
07b1a6be01 saving work 2018-04-06 11:01:40 -07:00
Stephen Birarda
1d76dea9f6
Merge pull request #12818 from highfidelity/RC66 
Merge back RC66 to master
 2018-04-06 10:43:01 -07:00
Dante Ruiz
893832f4c7 Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting 2018-04-05 16:01:36 -07:00
Dante Ruiz
cc341e8ad7 highlight nearby entities 2018-04-05 15:38:56 -07:00
Gabriel Calero
36bc5f8416 Fix the view snap when user starts zooming 2018-04-05 15:35:08 -03:00
Zach Fox
8e46ebf83b Prevent Interface from crashing when a Snapshot upload fails 2018-04-05 11:27:26 -07:00
Gabriel Calero
c26ae3592c Merge remote-tracking branch 'upstream/master' into fix_radar_zoom_in 2018-04-05 11:33:07 -03:00
Gabriel Calero
15163f5e87 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-04 19:25:20 -03:00
Gabriel Calero
99d8f822b2 Fix crash selecting domain for second time. Stop rendering while Goto activity is started 2018-04-04 19:24:26 -03:00
John Conklin II
89127a06b3
Merge pull request #12714 from dback2/editUpDownArrowFix 
Fix Y arrow translation handle issues
 2018-04-04 13:46:31 -07:00
Dante Ruiz
42149e295d editing seletion style 2018-04-04 12:55:28 -07:00