Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 19:01:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13104 commits 75 branches 59 tags 1.2 GiB
Commit graph

3783 commits

Author SHA1 Message Date
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
Brad Hefta-Gaub
b4759e02f4 Merge pull request #2888 from Barnold1953/master 
Windows audio and mesh crash
 2014-05-21 11:01:48 -07:00
Stephen Birarda
1dddabb691 send and confirm transactions to assigned nodes from DS 2014-05-21 10:58:41 -07:00
Stephen Birarda
981f9df6b3 add option to pass data server username and password to DS 2014-05-21 09:53:09 -07:00
barnold1953
661de7c62b Fixed poor coding standard 2014-05-20 17:46:52 -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
13077e48f8 handle types larger than 255 for packetVersionAndHashMatch 2014-05-20 15:45:08 -07:00
ZappoMan
412e870f98 add support for backward compatibility in old versions of models.svo 2014-05-20 15:32:50 -07:00
ZappoMan
e7425a8128 support for models in root element 2014-05-20 15:20:27 -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
Stephen Birarda
a9c2e3fe71 put back ssize_t definition 2014-05-20 11:56:06 -07:00
Stephen Birarda
2ef822d19d remove more gnutls includes 2014-05-20 11:26:22 -07:00
Stephen Birarda
f22aaf21d2 remove GnuTLS include across repo 2014-05-20 10:56:34 -07:00
Stephen Birarda
e3dd6509d8 remove dependency on GnuTLS for later replacement with OpenSSL 2014-05-20 10:47:11 -07:00
Stephen Birarda
0e7615391c don't look for GnuTLS from cmake 2014-05-20 10:35:04 -07:00
Atlante45
0f19890048 Fixes filesystem issue between Qt and Windows 2014-05-18 19:27:43 -07:00
Andrzej Kapolka
c99a60ce66 Merge pull request #2872 from ZappoMan/modelserver 
Bug Fixes in Models
 2014-05-16 17:20:25 -07:00
ZappoMan
bb204154a1 tweak 2014-05-16 16:59:58 -07:00
ZappoMan
51ad8194de fix two bugs in models not rendering 2014-05-16 16:55:37 -07:00
ZappoMan
0e446d0fc5 fix two bugs in models not rendering 2014-05-16 16:53:14 -07:00
ZappoMan
e7513ff7c6 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-16 10:40:41 -07:00
ZappoMan
f5b4e1da37 fix potential floating point error when animations have no frames 2014-05-16 10:00:35 -07:00
Andrzej Kapolka
e415006526 Fixed index of out bounds error, issue with head not being tracked in 
PrioVR.
 2014-05-15 18:22:57 -07:00
Stephen Birarda
8e9defad3e send an updated address to data-server with domain (when changed) 2014-05-15 12:18:24 -07:00
ZappoMan
0db242bbaa cleanup debug 2014-05-15 00:46:09 -07:00
ZappoMan
62eb8335e9 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-15 00:40:47 -07:00
ZappoMan
ca2d2c751c fixing models not rendering sometimes 2014-05-15 00:34:09 -07:00
Philip Rosedale
186f7766fc Merge pull request #2856 from ZappoMan/modelserver 
Animation Support in Models
 2014-05-14 15:03:49 -07:00
ZappoMan
f6c1d3e635 clean up animations 2014-05-14 14:00:31 -07:00
Andrzej Kapolka
2cc3720217 Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-14 13:55:31 -07:00
ZappoMan
0c34d9e065 cleanup remove some debug 2014-05-14 12:59:59 -07:00
ZappoMan
18de6dddec Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-14 12:21:44 -07:00
Andrzej Kapolka
c99f3edbd8 Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-14 11:01:10 -07:00
Atlante45
4f93858849 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels 2014-05-14 10:41:29 -07:00
Atlante45
5ef71d6a35 Full mouse handling 2014-05-14 10:40:50 -07:00
Brad Hefta-Gaub
8bb5b90f05 Merge pull request #2852 from huffman/19614 
Code Review for Job #19614
 2014-05-14 10:40:14 -07:00
Andrzej Kapolka
3db3154a5b Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-14 10:29:58 -07:00
Andrzej Kapolka
498f9e73ac Merge branch 'master' of https://github.com/highfidelity/hifi into priority 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2014-05-14 10:23:44 -07:00
Brad Hefta-Gaub
6b03a12f03 Merge pull request #2853 from huffman/fix-print 
Fix bug with js print() breaking on certain characters
 2014-05-14 10:23:31 -07:00
Ryan Huffman
a5c10220e6 Remove _ prefix from private methods in XMLHttpRequest 2014-05-14 10:16:04 -07:00
Ryan Huffman
c16654628a Add carriage return to escaped string in print() 2014-05-14 10:08:54 -07:00
Ryan Huffman
bd56ab911d Fix bug with js print() breaking on certain characters 
The message text needs to be escaped before beign evaluated.
 2014-05-14 10:05:04 -07:00
Brad Hefta-Gaub
fecd56d177 Merge pull request #2851 from AndrewMeadows/bispinor 
removal of FingerData revisited
 2014-05-14 10:02:16 -07:00
Stephen Birarda
efdc61c612 Merge pull request #2849 from stojce/19597 
added discourse key in shift operators
 2014-05-14 10:00:37 -07:00
Ryan Huffman
dca555a8d4 Merge branch 'master' of git://github.com/highfidelity/hifi into 19614 2014-05-14 09:58:59 -07:00
Ryan Huffman
310f184978 Add getters for onTimeout and onReadyStateChange 2014-05-14 09:53:44 -07:00
Andrew Meadows
aad9d0441e merge upstream/master to andrew/bispinor 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/SkeletonModel.cpp
	libraries/avatars/src/HandData.cpp
	libraries/avatars/src/HandData.h
 2014-05-14 09:38:31 -07:00
Andrew Meadows
366e9c7d34 PalmDataA::getPalmDirection --> getNormal() 2014-05-14 09:05:54 -07:00