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

3823 commits

Author SHA1 Message Date
ZappoMan
574bca38e6 clean up comments and variable names 2014-05-28 12:10:51 -07:00
ZappoMan
bebfd7a301 non-aabox picking working 2014-05-28 12:02:22 -07:00
ZappoMan
0e7f3e0e37 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-28 10:37:28 -07:00
ZappoMan
6fd22856f2 hacking on non-AABox models 2014-05-28 10:24:02 -07:00
Philip Rosedale
8d7e682a1f Merge pull request #2937 from huffman/19714 
Code Review for Job #19714
 2014-05-27 20:20:45 -07:00
Andrew Meadows
d1a8c18d10 simplified hand index constants 2014-05-27 16:32:29 -07:00
ZappoMan
c63c0c0ce3 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-27 13:39:45 -07:00
ZappoMan
8ec14568fe support ray picking against the AABB for the rotated model extents 2014-05-27 13:39:32 -07:00
Ryan Huffman
aa47043d57 Fix WAV file support 
The previous implementation assumed the file only contained RIFF, WAVE,
fmt, and data chunks.  It is valid for other chunks to appear, so I
updated it to skip any chunks until it finds the "data" chunk.
 2014-05-27 11:24:48 -07:00
Clément Brisset
6bb933996f Merge pull request #2920 from ZappoMan/aacube 
Add RayPick support for models
 2014-05-24 17:03:59 -07:00
Stephen Birarda
9df0f2c1e5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-23 17:38:28 -07:00
Stephen Birarda
714e29c887 fix credit amount in window title 2014-05-23 17:37:36 -07:00
ZappoMan
efd0580cfb add ray picking to the model scripting interface 2014-05-23 17:09:37 -07:00
Philip Rosedale
7c8ece6a5b Merge pull request #2919 from AndrewMeadows/inertia 
turn on gravity when there is a voxel floor to stand on
 2014-05-23 16:36:57 -07:00
Stephen Birarda
1b00cda068 don't use powf for credit conversions 2014-05-23 16:12:34 -07:00
Andrew Meadows
8d660c76cc merge upstream/master into andrew/inertia 2014-05-23 16:00:55 -07:00
Andrew Meadows
d425b5b322 Enable local gravity when there is a floor nearby. 2014-05-23 15:59:27 -07:00
Stephen Birarda
34eb0f9f43 make transaction amounts and balances signed 64-bit 2014-05-23 15:34:34 -07:00
Andrzej Kapolka
aca50aa779 Merge pull request #2914 from birarda/credits 
balances are 64-bit unsigned ints, fix script request
 2014-05-23 12:36:49 -07:00
Stephen Birarda
f4292fd29c handle serving of scripts at temp unique UUIDs 2014-05-23 12:33:39 -07:00
Stephen Birarda
9acf377573 balances are 64-bit unsigned ints 2014-05-23 11:52:39 -07:00
Atlante45
7b9f6f8505 Merge branch 'master' of https://github.com/highfidelity/hifi into point_and_glow 2014-05-23 11:32:52 -07:00
ZappoMan
ee523ff373 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-23 11:17:59 -07:00
Atlante45
df68082705 Added local glow to models 2014-05-23 11:02:07 -07:00
ZappoMan
3a166d2832 renaming of AABox to AACube, introduction of actual AABox 2014-05-23 10:57:08 -07:00
ZappoMan
33fe339213 renaming of AABox to AACube, introduction of actual AABox 2014-05-23 10:45:21 -07:00
ZappoMan
39ed7f7b65 renaming of AABox to AACube, introduction of actual AABox 2014-05-23 10:45:04 -07:00
ZappoMan
9188b9ac59 add meshExtents to sub meshes 2014-05-23 09:56:09 -07:00
Stephen Birarda
4f81bac742 add back a missing space in AccountManager 2014-05-22 17:16:42 -07:00
Stephen Birarda
164d3c5fb3 make sure balance is cleared on logout and re-launch 2014-05-22 15:06:16 -07:00
Stephen Birarda
79f09605d5 show credit balance in window title 2014-05-22 14:55:43 -07:00
Leonardo Murillo
60dfa08b30 Merge pull request #2902 from birarda/master 
change node auth URL to data.highfidelity.io
 2014-05-22 15:30:44 -06:00
Stephen Birarda
01e8d775f2 change node auth URL to data.highfidelity.io 2014-05-22 14:24:19 -07:00
barnold1953
f069b70563 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-22 12:46:39 -07:00
barnold1953
5013c8c2fa Fixed script editor crash when script calls Script.stop(). Also made the 
processEraseMessage wait until it can lock to ensure particles are
deleted.
 2014-05-22 12:45:36 -07:00
Atlante45
ea1359c10f Clean up log 2014-05-22 11:11:22 -07:00
barnold1953
4036f929c9 Stopped access violation when erasing particles. 2014-05-22 10:31:30 -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
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
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