Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 13:39:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45492 commits 76 branches 59 tags 1.2 GiB
Commit graph

45492 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
James B. Pollack
41aa485f11 one hand teleprt 2016-08-02 12:52:35 -07:00
James B. Pollack
7fae7e9c77 cleanup 2016-08-02 12:26:37 -07:00
James B. Pollack
108e7a2fc1 Merge remote-tracking branch 'upstream/master' into tweak_lazers 2016-08-02 12:25:27 -07:00
James B. Pollack
a7b8f2c9df updates 2016-08-02 12:25:24 -07:00
Seth Alves
79121133df remove unneeded change 2016-08-02 12:00:45 -07:00
Seth Alves
528f417f74 Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails 2016-08-02 11:55:17 -07:00
Seth Alves
f91df4997d re-enable falling-back to default avatar if an avatar's url is bad 2016-08-02 11:55:11 -07:00
Seth Alves
75f9626c2d if MyAvatar simulation is cut short (due to no skeleton), still update the head position 2016-08-02 11:50:53 -07:00
Seth Alves
56af36ae64 set head position of other avatars even if they can't be drawn 2016-08-02 11:29:43 -07:00
Seth Alves
229b8d3b5e testing a more explicit fix of the audio failure 2016-08-02 10:46:11 -07:00
Seth Alves
ed4b0b3589 call _skeletonModel.setURL, but leave our copy of _skeletonModelURL alone. This is so that we don't redo this every time we receive an identity packet from the avatar with the bad url. 2016-08-02 09:57:17 -07:00
Seth Alves
b953e6f0ff when an avatar URL fails, switch to the default 2016-08-01 18:12:30 -07:00
David Rowe
31ac7a2812 Add OverlayWebWindow resized, moved, and closed signals 2016-08-02 12:40:01 +12: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
David Rowe
18b0ed9e8f Close file browser dialog immediately after selecting asset to upload 2016-07-30 14:16:08 +12: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
Ryan Huffman
5d50389e29 Make updates to the hmd progress bar 2016-07-29 17:17:59 -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
David Rowe
800c2b9ec0 Refresh file dialog when directory content changes 2016-07-30 11:21:40 +12: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
Ryan Huffman
9f6da23b15 Update progress bar images 2016-07-29 10:11:28 -07:00
Ryan Huffman
6279b96223 Add minor tweaks to progress.js 2016-07-29 10:11:12 -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
Ryan Huffman
91f847a7f0 Update progress bar image 2016-07-28 17:24:35 -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
Ryan Huffman
58932a6806 Add reset of progress bar when domain changes 2016-07-28 17:13:05 -07:00
Ryan Huffman
a786224297 Add easing back to progress.js 2016-07-28 16:55:45 -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
Ryan Huffman
873e7b63df Update progress-bar.svg 2016-07-28 16:26:12 -07:00
Ryan Huffman
c1b86fe3d2 Update progress.js to only track total number of downloads 2016-07-28 16:16:11 -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