Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 19:27:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43848 commits 75 branches 59 tags 1.2 GiB
Commit graph

43848 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
1977efae4f Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-08 10:36:52 -07:00
Seth Alves
8085266c1d cause names in permissions tables to be alpha-sorted 2016-06-08 10:36:44 -07:00
Brad Hefta-Gaub
d0e946c907 Merge pull request #8034 from ctrlaltdavid/20953 
fix colors of buttons in Asset Browser dialog
 2016-06-08 07:47:34 -07:00
Brad Hefta-Gaub
338557358d Merge pull request #8035 from Atlante45/master 
Fix OS X warning
 2016-06-07 18:17:58 -07:00
Brad Hefta-Gaub
80100b1d34 Merge pull request #8000 from Atlante45/feat/plugins 
Select/Disable plugins via command line args
 2016-06-07 18:17:29 -07:00
Brad Hefta-Gaub
9a0076d4f1 Merge pull request #8028 from ctrlaltdavid/20949 
add "Load Defaults" button to Running Scripts dialog
 2016-06-07 17:09:29 -07:00
Brad Hefta-Gaub
6603289de9 Merge pull request #8029 from SamGondelman/constantTurn 
Fixed constant turn of 22.5 degrees in comfort mode
 2016-06-07 17:09:07 -07:00
Atlante45
71fb0e665f Fix OSX warning 2016-06-07 16:46:32 -07:00
Seth Alves
7696ead012 look for standard permissions in standard table rather than in user table 2016-06-07 16:38:52 -07:00
Seth Alves
b2f63a2132 hook up can-rez-tmp and can-write-to-asset-server 2016-06-07 16:17:58 -07:00
David Rowe
a87483dfff Fix colors of buttons in Asset Browser dialog 2016-06-08 10:55:14 +12:00
Seth Alves
3bfcc865bd Merge branch 'permissions-grid-ui' of github.com:sethalves/hifi into permissions-grid 2016-06-07 14:43:42 -07:00
Seth Alves
a1051da484 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-07 14:43:35 -07:00
David Rowe
f3f04fba97 Fix IE displaying checkboxes too large 2016-06-08 09:41:31 +12:00
David Rowe
801981816b Add permissions tool-tips 2016-06-08 09:11:37 +12:00
Howard Stearns
38d0d28603 Merge pull request #8021 from AndrewMeadows/walk-follows-camera 
camera steers avatar when walking
 2016-06-07 10:43:01 -07:00
David Rowe
f2d81f1338 Add security table heading groups 2016-06-07 17:46:45 +12:00
David Rowe
0119af11d6 Finesse security table text and general layout 2016-06-07 17:46:28 +12:00
David Rowe
a4be536a82 Change table switches to checkboxes; vertically align table rows 2016-06-07 17:46:07 +12:00
SamGondelman
509f889c0d fixed constant turn of 22.5 degrees 2016-06-06 18:40:12 -07:00
Seth Alves
e16d1fdc23 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-06 16:32:26 -07:00
Seth Alves
0c18df6278 don't restart domain-server if the only settings changes where permissions 2016-06-06 16:32:18 -07:00
David Rowe
b6af46cac9 Add "Load Defaults" button to Running Scripts dialog 
And rename "Stop All" to "Remove All".
 2016-06-07 11:30:07 +12:00
Brad Hefta-Gaub
30526374bc Merge pull request #7996 from ctrlaltdavid/get-entity-children 
add Entities.getChildrenIDs() method
 2016-06-06 16:25:25 -07:00
Atlante45
399517fcbd Activate Inputs after menus are setup 2016-06-06 13:28:36 -07:00
Atlante45
26acc6fd8b Typo 2016-06-06 13:28:36 -07:00
Atlante45
24bbb8db3f Remove input plugin menu dependency 2016-06-06 13:28:36 -07:00
Atlante45
6f75fab298 Revert header changes 2016-06-06 13:28:36 -07:00
Atlante45
b635e32933 Rename Mac only Oculus display plugin 2016-06-06 13:28:36 -07:00
Atlante45
ee62a211ac Remove "Input Devices" menu 2016-06-06 13:28:36 -07:00
Atlante45
992fa63932 Allow ordered list of preferred plugins 2016-06-06 13:28:36 -07:00
Atlante45
932838b1e3 Setup preferred display plugin 2016-06-06 13:28:36 -07:00
Atlante45
d8493f960a Add command line option to enable/disable plugins 2016-06-06 13:28:36 -07:00
Atlante45
3dadb515f3 Add plugins name to their metadata file 2016-06-06 13:28:36 -07:00
Brad Hefta-Gaub
5190d8ab6b Merge pull request #8023 from jherico/settings 
Eliminate extraneous writes for unchanged values
 2016-06-06 12:22:11 -07:00
Brad Hefta-Gaub
b4721ec57e Merge pull request #7973 from ctrlaltdavid/clipboard-dimensions 
add Clipboard.getContentsDimensions() JavaScript method
 2016-06-06 12:03:10 -07:00
Brad Hefta-Gaub
11effb6feb Merge pull request #8007 from hyperlogic/feature/avatar-recording-version 
Add version number to avatar recording frame
 2016-06-06 12:02:49 -07:00
Brad Hefta-Gaub
1782a6ba4a Merge pull request #8011 from hyperlogic/bug-fix/remove-avatar-data-warning 
Removed innocuous "AvatarData packet size mismatch" warning
 2016-06-06 12:02:34 -07:00
Seth Alves
d202a2bf11 better handling of missing settings keys 2016-06-06 11:59:39 -07:00
Seth Alves
a4e4093a18 split permissions into two sets, one for 'standard' ones and one for specific users 2016-06-06 10:39:47 -07:00
Seth Alves
880c4f18b5 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-05 08:27:59 -07:00
Andrew Meadows
e6844e2468 use world-UP rather than head-UP 2016-06-04 21:11:31 -07:00
Brad Hefta-Gaub
f2bedc546f Merge pull request #8019 from jherico/settings 
Eliminate file IO contentions for settings
 2016-06-04 21:04:50 -07:00
Brad Hefta-Gaub
9ef7e82270 Merge pull request #8020 from highfidelity/revert-7991-aoighost_builddocs_securityfixes 
Revert "Update the build docs for a better OpenSSL security posture."
 2016-06-04 21:01:03 -07:00
Andrew Meadows
49c835b6fc use camera twist for walk steering 2016-06-04 20:53:30 -07:00
Andrew Meadows
062711b202 Revert "Update the build docs for a better OpenSSL security posture." 2016-06-04 20:51:21 -07:00
Brad Davis
bc81f00dc7 Eliminate extraneous writes for unchanged values 2016-06-04 20:47:10 -07:00
Brad Davis
65d8f65ed7 Fix unix builds, make settings ACID 2016-06-04 18:39:46 -07:00
Brad Davis
39dcd1f9bd Eliminate file IO contentions for the settings 2016-06-04 17:55:30 -07:00
Brad Hefta-Gaub
d9542107c2 Merge pull request #8006 from AndrewMeadows/convexification-2 
fix bad convex hull simplification
 2016-06-04 16:58:03 -07:00