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

3981 commits

Author SHA1 Message Date
Andrzej Kapolka
83c2938c2e Temporarily disable enum streamers, which are crashing on Windows startup. 2014-06-05 17:05:57 -07:00
Atlante45
150477eea4 Models.addModel now returns a more accurate modelID 2014-06-05 15:47:25 -07:00
Atlante45
0bdd20abc9 Coding Standard 2014-06-05 15:46:07 -07:00
Andrzej Kapolka
887561a4e1 Slight simplification. 2014-06-05 15:39:43 -07:00
Andrzej Kapolka
c44dba78cb Provide a reasonably painless way to stream enums that aren't object 
properties.
 2014-06-05 15:32:55 -07:00
Philip Rosedale
3cc67f5229 Merge pull request #2984 from ZappoMan/octreeWireformatImprovements 
Octree wireformat improvements checkpoint
 2014-06-04 21:58:08 -07:00
Joseph Gilley
c1d1a8de5c Fix for users with some special characters in their password not being able to log in using the login overlay in the Interface. 2014-06-05 00:26:45 -04:00
Philip Rosedale
b59b26d87b Merge pull request #2985 from ey6es/metavoxels 
Pulled in fixes for delta-encoding from "deltatars," added support for version-resilient streaming of Qt enums/flags.
 2014-06-04 21:23:46 -07:00
Andrzej Kapolka
fd2893bf6d Get rid of the log calls entirely; use the same code that we use for the ID 
streamer.
 2014-06-04 18:23:31 -07:00
Andrzej Kapolka
37382304f7 Perhaps this will avoid the ambiguity in Windows. 2014-06-04 17:41:36 -07:00
Andrzej Kapolka
9ec2a5aec1 Avoid ambiguous call to log on Windows. 2014-06-04 17:39:42 -07:00
Andrzej Kapolka
54a5bc3a49 More enum stuff, with tests. 2014-06-04 17:24:43 -07:00
ZappoMan
152d99d810 removed some old debug code and updated a comment 2014-06-04 15:23:17 -07:00
ZappoMan
c7a502e2c9 removed empty file 2014-06-04 15:18:11 -07:00
ZappoMan
2066dbcec7 cleanup 2014-06-04 15:16:51 -07:00
wangyix
5251057ed6 MovingPercentile moved else to same line as } 2014-06-04 15:13:16 -07:00
ZappoMan
10f7eae7a0 implemented decode 2014-06-04 14:56:13 -07:00
wangyix
0da6374e19 MovingPercentile .size() consistency 2014-06-04 14:31:58 -07:00
wangyix
e2d3fcc518 changed MovingPercentile to use QList 2014-06-04 14:24:23 -07:00
ZappoMan
78d3f1454c more operators 2014-06-04 14:19:35 -07:00
wangyix
ebfc405d9d more cleanup 3 2014-06-04 11:55:20 -07:00
ZappoMan
2b85145325 added test suite for PropertyFlags, latest work on PropertyFlags 2014-06-04 11:41:09 -07:00
wangyix
480efcbe76 more cleanup again 2014-06-04 11:31:44 -07:00
wangyix
25e2f28b02 more cleanup 2014-06-04 11:30:35 -07:00
wangyix
b452d08495 cleaned up debug statements 
also reorganized MovingPercentile a little bit
 2014-06-04 11:20:29 -07:00
wangyix
12ac6105f1 changed MovingMedian to MovingPercentile 2014-06-04 10:59:32 -07:00
ZappoMan
b48c70a7f7 first cut at PropertyFlags template class 2014-06-04 10:23:50 -07:00
ZappoMan
8d4a8f7e67 first cut at partial model elements 2014-06-04 10:22:49 -07:00
ZappoMan
23ef5b5404 added some comments 2014-06-04 10:22:19 -07:00
Andrzej Kapolka
1f2a75fc45 More enum streaming bits. 2014-06-03 18:27:56 -07:00
Andrzej Kapolka
56f12075df Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-03 17:17:23 -07:00
Andrzej Kapolka
90e2145fc4 Working on enum streaming. 2014-06-03 17:17:02 -07:00
wangyix
50746a6540 extra commit of previous commit? 2014-06-03 16:19:12 -07:00
wangyix
c851edd0ef added MovingMedian class, but not using it 
added packet type/time data collection to DatagramProcessor and
post-execution prints of that info.
 2014-06-03 16:18:40 -07:00
