Seth Alves
b4ef2b4a08
quiet some logging
2015-12-10 10:27:31 -08:00
Bradley Austin Davis
5053fcd113
Fix unix builds
2015-12-10 10:19:13 -08:00
Howard Stearns
dd011e8bc4
Freakin' xcode ^S.
2015-12-10 10:05:01 -08:00
Howard Stearns
d731875c5b
Fix dependencies for Linux builds.
2015-12-10 09:58:53 -08:00
Howard Stearns
e28b901a90
Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate
2015-12-10 09:26:28 -08:00
Seth Alves
1cb4debfb0
Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready
2015-12-10 09:24:39 -08:00
samcake
81eedb8585
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-12-10 09:22:40 -08:00
Seth Alves
a59af2c1b2
Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready
2015-12-10 09:03:57 -08:00
Seth Alves
d09f70239c
make entity-tree a global. change how network-requests to load model geometry are triggered
2015-12-10 09:03:53 -08:00
Brad Hefta-Gaub
3499b452f8
add back SDL and Sixense
2015-12-10 09:02:13 -08:00
Howard Stearns
83078b9d8c
Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate
2015-12-10 08:44:08 -08:00
Brad Hefta-Gaub
0213426f0c
Merge pull request #6607 from imgntn/particle_system_visibility
...
Particle Systems Now Respect Visibility Setting
2015-12-10 07:49:54 -08:00
Brad Hefta-Gaub
1da8f6e618
Merge pull request #6605 from hyperlogic/tony/sixense-manager-debug-draw
...
SixenseManager: Added debug draw options
2015-12-10 07:48:35 -08:00
Brad Hefta-Gaub
bd1ab418a4
Merge pull request #6606 from hyperlogic/tony/remove-animation-start-automatically-property
...
[PROTOCOL CHANGE] Entities: Removed Start Automatically property from Animation Group
2015-12-10 07:35:55 -08:00
Brad Hefta-Gaub
3d325351fb
Merge pull request #6602 from AndrewMeadows/character-cleanup
...
move raw bullet code from interface to physics lib
2015-12-10 07:26:29 -08:00
James B. Pollack
9ecb2b2277
uncomment sams change to scriptengine
2015-12-09 18:27:45 -08:00
James B. Pollack
4e93f3ae81
respect visibility yay
2015-12-09 18:26:13 -08:00
Andrew Meadows
9e99bff250
fix avatar upward drift after shape change
2015-12-09 18:09:55 -08:00
Anthony J. Thibault
e9f529bf12
Entities: Removed Start Automatically property from Animation Group
...
There is an issue when startAutomatically was set to true and animationPlaying was set to false.
This would cause clients to play the animation when they connected to the entity server, even though the server was not.
2015-12-09 17:59:56 -08:00
Bradley Austin Davis
fd5fb3096f
Disabling OpenVR plugin
2015-12-09 17:31:53 -08:00
James B. Pollack
b4c272aaa1
sam just left
2015-12-09 17:28:45 -08:00
samcake
f9269523a1
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-12-09 16:58:56 -08:00
samcake
9eb40bcd65
Trying to redner the collision geometry correctly but still an issue with the bounding box i get
2015-12-09 16:58:14 -08:00
Brad Davis
978d39b7f4
Moving OpenVR to external plugin and updating to latest version
2015-12-09 16:20:24 -08:00
Howard Stearns
3b372fd897
coding standards
2015-12-09 16:12:34 -08:00
Howard Stearns
acb43e18d0
coding standards
2015-12-09 15:54:49 -08:00
Howard Stearns
dd2d040253
Merge branch 'fix-sync-period-calc' into correct-target-frame-rate
2015-12-09 15:43:43 -08:00
Howard Stearns
d964032572
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-09 15:23:00 -08:00
Anthony J. Thibault
a57a2792a4
SixenseManager: Added debug draw options
...
These debug draw options were added to help debug rare intermittent issues with
configuration the hydra and the Avatar arm IK.
2015-12-09 15:17:06 -08:00
Atlante45
1d513cfbba
Merge branch 'master' of https://github.com/highfidelity/hifi into particle
2015-12-09 15:09:19 -08:00
Ryan Huffman
5f60aeef22
Update ScriptEngine::_isUserLoaded to be atomic
2015-12-09 14:50:48 -08:00
Ryan Huffman
a21e07327d
Update ScriptEngine::stop() to always run on its thread
2015-12-09 14:50:30 -08:00
Ryan Huffman
e7a1550b64
Update ScriptEngine::finished to include
2015-12-09 14:50:09 -08:00
Seth Alves
47df744552
Merge branch 'update-model-during-simulate' of github.com:sethalves/hifi into no-physics-until-ready
2015-12-09 12:40:18 -08:00
Seth Alves
4d60c7bbc0
update model location with SpatiallyNestable's locationChanged call
2015-12-09 10:42:32 -08:00
Philip Rosedale
a580442b92
Merge pull request #6597 from jherico/scorpius
...
Fix occasional crashes switching from the Oculus plugin
2015-12-09 10:33:48 -08:00
howard-stearns
1d65cbce88
Remove unneeded getTargetFramePeriod and isVSynchronized.
2015-12-08 18:08:57 -08:00
Philip Rosedale
c93252b134
Merge pull request #6596 from AndrewMeadows/fix-bad-ownership
...
fix bad simulation ownership when using edit.js
2015-12-08 17:49:38 -08:00
howard-stearns
9ae22800fe
Merge branch 'fix-sync-period-calc' into correct-target-frame-rate
2015-12-08 17:32:53 -08:00
Andrew Meadows
8c109fd623
move raw bullet code from interface to physics lib
2015-12-08 17:21:43 -08:00
samcake
1adf2cc8ba
Repesenting the collision meshes of a Model correctly
2015-12-08 16:45:12 -08:00
howard-stearns
32e4967ee0
cleanup
2015-12-08 16:38:05 -08:00
Bradley Austin Davis
2604b49650
Fix occasional crashes switching from the Oculus plugin
2015-12-08 15:41:30 -08:00
howard-stearns
7afc803fb5
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-08 15:30:48 -08:00
howard-stearns
5b41d4da1c
Snapshot of "working" version.
2015-12-08 15:30:23 -08:00
Philip Rosedale
bda4e41958
Merge pull request #6581 from kencooke/audio-reverb
...
New reverb parameters
2015-12-08 14:59:58 -08:00
Andrew Meadows
987b8d3334
fix bad simulation ownership when using edit.js
2015-12-08 14:34:25 -08:00
Brad Hefta-Gaub
1356fb15aa
Merge pull request #6591 from jherico/zaan
...
Add sphere and cube triangle counts to displayed stats
2015-12-08 13:27:37 -08:00
Brad Davis
43afa440a6
Merge pull request #6588 from huffman/fix-warnings
...
Fix warnings
2015-12-08 13:17:30 -08:00
Ryan Huffman
4dbfd3bfd9
Fix concurrency issues for bools in ScriptEngine
...
Several member variables were unsafely being accessed from multiple threads. Making these variables std::atomic makes this safe.
2015-12-08 11:13:27 -08:00
Bradley Austin Davis
011a43d5f2
Add sphere and cube triangle counts to displayed stats
2015-12-08 11:08:22 -08:00
Seth Alves
dffa37c0e7
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-08 09:44:50 -08:00
Seth Alves
ec9f1e0754
possible fix for crash when grabbing bubblewand
2015-12-08 09:44:43 -08:00
Ryan Huffman
0759462df7
Remove unused variable in PacketReceiver
2015-12-08 09:38:23 -08:00
Ryan Huffman
71c266bc00
Fix order of initializion in ReceivedMessage
2015-12-08 09:22:17 -08:00
Ryan Huffman
44d740ef57
Remove unused variable 'addr'
2015-12-08 09:22:02 -08:00
samcake
4b03001c61
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-12-08 09:21:45 -08:00
Howard Stearns
481fe5a7d0
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 18:52:29 -08:00
samcake
b24af06589
Fixing the display of the collision hull mesh
2015-12-07 18:26:55 -08:00
samcake
d12fdb9726
Merge pull request #6584 from birarda/pref-no-auto
...
fix for avatar URL text editing, assert in Model.cpp
2015-12-07 18:11:49 -08:00
Brad Hefta-Gaub
4cbbd252d5
Merge pull request #6587 from jherico/rigel
...
Fix crashes on exit due to poor cleanup
2015-12-07 18:04:52 -08:00
Bradley Austin Davis
b7aeb34a8c
Fix crashes on exit due to poor cleanup
2015-12-07 17:50:08 -08:00
James B. Pollack
6cf1ad464f
Merge pull request #6583 from birarda/extension-ci
...
use a case insensitive check for extensions in Application
2015-12-07 17:33:03 -08:00
howard-stearns
9512c3f73d
Debugging.
...
Please enter the commit message for your changes. Lines starting
2015-12-07 16:58:59 -08:00
howard-stearns
b007617c85
Remove unneeded DisplayPlugin stuff.
2015-12-07 16:56:59 -08:00
Stephen Birarda
6dbff93bbd
fix assert on model URL change from _renderItemsSet
2015-12-07 16:24:26 -08:00
howard-stearns
55cfd1c8b4
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 15:49:47 -08:00
Stephen Birarda
7beaf5e235
force asset upload to use a lowercase extension
2015-12-07 15:18:32 -08:00
Seth Alves
0bf276efa5
adjust method names to fit convention
2015-12-07 14:37:35 -08:00
Seth Alves
982e986f1a
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-07 14:31:18 -08:00
Seth Alves
f99812a903
adjust method names to fit convention
2015-12-07 14:31:08 -08:00
Brad Davis
353fe774ca
Merge pull request #6572 from howard-stearns/fix-render-rate
...
Fix render rate.
2015-12-07 14:12:54 -08:00
Leonardo Murillo
25494ec867
Merge pull request #6562 from Atlante45/baseball
...
Baseball
2015-12-07 14:11:21 -08:00
Ken Cooke
86db12acae
Fix naming clash with reserved word
2015-12-07 14:03:11 -08:00
Ken Cooke
4803b3bd9f
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb
2015-12-07 13:08:21 -08:00
Ken Cooke
8683bb5002
New reverb parameters
2015-12-07 13:05:30 -08:00
Clément Brisset
0be35ec6ea
Merge pull request #6578 from hyperlogic/tony/clear-joint-data-bug-fix
...
MyAvatar.clearJointData bug fix
2015-12-07 12:18:28 -08:00
Howard Stearns
289c8d6137
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 11:54:33 -08:00
Howard Stearns
fc1f312851
Merge branch 'fix-render-rate' into fix-sync-period-calc
2015-12-07 11:54:25 -08:00
Howard Stearns
72ce46af59
Mac-only.
2015-12-07 11:46:36 -08:00
Clément Brisset
42365acef5
Merge pull request #6561 from ZappoMan/cruftRemovalRedux
...
More Cruft Removal
2015-12-07 11:39:54 -08:00
Howard Stearns
8666cdd689
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-render-rate
2015-12-07 11:27:30 -08:00
Howard Stearns
8303b63491
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 10:11:12 -08:00
Clément Brisset
390836b64e
Merge pull request #6431 from huffman/proto-received-message
...
Combine Packet and PacketList into ReceivedMessage on receiving end
2015-12-07 09:58:52 -08:00
Howard Stearns
34de4d67d8
DisplayPlugin::getLastSynchronizedElapsed
2015-12-07 09:32:12 -08:00
Howard Stearns
df413c0b14
Temporary debugging aids.
2015-12-07 09:31:06 -08:00
Atlante45
cdf621e8d0
Remove unnecessary moveToThread to remove warning
2015-12-07 09:11:41 -08:00
Anthony J. Thibault
fd4ed29405
MyAvatar.clearJointData bug fix
...
MyAvatar.setJointRotation() now works properly after MyAvatar.clearJointData()
2015-12-07 09:03:40 -08:00
Ryan Huffman
34138f07bd
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-07 08:58:47 -08:00
Atlante45
f8ee377f01
Fix QOpenGL warning
2015-12-07 08:37:07 -08:00
Atlante45
18198cb6fb
Fix missing override
2015-12-07 08:36:49 -08:00
Seth Alves
96e9580473
change some more parameters back to being pass-by-reference, where it's safe
2015-12-07 05:30:19 -08:00
Seth Alves
3cc423ca03
remap IDs when importing entities
2015-12-06 17:55:48 -08:00
Seth Alves
f0fb9966ad
expose parent-joint-index to edit.js
2015-12-06 12:34:41 -08:00
Seth Alves
fff4e3e831
make SpatiallyNestable setters take values by reference
2015-12-06 12:01:30 -08:00
Seth Alves
a948ae5f19
children of avatar joints might be right, now
2015-12-06 10:48:00 -08:00
Seth Alves
edc312199d
rename a method to match convention in https://docs.google.com/document/d/1LFCmkK26JMVs8Ci33L4Yrle6lL7UU7oxthsWfddzZXQ/edit#
2015-12-06 06:16:47 -08:00
Seth Alves
138125faab
fix-up parentJointIndex in terse logging
2015-12-06 05:42:51 -08:00
Howard Stearns
188c477f7e
Fix render rate.
...
Depending on how the threads get assigned, the actual render rate (not just the stats) could be as little as a third of what is targetted.
That's because the code was insisting on an empty texture escrow before our update/render cycle could begin, and otherwise just waits for the next whole cycle.
On my MacbookPro, this was regularly giving a render average of 20fps instead of 60.
2015-12-05 17:32:32 -08:00
Seth Alves
d518a4573e
if script sets parent or jointIndex, don't pop entity off to someplace
2015-12-05 15:15:33 -08:00
Seth Alves
1f0150f65f
add parentID and parentJointIndex to terse logging
2015-12-05 15:12:44 -08:00
Seth Alves
7448d9f262
Merge pull request #6565 from hyperlogic/tony/thread-safe-rig-joint-getters
...
Make Avatar::getJointRotation and getJointTranslation thread-safe
2015-12-04 16:45:56 -08:00
Anthony J. Thibault
7abfc93ff9
Avatar::getJointRotation and getJointTranslation is thread-safe
...
It can be called from script with minimal blocking,
because it inspects a copy of the joint values from the Rig, which is updated atomically.
This copy occurs in Rig::updateAnimations()
2015-12-04 16:16:17 -08:00
Howard Stearns
fa0ad1fe4d
Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate
2015-12-04 16:12:22 -08:00
Brad Hefta-Gaub
5bbff7534d
Merge pull request #6560 from birarda/log-handler-crash
...
don't stop a non-started timer, debug cleanup
2015-12-04 15:46:51 -08:00
Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
Brad Hefta-Gaub
1eb5b21e48
fix warning
2015-12-04 15:17:16 -08:00
Anthony J. Thibault
ba001ef4b0
Rig: split Poses into internal and external sets.
...
In preparation for making some accessors thread safe.
2015-12-04 15:15:18 -08:00
howard-stearns
0a9b42ad3c
Fix present rate stats display, which was counting (roughly) twice for 2D
...
display, and flickering.
2015-12-04 15:10:46 -08:00
Brad Hefta-Gaub
2a243ccd17
Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemovalRedux
2015-12-04 14:58:38 -08:00
Brad Hefta-Gaub
be4bc7b2ca
going a different way, same packet version, but always send feature requests to old servers
2015-12-04 14:55:16 -08:00
Brad Hefta-Gaub
7faf9c2f22
bump protocol version
2015-12-04 14:33:45 -08:00
Brad Hefta-Gaub
46946212cf
remove WANT_LOW_RES_MOVING_BIT from OctreeQuery always true
2015-12-04 14:24:31 -08:00
Stephen Birarda
ad4f818b21
only attempt to stop QTimer if active
2015-12-04 14:12:41 -08:00
Brad Hefta-Gaub
f44a9daa21
remove WANT_DELTA from OctreeQuery
2015-12-04 14:04:57 -08:00
Stephen Birarda
d2fdf6a04b
Merge branch 'master' of https://github.com/highfidelity/hifi into log-handler-crash
2015-12-04 13:55:57 -08:00
Brad Hefta-Gaub
f71d2d00d2
Merge pull request #6548 from jherico/threaded_present
...
Threaded present
2015-12-04 13:42:09 -08:00
Brad Hefta-Gaub
0d9d5375c7
remove optional WANT_COMPRESSION from OctreeQuery
2015-12-04 13:29:18 -08:00
Brad Davis
11917ca501
Fixing preview / vsync functionality
2015-12-04 12:46:19 -08:00
Stephen Birarda
165db97cb2
cleanup double reset debug on assignment-client restart
2015-12-04 11:50:27 -08:00
Brad Hefta-Gaub
84b98c93a1
Merge pull request #6559 from birarda/log-handler-crash
...
reset the NodeList on its own thread
2015-12-04 11:44:06 -08:00
Brad Hefta-Gaub
79d60f74ba
Merge pull request #6558 from sethalves/parents
...
fix an AC race/crash
2015-12-04 11:40:21 -08:00
Ryan Huffman
89c412c324
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub
15c4dbfb11
Merge pull request #6554 from Atlante45/warnings
...
Last of the OpenGL warnings on OS X
2015-12-04 11:24:28 -08:00
Stephen Birarda
d5f79b84fc
make the NodeList reset a blocking queued connection
2015-12-04 11:20:46 -08:00
Stephen Birarda
918342df5f
make sure the NodeList is reset on its own thread
2015-12-04 11:18:46 -08:00
Brad Hefta-Gaub
d07629489c
Merge pull request #6543 from Atlante45/pointer
...
gpu::Shader::create* return shared_ptr
2015-12-04 11:17:02 -08:00
Seth Alves
ea65ef964f
fix an AC race/crash
2015-12-04 11:13:36 -08:00
Stephen Birarda
ca84fcd7f4
parent the keepalive timer to the NL thread
2015-12-04 11:01:18 -08:00
Atlante45
528a17422d
Last of the OpenGL warnings on OS X
2015-12-04 10:33:10 -08:00
Brad Davis
c4514743d1
Fixing tests, moving some plugin container stuff to base class
2015-12-04 10:28:19 -08:00
Brad Davis
60aa93c38c
Fixing menu items in display plugins
2015-12-04 10:28:19 -08:00
Brad Davis
7262a10e62
Refactoring present thread / GL base plugin for saner context management
2015-12-04 10:28:18 -08:00
Brad Davis
d8bb9f8d18
Fixing screenshot functionality
2015-12-04 10:28:17 -08:00
Brad Davis
b9ace94ff1
Prototyping threaded present
2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub
d9a1563396
Merge pull request #6152 from sethalves/parents
...
Parents
2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub
ab63f19b6a
Merge pull request #6546 from kencooke/audio-reverb
...
Reverb
2015-12-04 10:19:56 -08:00
Brad Hefta-Gaub
49a7852d76
Merge pull request #6540 from Atlante45/warnings
...
Fix warnings on OS X
2015-12-04 10:19:25 -08:00
Brad Hefta-Gaub
8b58aa706a
Merge pull request #6534 from jherico/homer
...
Windows 64 bit updates
2015-12-04 10:05:45 -08:00
Atlante45
07387ab8c0
Fix most OpenGL warnings
2015-12-04 10:01:43 -08:00
ericrius1
7e7327042a
Merge branch 'master' into polylineOptimizations
2015-12-04 09:53:01 -08:00
Atlante45
cb758ca6b4
Fix override warnings on XCode 7
2015-12-04 08:55:43 -08:00
Atlante45
cd26422ca0
Fix warnings on OS X
2015-12-04 08:47:06 -08:00
Brad Hefta-Gaub
18e62290f3
fix warnings
2015-12-04 08:37:46 -08:00
Brad Hefta-Gaub
f472b515c3
remove wantsColor support since its always true and required for entities
2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub
81fb4476bc
remove coverage map and occulusion culling, since it was always disabled
2015-12-03 20:29:23 -08:00
Ken Cooke
aad4743bf0
Completely remove Gverb from cmake
2015-12-03 18:06:50 -08:00
Brad Hefta-Gaub
5a75a17174
Revert "Cruft removal"
2015-12-03 17:40:41 -08:00
Howard Stearns
d51785a259
Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate
2015-12-03 17:28:32 -08:00
Brad Hefta-Gaub
46556b7fa5
Merge pull request #6513 from huffman/fix-script-race-condition
...
Fix ScriptEngine setting _isFinished when it shouldn't, causing scripts to accumulate when restarting
2015-12-03 17:17:42 -08:00
Clément Brisset
fa52b97f61
Merge pull request #6538 from ZappoMan/cruftRemoval
...
Cruft removal
2015-12-03 17:03:04 -08:00
Brad Hefta-Gaub
6fbb67021f
Merge pull request #6530 from hyperlogic/tony/mirrored-model-entity-fix
...
Fix for mirrored transforms in FBX models
2015-12-03 17:01:21 -08:00
Brad Hefta-Gaub
ec7d3ffd63
Merge pull request #6536 from huffman/fix-uninitialized-xcolor
...
Fix uninitialized xColor value when converting script value
2015-12-03 16:46:00 -08:00
Brad Hefta-Gaub
528b8e5d3f
fix warnings
2015-12-03 16:45:01 -08:00
Brad Hefta-Gaub
1df24dd174
Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemoval
2015-12-03 16:31:15 -08:00
Ken Cooke
1d01f08324
Fix compiler warnings
2015-12-03 16:27:35 -08:00
Atlante45
c8ab95bb53
Spacing
2015-12-03 15:01:18 -08:00
Atlante45
180ffcc456
Typo (English is weird)
2015-12-03 15:01:18 -08:00
Atlante45
591025850b
Fix particle shader
2015-12-03 15:01:18 -08:00
Atlante45
bd23a4137e
Move toGlm to GLMHelpers
2015-12-03 15:01:17 -08:00
Atlante45
9c5486fb4b
More particle work
2015-12-03 15:01:17 -08:00
Atlante45
3da80f5861
gpu::Shader::create* return shared_ptr
2015-12-03 14:56:07 -08:00
samcake
902b6b8ea1
Merge pull request #6506 from jherico/maggie
...
OpenGL class cleanup
2015-12-03 13:55:29 -08:00
ericrius1
5f881e7650
polylines now take color as a uniform
2015-12-03 13:46:29 -08:00
howard-stearns
f5b25791f4
When throttling starts, we won't have noticed, so change test.
2015-12-03 13:39:41 -08:00
Brad Davis
cc80dfb9e1
Fixing case on gl surface format helper
2015-12-03 13:08:26 -08:00
Howard Stearns
30bbc82c24
Restore throttling interval code.
2015-12-03 13:00:07 -08:00
Brad Hefta-Gaub
1a5bc5d111
removing optional compression
2015-12-03 12:40:24 -08:00
Howard Stearns
a989b926b0
isVSynchronized, and proper override declarations.
2015-12-03 11:28:26 -08:00
Seth Alves
e5b1cfa920
fix windows build
2015-12-03 11:15:04 -08:00
Brad Hefta-Gaub
849a8707d2
remove wantsColor support since its always true and required for entities
2015-12-03 11:11:15 -08:00
Seth Alves
4e74c98ae7
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-03 11:00:13 -08:00
Seth Alves
6f79b381f9
working toward making children of avatar joints work
2015-12-03 11:00:06 -08:00
Brad Hefta-Gaub
0c05ffe9ce
remove coverage map and occulusion culling, since it was always disabled
2015-12-03 10:20:04 -08:00
Ryan Huffman
667d2b728e
Fix uninitialized xColor value when converting script value
2015-12-03 09:52:56 -08:00
Brad Davis
3854523787
Fixing 32 bit build breakage
2015-12-03 09:17:41 -08:00
Seth Alves
2d804555de
minor cleanups
2015-12-03 08:59:15 -08:00
Howard Stearns
ed86a88083
Make various forms of throttling more consistent and give it a chance of actually reaching target.
2015-12-02 21:48:06 -08:00
Brad Davis
7a05a664f4
Updating GPU for 64 bit
2015-12-02 21:34:11 -08:00
Anthony J. Thibault
b56cf58e33
Fix for mirrored transforms in FBX models
...
extractScale will now return negative scale for left-handed matrices.
2015-12-02 16:55:04 -08:00
Howard Stearns
8ae05d8490
Plugins target frame rate and period.
2015-12-02 16:40:41 -08:00
ericrius1
07430fb75a
Merge branch 'master' into polylineOptimizations
2015-12-02 15:59:32 -08:00
Andrew Meadows
744da64c50
Merge pull request #6527 from ZappoMan/debugEntitiesSending
...
Add some debugging stats to entity server
2015-12-02 15:51:47 -08:00
Brad Hefta-Gaub
1e51a90204
add edit times and entity ids to the viewer stats
2015-12-02 14:43:00 -08:00
Seth Alves
6eae98fb28
merge from upstream
2015-12-02 14:38:26 -08:00
Anthony J. Thibault
9c0b4bc2a2
Fix for model entities with non-uniform scaled mesh
...
Logic which extracted rotations from a non-uniformly scaled matrices was sometimes incorrect.
This should fix the roads in Qbit as well as the blocks in toybox.
2015-12-02 14:09:47 -08:00
Brad Hefta-Gaub
08ba535c38
add some basic send tracking
2015-12-02 13:43:05 -08:00
Ryan Huffman
d9eddbe738
Remove unnecessary ptr get() in PacketList
2015-12-02 13:32:56 -08:00
Brad Hefta-Gaub
33b859df33
Merge pull request #6416 from kencooke/audio-reverb
...
New reverb
2015-12-02 11:22:12 -08:00
Ken Cooke
fbd7549430
Better reverb script defaults
2015-12-02 11:05:06 -08:00
Brad Hefta-Gaub
112cdaf028
Merge pull request #6512 from AndrewMeadows/remove-debug-cruft
...
remove debug option for disabling physics updates
2015-12-02 10:00:29 -08:00
Brad Hefta-Gaub
75a57c3cb8
Merge pull request #6500 from Atlante45/octree_crash
...
Octree crash fix
2015-12-02 09:59:56 -08:00
Ken Cooke
f005afd7c0
Fix stdint.h includes
2015-12-02 09:33:47 -08:00
Seth Alves
0595ef0938
merge from upstream
2015-12-02 09:30:19 -08:00
Brad Davis
9b6ec34f09
Fixing avatar orientation in recordings
2015-12-01 20:51:07 -08:00
ericrius1
191f7f2c22
no audio for now
2015-12-01 16:22:11 -08:00
James B. Pollack
52d6fdac1a
Merge pull request #6487 from ctrlaltdavid/20740
...
Get the Leap Motion working again
2015-12-01 15:40:48 -08:00
Atlante45
c4e43c4e0b
Merge branch 'baseball-test' of github.com:Atlante45/hifi into baseball
2015-12-01 15:16:05 -08:00
Atlante45
f06b5b05b3
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-01 15:14:58 -08:00
Seth Alves
b8d800f5b8
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-01 11:59:10 -08:00
