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
13132 commits 2 branches 0 tags 1.1 GiB
Commit graph

13132 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
01e8d775f2 change node auth URL to data.highfidelity.io 2014-05-22 14:24:19 -07:00
Brad Hefta-Gaub
497335cbc1 Merge pull request #2900 from ZappoMan/deletemodel 
fix broken mouse edit
 2014-05-22 13:01:27 -07:00
ZappoMan
b5056dcd3a fix broken mouse edit 2014-05-22 13:01:02 -07:00
Clément Brisset
2c484794ad Merge pull request #2898 from ZappoMan/deletemodel 
added delete support to edit models
 2014-05-22 12:45:21 -07:00
ZappoMan
66b9d582a8 fix broken mouse edit 2014-05-22 12:43:23 -07:00
ZappoMan
b9e73a6ef7 added delete support to edit models 2014-05-22 12:23:01 -07:00
Clément Brisset
e381f6d046 Merge pull request #2897 from AndrewMeadows/thermonuclear 
Fix for bad bounding shape for multi-root models.
 2014-05-22 12:14:42 -07:00
Andrew Meadows
b0c3655076 Fix for bad bounding shape for multi-root models. 2014-05-22 11:40:36 -07:00
Brad Hefta-Gaub
f0143f0c9f Merge pull request #2896 from Atlante45/log_cleaning 
Clean up log
 2014-05-22 11:26:23 -07:00
Atlante45
ea1359c10f Clean up log 2014-05-22 11:11:22 -07:00
Philip Rosedale
3aa999bfc3 Merge pull request #2895 from PhilipRosedale/master 
Fly and move/turn using one controller and grab button
 2014-05-22 10:33:34 -07:00
Philip Rosedale
5c564cb2cb Added FWD button as grab controller (so PrioVR will work) 2014-05-22 09:55:08 -07:00
Philip Rosedale
f0a1d2a172 Move with grab button 2014-05-22 07:24:30 -07:00
AndrewMeadows
21b89b9940 Merge pull request #2894 from Barnold1953/master 
Oculus camera mode and mirror view fixes
 2014-05-21 17:58:38 -07:00
barnold1953
dad2788b8c Moved 'I am looking at' ball to be immediately above name text, and reduced opacity 2014-05-21 17:45:17 -07:00
barnold1953
5b366fe714 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/Application.cpp
 2014-05-21 16:01:28 -07:00
barnold1953
97c0a2fc98 Made mirror view remain constant no matter what the avatar scale is set to. 2014-05-21 15:32:23 -07:00
Brad Hefta-Gaub
0758611243 Merge pull request #2893 from ZappoMan/master 
fix crash in model server when you attempt to create an unreasonably small model
 2014-05-21 15:22:20 -07:00
Brad Hefta-Gaub
5e31489fd6 Merge pull request #2892 from ey6es/animenu 
Allow setting masked joints for each animation.  Fixed a couple compile warnings.
 2014-05-21 15:14:37 -07:00
ZappoMan
f876a72b37 fix crash in model server when you attempt to create an unreasonably small model 2014-05-21 15:12:36 -07:00
Andrzej Kapolka
906e082215 If there are no animation frames in the model, treat its default position as 
a single frame.
 2014-05-21 13:56:20 -07:00
Andrzej Kapolka
8bb4ca19cd Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 12:48:20 -07:00
barnold1953
21f03a4fb5 Made oculus camera modes only active when AllowOculusCameraModeChange is checked. 2014-05-21 12:43:44 -07:00
Philip Rosedale
79ff87f7c5 Merge pull request #2891 from birarda/credits 
initial pass at crediting ACs for work done
 2014-05-21 12:09:48 -07:00
Stephen Birarda
e3ac7c5eec rename assignment payment method for clarity 2014-05-21 12:07:23 -07:00
Andrzej Kapolka
709a9d75f6 Provide an option for the masked joints in the scriptable method, fix a couple 
of annoying warnings.
 2014-05-21 12:03:47 -07:00
Andrzej Kapolka
d4468364f9 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 11:58:46 -07:00
Andrzej Kapolka
0e15c82e49 Allow setting masked joints for each animation. 2014-05-21 11:58:20 -07:00
Philip Rosedale
67206af840 Merge pull request #2887 from ey6es/animenu 
First pass at configurable animations for own avatar.
 2014-05-21 11:39:16 -07:00
barnold1953
b5ad295756 Fixed improper coding style in previous pull request 2014-05-21 11:24:39 -07:00
barnold1953
3bc8e0f726 Made third person work with oculus 2014-05-21 11:21:12 -07:00
Stephen Birarda
98d1146e90 rename the pay for assignments option 2014-05-21 11:04:00 -07:00
Andrzej Kapolka
20a931178d Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 11:03:55 -07:00
Brad Hefta-Gaub
a88de84b1e Merge pull request #2875 from binaryking/19666 
Code Review for Job #19666
 2014-05-21 11:02:29 -07:00
Andrzej Kapolka
6797d1ad81 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 11:02:05 -07:00
Stephen Birarda
b7727f0b16 require a flag to enable payment to assigned nodes 2014-05-21 11:02:02 -07:00
Brad Hefta-Gaub
b4759e02f4 Merge pull request #2888 from Barnold1953/master 
Windows audio and mesh crash
 2014-05-21 11:01:48 -07:00
Brad Hefta-Gaub
0c3f574302 Merge pull request #2890 from Atlante45/no_voxel_tool_selected 
Made voxelTools unselected by default to avoid accidental voxelEdit at l...
 2014-05-21 11:01:31 -07:00
Andrzej Kapolka
ef9407b1a6 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 10:58:44 -07:00
Stephen Birarda
1dddabb691 send and confirm transactions to assigned nodes from DS 2014-05-21 10:58:41 -07:00
Clément Brisset
653b89353d Merge pull request #2889 from ZappoMan/bugfix 
Couple of Model Bug Fixes
 2014-05-21 10:53:20 -07:00
Andrzej Kapolka
0dfd787034 Added some basic method to allow scripts to run/stop animations on the avatar. 2014-05-21 10:44:51 -07:00
barnold1953
407a98f00e Added realWorldFieldOfView to preferences. 2014-05-21 10:41:33 -07:00
Atlante45
9b3b5201c9 Made voxelTools unselected by default to avoid accidental voxelEdit at login 2014-05-21 10:39:26 -07:00
Stephen Birarda
908eb5cc4f use OAuth provider URL for transaction login 2014-05-21 10:04:48 -07:00
Stephen Birarda
981f9df6b3 add option to pass data server username and password to DS 2014-05-21 09:53:09 -07:00
Andrzej Kapolka
1022f1bec4 Added a priority setting so that we can control the order in which animations 
are applied.
 2014-05-21 09:40:49 -07:00
Stephen Birarda
68705c3a40 Merge branch 'master' of https://github.com/highfidelity/hifi into credits 2014-05-21 09:26:57 -07:00
Stephen Birarda
ee67c64b76 stub sending of transactions to server 2014-05-21 09:26:17 -07:00
barnold1953
742543317c Stopped magnifying FOV when wearing Oculus. 2014-05-21 09:12:28 -07:00