Andrzej Kapolka
ac7d23bf54 Working on support for streaming Qt enums/flags. 2014-06-02 19:00:48 -07:00
Andrzej Kapolka
6db385de7a Ported over fixes that I made when working on delta-encoding for avatars. 2014-06-02 15:16:08 -07:00
matsukaze
46d45a2d43 Job #19700 BUG: Crash in NodeBounds::draw() fixed. 
QMap and QReadWriteLock are orthogonal. Combined them into a wrapper
class called NodeToJurisdictionMap, replacing typedef. This allows us to
avoid changing method signatures wherever NodeToJurisdictionMap is used.
The lock is bound with the map and is available to all clients of the
NodeToJurisdictionMap. The lock allows multi-threaded access to the map.

Fixed compiler warning in NodeBounds.cpp regarding loss of precision
during conversion of double to GLfloat.
 2014-06-02 05:55:58 -04:00
ZappoMan
b212f9edca fix ray picking at distances 2014-05-30 15:07:54 -07:00
ZappoMan
8a4955d75b temporarily disable the model aligned box picking 2014-05-30 11:13:37 -07:00
Philip Rosedale
169e7d61fd Merge pull request #2954 from ctrlaltdavid/19715 
Code Review for Job #19715
 2014-05-29 20:03:24 -07:00
Andrzej Kapolka
b93b009cd8 Merge pull request #2953 from PhilipRosedale/master 
Fixes having large yaw movements get head and body out of alignment with oculus
 2014-05-29 19:00:37 -07:00
AndrewMeadows
eed2cd28ef Merge pull request #2956 from ZappoMan/perfstats 
Fix Ray Intersection bug that was causing low FPS... also added more performance debugging
 2014-05-29 18:48:38 -07:00
ZappoMan
6a57e662ac removed extra line 2014-05-29 18:34:11 -07:00
ZappoMan
e59e253727 fix ray intersection performance 2014-05-29 18:32:11 -07:00
Philip Rosedale
d17eeaf35b remove old oculus yaw offset, expand limit on head yaw 2014-05-29 16:50:13 -07:00
Clément Brisset
6864fc3b99 Merge pull request #2951 from ZappoMan/perfstats 
add improved detailed rendering and FPS debugging stats
 2014-05-29 15:37:07 -07:00
David Rowe
bd4d167684 Make JavaScript audio samples able to be looped 
Add a "loop" property to AudioInjectorOptions and provide an example JavaScript file.
 2014-05-29 14:13:02 -07:00
ZappoMan
e6966c2155 add improved detailed rendering and FPS debugging stats 2014-05-29 12:12:23 -07:00
wangyix
65508b2016 updated packet type version numbers 2014-05-29 11:42:35 -07:00
wangyix
fe1a0e4565 removed debug stuff i missed 2014-05-29 11:27:14 -07:00
wangyix
c87c474877 removed debug info, cleaned code for pull req 2014-05-29 10:39:40 -07:00
wangyix
a0f9d2c106 Merge remote-tracking branch 'upstream/master' 2014-05-29 09:20:30 -07:00
AndrewMeadows
21f045ebe0 Merge pull request #2939 from huffman/19648 
Code Review for Job #19648
 2014-05-29 08:53:31 -07:00
wangyix
5d4b0df108 added flag,seq,st to EnvironmentData, untested 
removed/commented out debug prints
 2014-05-28 17:41:38 -07:00
wangyix
c799077379 added flag,seq,ts to ParticleErase and ModelErase 
... this fixes unreasonable flight-time issue
 2014-05-28 17:20:10 -07:00
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
wangyix
e89d33dc60 added if to not track ParticleErase packets 2014-05-27 18:02:49 -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
Ryan Huffman
099777ef8c Merge branch 'master' of git://github.com/highfidelity/hifi into 19648 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-05-26 10:01:44 -07:00
Ryan Huffman
8aa9cea30e Add custom evaluation of commands in ScriptEngine 2014-05-26 09:59:02 -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
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
Stojce Slavkovski
8247e5a552 added discourse key in shift operators 2014-05-14 17:25:40 +02:00
Kai Ludwig
19404fe0e5 Changed start domain to sandbox. Changed start location to xyz: 6270, 211, 6000. 
goHome behaviour is unchanged and will still just go to the start location keeping the currently select domain.
 2014-05-14 07:10:31 +02:00