Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:33:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11078 commits 71 branches 56 tags 1.2 GiB
Commit graph

11078 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
450a9c03a7 revert changes 2014-03-18 23:54:23 -07:00
Philip Rosedale
9c8a4828f2 remove unused variable, function 2014-03-18 22:41:09 -07:00
Philip Rosedale
cad11978be Merge pull request #2368 from birarda/master 
suppress constant packet version mismatch debug
 2014-03-18 22:39:20 -07:00
Philip Rosedale
408151d842 Merge pull request #2363 from RyanDowne/master 
removing fly to voxel option
 2014-03-18 22:38:25 -07:00
Philip Rosedale
83026fa2ca added skeet to gun, display joint names to log in crazy legs 2014-03-18 22:22:40 -07:00
Philip Rosedale
24c779e551 Fix bug in extrusion deleting first voxel made 2014-03-18 22:05:51 -07:00
Philip Rosedale
e447818f77 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-18 18:20:57 -07:00
Andrzej Kapolka
1f55b905f2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-18 17:50:49 -07:00
Andrzej Kapolka
250f648f6f Merge pull request #2371 from AndrewMeadows/master 
fix bad startPosition in datagram unpack
 2014-03-18 17:50:39 -07:00
Andrzej Kapolka
f9fd0d432f Fix for reading aggregate avatar packets. 2014-03-18 17:48:57 -07:00
Atlante45
a80f81c246 typo 2014-03-18 17:48:17 -07:00
ZappoMan
499c4bd500 fix octree server crashes on various shutdown corner cases 2014-03-18 17:44:53 -07:00
Andrew Meadows
6340024daa fix bad startPosition in datagram unpack 
The startPosition was wrong (too far back) and the bytesRead return
value was too big and the unpacking of the second chunk of the
datagram would start in the middle of the chunk.
 2014-03-18 17:42:58 -07:00
Atlante45
93f66b074a Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-18 17:37:07 -07:00
Atlante45
76c2a9fdad Modified Browser to be able to dowload all the fst file when there are more than 1000 2014-03-18 17:36:05 -07:00
Andrzej Kapolka
6d0269d537 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-18 17:20:44 -07:00
Andrzej Kapolka
0fc0d50bda Only post the blender if we have blendable meshes to blend. 2014-03-18 17:19:42 -07:00
Philip Rosedale
d947b17d8a Merge branch 'master' of https://github.com/worklist/hifi 2014-03-18 17:19:06 -07:00
Stephen Birarda
f86b793c96 only output version mismatch once per sender per packet 2014-03-18 17:14:57 -07:00
Philip Rosedale
caf9de5463 Merge pull request #2365 from birarda/master 
fix for packet version mismatch
 2014-03-18 17:14:35 -07:00
Andrzej Kapolka
f8c14a5717 Remove unused variable, reorder includes. 2014-03-18 17:06:01 -07:00
Stephen Birarda
281f2c6614 return false in packetVersionAndHashMatch on version mismatch 2014-03-18 17:04:27 -07:00
Andrzej Kapolka
635f3b6dc3 Perform the mesh blending in worker threads and only when we've actually 
received new data.  Closes #2075.  Closes #2348.
 2014-03-18 16:38:05 -07:00
Philip Rosedale
c129e294b0 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-18 16:34:02 -07:00
ZappoMan
220232312d remove unused variables 2014-03-18 16:06:20 -07:00
ZappoMan
88fd686126 tweak thread tests 2014-03-18 15:59:02 -07:00
Ryan
07497ea4f7 removing fly to voxel option 2014-03-18 15:35:25 -07:00
Atlante45
1e2dabfd5e Changed addresses to new models locations 2014-03-18 15:09:54 -07:00
Atlante45
a10a3f6f29 Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing 2014-03-18 14:49:00 -07:00
Atlante45
0a80f8fcd6 Added browse buttons in the menu 2014-03-18 13:59:08 -07:00
Atlante45
388f8d480a Added the model browser 2014-03-18 13:58:23 -07:00
Andrzej Kapolka
137cbe2cf4 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-18 13:58:11 -07:00
Andrzej Kapolka
299dbb93ea Removed "springiness" bits. 2014-03-18 13:57:36 -07:00
Andrzej Kapolka
500f9d1485 Merge pull request #2338 from AndrewMeadows/cleanup 
Don't send redundant avatar hand/head data, and cleanup.
 2014-03-18 13:57:30 -07:00
Atlante45
6f50ea0faa Improved FileDownloader 2014-03-18 13:55:14 -07:00
Andrzej Kapolka
5c7d8e7c70 Merge pull request #2351 from AndrewMeadows/warnings 
removal of more compilation warnings
 2014-03-18 13:54:17 -07:00
Andrzej Kapolka
8413a3cacd Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-18 13:41:43 -07:00
Leonardo Murillo
949f4bac6a Merge pull request #2361 from birarda/master 
fix for random audio-mixer crashes
 2014-03-18 14:33:59 -06:00
Stephen Birarda
f80a077637 fix memory overrun from silent sample writing 2014-03-18 13:33:29 -07:00
Philip Rosedale
11e76988d8 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-18 13:14:34 -07:00
Stephen Birarda
d697a6ea2c Merge pull request #2359 from birarda/master 
spacing fix and silent sample read fix
 2014-03-18 13:04:41 -07:00
Stephen Birarda
9fbb4f1428 spacing fix and silent sample read fix 2014-03-18 13:04:28 -07:00
Leonardo Murillo
725c0f7dab Merge pull request #2358 from birarda/master 
attempted fix for audio-mixer crash
 2014-03-18 14:00:26 -06:00
Stephen Birarda
e7acd0bad3 don't use QDataStream in parseData since we don't really need it 2014-03-18 12:58:29 -07:00
Philip Rosedale
ee0774ec4d Merge branch 'master' of https://github.com/worklist/hifi 2014-03-18 12:48:05 -07:00
Andrew Meadows
a2fea49f58 bump version of PacketTypeAvatarData from 1 to 2 2014-03-18 12:36:48 -07:00
Stephen Birarda
e6365a1b4d Merge pull request #2357 from birarda/orientation-fix 
re-do orientation changes after force push to master
 2014-03-18 12:27:57 -07:00
Stephen Birarda
db25ae8865 remove extra debug 2014-03-18 12:27:45 -07:00
Stephen Birarda
201117c343 Merge branch 'master' of https://github.com/highfidelity/hifi into orientation-fix 2014-03-18 12:26:51 -07:00
Philip Rosedale
1a89444387 Merge pull request #2355 from birarda/orientation-fix 
fix go to orientation to not put the user sideways
 2014-03-18 12:13:01 -07:00