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
