Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 00:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67556 commits 25 branches 0 tags 1.1 GiB
Commit graph

5664 commits

Author SHA1 Message Date
samcake
cc582cf2ce Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-11 12:34:55 -07:00
samcake
02be965271 more stuff fixed 2018-05-10 18:10:01 -07:00
John Conklin II
4129664368
Merge pull request #13145 from highfidelity/stable 
Merge RC67 stable into master
 2018-05-10 17:07:20 -07:00
John Conklin II
64d3219ee1
Merge pull request #12746 from gcalero/fix_radar_zoom_in 
Android: Fix zoom in unresponsive in radar mode
 2018-05-10 13:14:52 -07:00
Sam Gateau
bf85034f36 Tree view comming together for the engine! 2018-05-10 02:08:19 -07:00
samcake
f08f77098d Adding a true ListView for the engine 2018-05-09 18:28:47 -07:00
Gabriel Calero
e0b57a2228 Code review in radar.js 2018-05-09 18:20:19 -03:00
samcake
70a570d958 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-09 11:31:59 -07:00
samcake
859b187db6 Separate panel for inspecting the engine 2018-05-08 18:17:52 -07:00
Dante Ruiz
1a0ded4526 adding windows 2018-05-08 15:10:57 -07:00
Dante Ruiz
0513204781 fix hmd.js 2018-05-08 15:05:55 -07:00
Stephen Birarda
4165ab3667 Merge branch 'RC67' of github.com:highfidelity/hifi into 67-to-master 2018-05-08 14:08:21 -07:00
samcake
728577dfd8 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-08 11:46:01 -07:00
Zach Fox
c5ebc436ce Merge branch 'master' of github.com:highfidelity/hifi into MS14878_preventPasswordLeak 2018-05-08 09:40:53 -07:00
Dante Ruiz
a593209ec1 remove highlight when point to the sky 2018-05-07 15:33:12 -07:00
Zach Fox
fd4530e671 MS3128: Remove vestigal Edit menu item 2018-05-07 14:39:31 -07:00
Zach Fox
646c0ec987 MS14878: Prevent wallet passphrase leak in specific case 2018-05-07 11:56:47 -07:00
samcake
86b2eb0829 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-07 11:11:20 -07:00
John Conklin II
1e6e182c63
Merge pull request #13090 from druiz17/fix-entity-highlighting 
fix highlighting issues (master)
 2018-05-07 10:20:38 -07:00
Sam Gateau
9b65e0771b Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-05 12:17:20 -07:00
samcake
6424b91e86 Templatizing the timeProfiler for the task 2018-05-04 17:58:21 -07: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
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
Sam Gateau
e1d063e908 Adding the scripts for Jet 2018-05-04 00:01:48 -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
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
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
c15ef56d90 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 14:38:10 -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
Liv Erickson
7db07db9e2 remove menu item at cleanup 2018-04-30 13:55:01 -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
John Conklin II
eef3bc2df5
Merge pull request #12980 from dback2/desktopEquip 
Desktop equip - deleted/cleared entities fix
 2018-04-25 11:35:04 -07:00