Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 11:53:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13105 commits 71 branches 56 tags 1.2 GiB
Commit graph

13105 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
f0a1d2a172 Move with grab button 2014-05-22 07:24:30 -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
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
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
Mohammed Nafees
1714f7fb27 Merge branch master from upstream 2014-05-21 11:29:19 +05:30
Andrzej Kapolka
f709ea61b5 Need to initialize this to false. 2014-05-20 17:55:48 -07:00
barnold1953
661de7c62b Fixed poor coding standard 2014-05-20 17:46:52 -07:00
barnold1953
eb5b0c4ddf Made OR work with different camera modes. 2014-05-20 17:43:46 -07:00
Andrzej Kapolka
09af6778aa Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-20 17:11:12 -07:00
Andrzej Kapolka
7124b4a196 Mask joints from animation when explicitly set. 2014-05-20 17:10:53 -07:00
Stephen Birarda
5b3b19011e display pending credits in DS web page 2014-05-20 17:04:41 -07:00
Brad Hefta-Gaub
6bb4664611 Merge pull request #2884 from polac/19521 
Code Review for Job #19521
 2014-05-20 17:02:30 -07:00
Brad Hefta-Gaub
a29a9dad70 Merge pull request #2882 from ey6es/master 
Restore specular lighting--but, per the OpenGL spec, shut off specular
 2014-05-20 17:01:32 -07:00
Stephen Birarda
99a3fde8fa accumulate credits to pay nodes, return in assignments JSON 2014-05-20 16:57:19 -07:00
ZappoMan
2665f3af67 properly bail on version mismatch 2014-05-20 16:31:03 -07:00
barnold1953
eccf99c175 Stopped windows crash when FBXMeshPart::triangleIndices.size() is not 
divisible by three. There is probably an issue in extractMesh()
 2014-05-20 16:20:29 -07:00
ZappoMan
22a6e4679a properly discard piggy back packets that don't match expected version 2014-05-20 16:19:14 -07:00
Stephen Birarda
8fb85110ac add a timer to initiate payment to assigned nodes 2014-05-20 15:59:00 -07:00
Stephen Birarda
072343ce79 associate assignment wallet UUID with node via DomainServerNodeData 2014-05-20 15:50:09 -07:00
Stephen Birarda
13077e48f8 handle types larger than 255 for packetVersionAndHashMatch 2014-05-20 15:45:08 -07:00
Andrzej Kapolka
d3e5e3ccf1 A couple explanatory comments. 2014-05-20 15:41:11 -07:00
ZappoMan
412e870f98 add support for backward compatibility in old versions of models.svo 2014-05-20 15:32:50 -07:00
Stephen Birarda
b42e005cdb add pending assignment purgatory for assignees 2014-05-20 15:28:45 -07:00
Andrzej Kapolka
dd5d3c5591 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-20 15:23:41 -07:00
Andrzej Kapolka
49a0645677 Animation bits. 2014-05-20 15:23:15 -07:00
ZappoMan
e7425a8128 support for models in root element 2014-05-20 15:20:27 -07:00
barnold1953
2329188939 Stopped windows crash when no audio device is detected 2014-05-20 15:15:45 -07:00
Stephen Birarda
8a1fdf3486 pass wallet UUID from AC to DS, cleanup noisy timer 2014-05-20 14:38:51 -07:00
ZappoMan
1278470a91 properly handle FSTs that have translations and rotations 2014-05-20 13:31:08 -07:00
Brad Hefta-Gaub
899c89eda7 Merge pull request #2885 from birarda/remove-gnutls 
remove dependency on GnuTLS for later replacement with OpenSSL
 2014-05-20 12:08:14 -07:00
Stephen Birarda
a9c2e3fe71 put back ssize_t definition 2014-05-20 11:56:06 -07:00