Seth Alves
dbde0b641e
Merge branch 'attachments' of github.com:Atlante45/hifi into no-physics-until-ready
2015-12-10 11:38:08 -08:00
Seth Alves
d10221f53a
merge from upstream
2015-12-10 11:21:36 -08:00
Seth Alves
3a35df191a
remove an off-brand change
2015-12-10 11:19:26 -08:00
Atlante45
739e184b52
Fix attachments jitter
2015-12-10 11:19:11 -08:00
Seth Alves
1467a9d2eb
handle initial simulation of _model
2015-12-10 11:17:40 -08:00
Brad Hefta-Gaub
589adde41e
Merge pull request #6541 from howard-stearns/correct-target-frame-rate
...
Don't limit avatar rendering when not vsync'd
2015-12-10 11:17:23 -08:00
Atlante45
6f29d9e7b8
Use strongly typed enum instead of nested alias
2015-12-10 11:10:09 -08:00
James B. Pollack
d21e4ff5e1
Merge pull request #6592 from huffman/script-engine-fixes
...
Fix concurrency issues for bools in ScriptEngine
2015-12-10 10:48:54 -08:00
Seth Alves
2dd40beed5
formatting
2015-12-10 10:42:25 -08:00
Seth Alves
1542b6ddf5
Merge pull request #6610 from jherico/unix_fix
...
Fix unix builds breaking because link errors
2015-12-10 10:37:19 -08:00
Seth Alves
33a65385e8
Merge branch 'unix_fix' of github.com:jherico/hifi into no-physics-until-ready
2015-12-10 10:29:13 -08:00
Seth Alves
d243132b5c
quiet some logging
2015-12-10 10:28:24 -08:00
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
Brad Davis
dfc2a941d4
Merge pull request #6609 from ZappoMan/master
...
add back SDL and Sixense
2015-12-10 09:04:30 -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
92d1038871
Merge pull request #6590 from imgntn/particle_explorer_updates
...
Update Particle Explorer to Ignore New Parenting Properties
2015-12-10 07:43:40 -08:00
Brad Hefta-Gaub
27d28900a4
Merge pull request #6580 from imgntn/parented_flashlight
...
Update Flashlight to use Parenting
2015-12-10 07:43:10 -08:00
Brad Hefta-Gaub
1512703182
Merge pull request #6593 from Atlante45/master
...
Update toys relativeRotation/Position
2015-12-10 07:37:08 -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
Brad Hefta-Gaub
5933a055a9
Merge pull request #6595 from jherico/zaan
...
Migrate to latest Oculus SDK (0.8)
2015-12-09 18:31:40 -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
1644bda908
Migrate to latest Oculus SDK (0.8)
2015-12-09 17:32:11 -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
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
Andrew Meadows
a99542e298
Merge pull request #6601 from howard-stearns/fix-sync-period-calc
...
Fix sync period calc, restoring avatar render distance
2015-12-09 15:56:22 -08:00
Howard Stearns
acb43e18d0
coding standards
2015-12-09 15:54:49 -08:00
Ryan Huffman
ad0865171b
Fix unused variable in scriptFinished
2015-12-09 15:52:30 -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
5643a6a4c6
Merge branch 'correct-target-frame-rate' of https://github.com/howard-stearns/hifi into correct-target-frame-rate
2015-12-09 15:43:10 -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
Howard Stearns
270cfe8af7
coding standards
2015-12-09 15:22:44 -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
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
