Brad Davis
6098c4a1d6
Revert "Revert "Migrate QML based web views to Qt WebEngine""
...
This reverts commit 1f3adeb666
2015-12-18 17:18:46 -08:00
Brad Davis
1f3adeb666
Revert "Migrate QML based web views to Qt WebEngine"
2015-12-18 17:09:38 -08:00
Brad Hefta-Gaub
868d10651a
Merge pull request #6651 from jherico/webengine
...
Migrate QML based web views to Qt WebEngine
2015-12-18 14:56:35 -08:00
David Rowe
c3e3af7c8c
Document effect of Bezier interpolation on particle radius simulation
2015-12-18 15:11:43 +13:00
David Rowe
e2ecc388ca
Indicate particle properties that (temporarily) aren't working
2015-12-18 15:10:47 +13:00
David Rowe
5aef309b8a
Get particles in particlesTest.js emitting again
2015-12-18 15:09:36 +13:00
Brad Davis
5088eec2a2
Move directory web UI into the overlay
2015-12-17 12:23:39 -08:00
Brad Davis
82c865af2c
Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine
2015-12-17 12:20:38 -08:00
Brad Davis
fa5bab08b1
Support web content inside QML
2015-12-16 16:25:38 -08:00
Clément Brisset
7c8f019507
Merge pull request #6663 from birarda/baseball
...
update link to bat script in createBatButton.js
2015-12-15 19:26:33 -08:00
Stephen Birarda
13c83bb262
update link to bat script in createBatButton.js
2015-12-15 17:23:29 -08:00
Brad Davis
29516619ee
Merge pull request #6661 from ZappoMan/rightClickMenu
...
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 16:08:59 -08:00
Brad Hefta-Gaub
3dcdfbc0f1
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 13:59:22 -08:00
Anthony J. Thibault
3f0cdb3c02
Merge branch 'master' into tony/js-avatar-default-pose
2015-12-14 11:19:24 -08:00
Brad Hefta-Gaub
2815cb0fef
first cut at adding advanced and developer menu groupings
2015-12-12 18:12:36 -08:00
Brad Hefta-Gaub
64dd36d140
Merge pull request #6503 from imgntn/ratsteer
...
Add rats to Drylake environment
2015-12-11 13:08:03 -08:00
James B. Pollack
35da54fc6c
dead code and print statements
2015-12-11 11:51:32 -08:00
James B. Pollack
a31ba089c1
semicolons and print statements
2015-12-11 11:49:00 -08:00
Howard Stearns
e8ffa598a2
Merge branch 'master' of https://github.com/highfidelity/hifi into scriptable-anim-var-triggers
2015-12-10 20:40:42 -08:00
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
James B. Pollack
99bc47867a
cleanup
2015-12-10 18:16:01 -08:00
James B. Pollack
c463e36ce6
make particle explorer visible
2015-12-10 14:02:52 -08:00
Anthony J. Thibault
020836f536
Fixed date on tPose.js
2015-12-10 14:00:22 -08:00
Anthony J. Thibault
652ce5501f
Expose Avatar default pose to JavaScript
...
New JavaScript API to get the avatar's default pose.
MyAvatar.getDefaultJointRotation(index);
MyAvatar.getDefaultJointTranslation(index);
See `examples/tPose.js` for example usage
2015-12-10 13:57:31 -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
James B. Pollack
b16822ed8a
swap sound file
2015-12-09 18:41:06 -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
Atlante45
17daff920c
Fix all entities using relative grab pos/rot
2015-12-09 14:25:18 -08:00
Atlante45
4ee5bf316a
Fix bow offsets
2015-12-09 14:25:18 -08:00
Atlante45
65bc6aa371
Fix left hand grab
2015-12-09 14:25:18 -08:00
Philip Rosedale
bda4e41958
Merge pull request #6581 from kencooke/audio-reverb
...
New reverb parameters
2015-12-08 14:59:58 -08:00
James B. Pollack
22a1ee83e6
ignore parenting properties
2015-12-08 10:39:04 -08:00
Seth Alves
71a5dfc4d6
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-07 17:04:02 -08:00
Leonardo Murillo
5d789095b5
Merge pull request #6570 from ctrlaltdavid/20740
...
Update Leap Motion script to use animation state handlers
2015-12-07 16:37:42 -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
Leonardo Murillo
25494ec867
Merge pull request #6562 from Atlante45/baseball
...
Baseball
2015-12-07 14:11:21 -08:00
James B. Pollack
6925276819
cleanup
2015-12-07 14:01:53 -08:00
Atlante45
84bc947854
Typo
2015-12-07 14:00:06 -08:00
James B. Pollack
873496e64b
cleanup
2015-12-07 13:53:40 -08:00
Ken Cooke
90ef92c79b
Fix slider layout
2015-12-07 13:34:55 -08:00
James B. Pollack
18e544cc53
Merge branch 'master' into ratsteer
2015-12-07 13:18:19 -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
James B. Pollack
27ce0a36d3
cleanup logging
2015-12-07 12:20:06 -08:00
James B. Pollack
e9f21b4dba
make lights parented to flashlight instead of updated in loop
2015-12-07 11:30:10 -08:00
Ryan Huffman
9d47ac000e
Merge pull request #6479 from thoys/editjs-left-click
...
No more right-click-move editing in edit.js
2015-12-07 08:29:01 -08:00
