Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:33:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45374 commits 71 branches 56 tags 1.2 GiB
Commit graph

45374 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
f04996a53d add the kick permission to domain server settings 2016-08-02 14:35:11 -07:00
Stephen Birarda
5d69c9c81e fix sockaddr choice for local nodes 2016-08-02 14:35:11 -07:00
Stephen Birarda
b1e0e6d708 use replacement for IP address perms, not additive 2016-08-02 14:35:11 -07:00
Stephen Birarda
f7298ef767 add packing of IP perms, small cleanup in packing 2016-08-02 14:35:11 -07:00
Stephen Birarda
cd436355fc cleanup handling of defaults for standard user perms 2016-08-02 14:35:11 -07:00
Stephen Birarda
f8ea180127 match naming of forbidden IP settings group to groups 2016-08-02 14:35:11 -07:00
Stephen Birarda
a674c843c2 add unpack for IP, DRYup unpackPermissions 2016-08-02 14:35:11 -07:00
Stephen Birarda
edce249d2c remove subnet from IP address security 2016-08-02 14:35:11 -07:00
Stephen Birarda
6836b09f87 add sections to DS security for IP/Subnet 2016-08-02 14:35:11 -07:00
Stephen Birarda
d15ac5761b Merge pull request #8197 from sethalves/groups 
Groups
 2016-08-02 14:34:53 -07:00
Ryan Huffman
604c8f4a36 Merge pull request #8337 from humbletim/fix-Assets-getMapping 
fix Assets.getMapping(path, callback) to return a value
 2016-08-01 13:32:08 -07:00
Seth Alves
708bd33056 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-08-01 12:00:13 -07:00
Seth Alves
60d6673950 switch data-web urls to point at production server rather than dev one 2016-08-01 12:00:08 -07:00
Seth Alves
c72cfb165c damnit 2016-07-29 18:33:06 -07:00
Anthony Thibault
f71a59276c Merge pull request #8317 from hyperlogic/bug-fix/web3doverlay-rendering 
Fix alpha cut-outs and incorrect gamma on web overlays and entities
 2016-07-29 17:44:46 -07:00
Seth Alves
2443166d78 update for new friends api 2016-07-29 16:41:17 -07:00
Seth Alves
ebdfede89f switch to new friends api 2016-07-29 16:34:59 -07:00
Seth Alves
11cf01e5ae Merge branch 'groups' of github.com:sethalves/hifi into groups 2016-07-29 13:10:30 -07:00
Seth Alves
8e1820f911 make sure permissions have the correct ID in the case where a user has been verified 2016-07-29 13:10:14 -07:00
Seth Alves
00370b0151 Merge pull request #5 from AlexanderOtavka/groups-ui 
Fix new group message to be more intuitive
 2016-07-29 10:22:16 -07:00
Zander Otavka
39c8ce2a1a Fix new group message to be more intuitive 2016-07-29 10:19:18 -07:00
Seth Alves
954c88188c Merge branch 'groups-ui' of github.com:AlexanderOtavka/hifi into groups 2016-07-29 08:15:35 -07:00
Seth Alves
507410af79 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-29 08:14:15 -07:00
Anthony Thibault
8e3bc97ef9 fix for unused variable warnings 2016-07-29 08:10:10 -07:00
Zander Otavka
bcff561eb8 Add category collapsing and expanding 2016-07-28 18:14:00 -07:00
Zach Pomerantz
a9c6d69aa6 Merge pull request #8328 from ZappoMan/punishSlowScripts 
Fix punished scripts stopping behavior and application shutdown while scripts being punished
 2016-07-28 17:42:02 -07:00
Zander Otavka
987a8c802f Add basic input validation 2016-07-28 17:21:40 -07:00
Zander Otavka
aa909a1366 Polish category/row addition and deletion 2016-07-28 17:21:40 -07:00
Zander Otavka
93f9f93b5a Enable adding groups 2016-07-28 17:21:40 -07:00
Zander Otavka
3234de9f92 Add category headers to groups 2016-07-28 17:21:40 -07:00
Seth Alves
2f80c5b68c Merge pull request #8327 from PhilipRosedale/autoReverb 
Tuned haptic pulses for grab, release, equip, de-quip
 2016-07-28 16:38:44 -07:00
Brad Hefta-Gaub
e879f22c95 fix behavior with no entity server 2016-07-28 15:15:52 -07:00
Brad Hefta-Gaub
74a3835a1e CR feedback 2016-07-28 15:15:33 -07:00
Anthony Thibault
ea310bcc43 Web Entities now render correctly as well 2016-07-28 14:11:19 -07:00
Anthony Thibault
be6e401e9a Merge branch 'master' into bug-fix/web3doverlay-rendering 2016-07-28 11:20:35 -07:00
Brad Hefta-Gaub
22619a66ba process events also 2016-07-28 10:51:17 -07:00
Anthony Thibault
6b8e912114 Fix for mac and linux builds 2016-07-28 10:02:19 -07:00
Brad Hefta-Gaub
755989b8ff don't allow punished scripts to slow stop or shutdown 2016-07-28 10:01:05 -07:00
Eric Levin
5167809342 release near and far grab at trigger click detent 2016-07-28 08:51:11 -07:00
Eric Levin
f37570dc9a only pulse on release when held 2016-07-28 08:23:45 -07:00
humbletim
3e0ef7d43a make Assets.getMapping(path) actually return the mapping 2016-07-28 10:13:30 -04:00
Seth Alves
5a96c8bf57 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-27 18:07:29 -07:00
Eric Levin
0f7f9990c2 Tuned haptic pulses for grab, release, equip, de-quip 2016-07-27 17:58:24 -07:00
Seth Alves
cd2f61c90c if logging in, send username signature even when connecting to localhost 2016-07-27 14:03:51 -07:00
Seth Alves
390ee9aaeb clean up some code, add some debugging prints 2016-07-27 14:03:32 -07:00
Seth Alves
3a3b1489c6 code review 2016-07-27 11:46:52 -07:00
Seth Alves
8663b260f6 code review -- applyPermissionsForUser to setPermissionsForUser, don't take input permissions as an argument 2016-07-27 10:14:18 -07:00
Seth Alves
d69d5bff28 remove redundant call to userPerms.setVerifiedUserName 2016-07-27 10:06:02 -07:00
Seth Alves
a2d35df34e fix a couple of mistakes made during code-review response 2016-07-27 09:57:57 -07:00
Seth Alves
bc2ded2f97 code review 2016-07-27 08:46:46 -07:00