Howard Stearns
dfec222c81
Report animation triggers to normal javascript animationStateHandlers, and update away.js as an example.
2015-12-10 20:39:01 -08:00
Howard Stearns
f6cd04680d
Merge pull request #6618 from hyperlogic/tony/sixense-debug-draw-fix
...
Fix for sixense debug draw after migration to plugin.
2015-12-10 16:14:43 -08:00
Howard Stearns
585911fe98
Merge pull request #6612 from sethalves/no-physics-until-ready
...
No physics until ready
2015-12-10 16:09:49 -08:00
Anthony Thibault
3daf80f498
Merge pull request #6490 from Atlante45/particle
...
Particle speedup
2015-12-10 15:27:35 -08:00
Anthony J. Thibault
1af780a664
Fix for sixense debug draw after move to plugin.
...
static variables used to hold a Singleton cannot be shared across dll boundaries by default.
This uses the globalInstance template to store the instance as a property on the QApplication.
2015-12-10 15:05:27 -08:00
Seth Alves
d050670c82
Merge pull request #6614 from ZappoMan/possibleFix
...
Fix whiteboard problems
2015-12-10 15:02:52 -08:00
Brad Hefta-Gaub
2fbabf20db
properly handle repack attempts
2015-12-10 14:03:06 -08:00
Atlante45
a1df320ffb
Merge branch 'master' of https://github.com/highfidelity/hifi into particle
2015-12-10 13:37:34 -08:00
Atlante45
03ee07c8b7
Merge branch 'master' of https://github.com/highfidelity/hifi into particle
2015-12-10 13:37:20 -08:00
Brad Hefta-Gaub
e133bd867a
Merge pull request #6600 from jherico/aeryn-sixense
...
Moving Sixense to external plugin
2015-12-10 13:33:17 -08:00
Bradley Austin Davis
c5f5e8de60
Trying to fix build problem
2015-12-10 12:00:40 -08:00
Seth Alves
98acd14bcc
Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready
2015-12-10 11:46:29 -08:00
Seth Alves
8ca6c7acc3
Merge pull request #6611 from Atlante45/attachments
...
Fix Attachments jitter
2015-12-10 11:46:19 -08:00
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
Brad Davis
645695d5d5
Moving sixense to external plugin
2015-12-10 10:44:23 -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
