Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17451 commits 2 branches 0 tags 1.1 GiB
Commit graph

17451 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
5d67739ab7 Merge pull request #3521 from birarda/domain-wizard 
handle select inputs in domain server settings creation
 2014-10-02 08:36:10 -07:00
Brad Hefta-Gaub
4e752f9bb8 Merge pull request #3520 from Adrianl3d/20082 
CR for Job #20082 - Entity properties bad readable, background is wrong sized
 2014-10-02 08:35:50 -07:00
AndrewMeadows
be3a6e490a Merge pull request #3519 from birarda/master 
add a domain-server scripts folder that is ignored for clean symlink
 2014-10-02 08:35:33 -07:00
Andrzej Kapolka
42e95f2b38 Working on spanner metavoxel edits. 2014-10-01 18:46:23 -07:00
David Rowe
51f229af57 Make recalibrate Leap-on-desk if avatar head or skeleton changes 2014-10-01 18:34:56 -07:00
Stephen Birarda
ae90b38172 add the ice server 2014-10-01 17:19:34 -07:00
Stephen Birarda
d6572c3e2e handle automatic networking changes with data-server 2014-10-01 16:38:44 -07:00
Stephen Birarda
15156519b3 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-01 16:19:16 -07:00
Stephen Birarda
3292808342 update domain network address updating for IP auto networking 2014-10-01 16:19:10 -07:00
David Rowe
38b6d5dd5d Make leapHands.js handle Leap-on-HMD setting changes 2014-10-01 16:05:19 -07:00
stojce
0634d15abb Fix update dialog layout on WIn 2014-10-02 00:49:20 +02:00
stojce
9c926d9e67 Layout changes 2014-10-02 00:17:57 +02:00
David Rowe
84a3f6e8f4 Make recalibrate Leap-on-desk if avatar scale changes 2014-10-01 15:00:19 -07:00
stojce
afc27b8a8b Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-10-01 23:36:30 +02:00
Stephen Birarda
d5b0904d7a handle new automatic networking option in domain-server 2014-10-01 12:08:19 -07:00
Stephen Birarda
2eec6c1401 changes to settings.js to allow for select inputs 2014-10-01 12:00:10 -07:00
Stephen Birarda
a4b4fc52b6 handle select inputs in domain server settings creation 2014-10-01 11:57:44 -07:00
Stephen Birarda
d3cef7e592 add select for automatic networking to describe settings 2014-10-01 11:57:24 -07:00
Andrzej Kapolka
1ca212f43d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-01 11:55:27 -07:00
Stephen Birarda
a0487e0a57 send public and local sockets to data-server in new format 2014-10-01 10:42:14 -07:00
Stephen Birarda
0174a985ee add a domain-server scripts folder that is ignored for clean symlink 2014-10-01 09:56:13 -07:00
ZappoMan
060a690f85 moved the selection display class into own file 2014-10-01 09:46:34 -07:00
ZappoMan
94c2540db0 add dashed line drawing to Base3DOverlay and 3d line and rectangle overlays 2014-10-01 09:45:20 -07:00
ZappoMan
7a9be9e5b9 implement support for localRenderAlpha property in the rendering portion of entities 2014-10-01 09:43:59 -07:00
ZappoMan
e65f383b25 add localRenderAlpha property to entities 2014-10-01 09:43:03 -07:00
Brad Hefta-Gaub
b6fba04d4f Merge pull request #3518 from birarda/master 
move jquery for easier updating in domain-server
 2014-10-01 09:07:26 -07:00
Brad Hefta-Gaub
15ccec676c Merge pull request #3513 from Atlante45/recording_audio_offset 
Recording audio offset
 2014-10-01 09:07:06 -07:00
Stephen Birarda
f1de2ac937 rename jquery for easier updating in domain-server 2014-10-01 09:00:24 -07:00
Atlante45
56acc86f4f Missed some qints 2014-09-30 21:20:37 -07:00
Philip Rosedale
8f40780af0 Merge pull request #3517 from ctrlaltdavid/20048 
CR for Job #20048 - Leap - Make leapHands.js work with Leap-on-Rift
 2014-09-30 21:06:45 -07:00
Brad Hefta-Gaub
22c6298f4d Merge pull request #3516 from thoys/editmodels_js-model-list 
Model List in editmodels.js
 2014-09-30 19:53:57 -07:00
Brad Hefta-Gaub
98fe700105 Merge pull request #3512 from birarda/domain-wizard 
allow user to select domain ID from their High Fidelity domains
 2014-09-30 19:53:11 -07:00
Andrzej Kapolka
4dbd2367f4 Working on shapes for metavoxel edits. 2014-09-30 17:34:01 -07:00
Stephen Birarda
7f2008161d remove a debug line that slipped through the cracks 2014-09-30 17:25:19 -07:00
Andrzej Kapolka
14267e3902 Layout tweak. 2014-09-30 15:42:33 -07:00
Stephen Birarda
ac4a767d60 include memory for auto_ptr 2014-09-30 15:25:40 -07:00
Andrzej Kapolka
add7ad4d4e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-30 15:21:27 -07:00
Andrzej Kapolka
5d2f6b98e2 Added erase buttons, initialize color editor on creation. 2014-09-30 15:20:24 -07:00
Stephen Birarda
4ef2863b79 fix setting posting for checkbox values 2014-09-30 15:01:37 -07:00
Stephen Birarda
cd9029bb92 add some debug to NodeList instance refresh 2014-09-30 14:59:12 -07:00
Stephen Birarda
9950ed9f9f use auto_ptr in NodeList and LimitedNodeList for cleaner mem management 2014-09-30 14:57:32 -07:00
Andrzej Kapolka
70847ff3f9 Allow painting boxes that aren't grid-aligned; merged color and material 
tools.
 2014-09-30 14:53:19 -07:00
ZappoMan
c3b0700601 introduce Planar3DOverlay for common features of rectangle and circle, introduced rectanglular 3D plane 2014-09-30 14:52:44 -07:00
Stephen Birarda
fed7dad2b6 use an auto_ptr to be able to reset the AccountManager 2014-09-30 14:36:32 -07:00
Atlante45
68c25e805a Switch int64 to int 2014-09-30 14:31:40 -07:00
Atlante45
4042df8bfb Merge branch 'master' of https://github.com/highfidelity/hifi into recording_audio_offset 2014-09-30 14:19:31 -07:00
Stephen Birarda
909a6e89a8 resolve conflicts on merge with upstream master 2014-09-30 13:50:04 -07:00
Thijs Wenker
fd21d100f6 line indention fixes 2014-09-30 22:37:29 +02:00
Thijs Wenker
bacad6bcd2 Merge branch 'editmodels_js-model-list' of https://github.com/thoys/hifi 2014-09-30 22:33:50 +02:00
Thijs Wenker
110e26a9e9 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-30 22:32:35 +02:00