Seth Alves
1161f33b45
laser-poiner script for mouse
2015-05-14 20:25:29 -07:00
Seth Alves
3471c0a44f
Merge pull request #4878 from PhilipRosedale/hockeygame
...
new paddle models, low friction on field
2015-05-14 18:23:27 -07:00
Philip Rosedale
7be463388b
new paddle models, low friction on field
2015-05-14 18:22:30 -07:00
Eric Levin
7a12a4d58e
added support for both right and left hydras for hydra scripts, and made picking accurate
2015-05-14 17:00:40 -07:00
Philip Rosedale
363f55c0f1
Merge pull request #4872 from ericrius1/hydraHockey
...
added hydraHockeyGrab.js, which constrains moving object to xz plane …
2015-05-14 15:05:44 -07:00
Andrew Meadows
53e241fb07
merge upstream/master into andrew/thermonuclear
2015-05-14 12:37:41 -07:00
Andrew Meadows
d28c400cea
add restitution and friction Entity properties
2015-05-14 12:36:59 -07:00
Eric Levin
ebb590e58a
added new hydragrab script which works similarly to mouse grab script, and added header to hydraGrabHockey script
2015-05-14 11:46:52 -07:00
Eric Levin
3393b60aba
added hydraHockeyGrab.js, which constrains moving object to xz plane and disables rotation
2015-05-14 11:39:04 -07:00
Philip Rosedale
1e01aeb9ed
first version, air hockey game
2015-05-13 23:11:24 -07:00
Brad Hefta-Gaub
b799b89dbc
Merge pull request #4861 from thoys/20540
...
CR for Job #20540 - Additions to Planky
2015-05-13 20:40:58 -07:00
Brad Hefta-Gaub
5da0a8d7a3
Merge pull request #4860 from howard-stearns/entity-sound
...
Entity sound.
2015-05-13 20:07:44 -07:00
Philip Rosedale
4811697de3
Merge pull request #4866 from sethalves/fix-grab.js-entity-picking
...
have grab.js do *accurate* picking!
2015-05-13 19:52:09 -07:00
Seth Alves
73fa1af24a
have grab.js do *accurate* picking!
2015-05-13 19:38:19 -07:00
Howard Stearns
b79a58c0c8
Whitespace.
2015-05-13 18:07:51 -07:00
Brad Hefta-Gaub
072a982fe3
Merge pull request #4851 from huffman/fix-edit-properties-width
...
Remove nowrap from entity tool property labels
2015-05-13 17:45:57 -07:00
Howard Stearns
8324da2f7f
Whitespace formatting/indentation.
2015-05-13 15:48:22 -07:00
Howard Stearns
1a87ca04da
Entity sound.
2015-05-13 13:18:02 -07:00
Brad Davis
9b6c20d93c
Merge remote-tracking branch 'upstream/master' into web-entity
2015-05-13 09:49:53 -07:00
Ryan Huffman
b4416f3bc2
Remove nowrap from entity tool property labels
2015-05-13 08:36:11 -07:00
Brad Davis
a8d343bbf1
Working on web entities
2015-05-13 00:27:57 -07:00
Brad Davis
e9b83e1c02
Working on web entities
2015-05-12 21:15:54 -07:00
Philip Rosedale
107faf39c4
Merge pull request #4844 from huffman/color-picker-reduce-size
...
Make edit color picker slimmer
2015-05-12 16:35:09 -07:00
Seth Alves
4a533748f4
Merge pull request #4848 from PhilipRosedale/master
...
update position and rotation from the script, even though we should not have to
2015-05-12 16:13:29 -07:00
Brad Davis
8c4f802dbf
Merge remote-tracking branch 'upstream/master' into web-entity
...
Conflicts:
libraries/entities/src/EntityItemProperties.h
libraries/entities/src/EntityTypes.h
2015-05-12 15:56:02 -07:00
Brad Davis
745182a963
Working on web entities
2015-05-12 14:39:54 -07:00
Ryan Huffman
2e31cca7e5
Make edit color picker slimmer
2015-05-12 14:03:06 -07:00
Philip Rosedale
11ab97e0fc
update position and rotation from the script, even though we should not have to.
2015-05-12 13:11:11 -07:00
Thijs Wenker
77e5e7a547
random blockheight variation in Planky
2015-05-12 21:38:49 +02:00
Seth Alves
f647db3bf0
Merge branch 'master' of github.com:highfidelity/hifi into line-entity
2015-05-12 11:36:56 -07:00
Seth Alves
7a85bfa0d1
fix up grab.js to use line entity
2015-05-12 11:36:05 -07:00
Seth Alves
38caed00ca
Attempt to draw line entity item
2015-05-12 10:25:50 -07:00
Brad Hefta-Gaub
a32b4df6a5
Merge pull request #4841 from huffman/color-picker
...
Fix skybox color picker
2015-05-12 09:24:50 -07:00
Ryan Huffman
e673746d58
Fix skybox color picker
2015-05-12 09:22:53 -07:00
Brad Hefta-Gaub
9e308cce21
Merge pull request #4839 from huffman/color-picker
...
Add color picker to entity properties
2015-05-12 08:58:41 -07:00
Ryan Huffman
9f7e90d036
Add color picker to entity properties
2015-05-12 08:40:44 -07:00
Brad Hefta-Gaub
4d9e413b3f
Merge pull request #4820 from hyperlogic/ajt/particle-system-improvements
...
Improvements to particle entity.
2015-05-12 08:40:11 -07:00
Clément Brisset
0bc12f40e6
Merge pull request #4834 from huffman/edit-draw-zone-boundaries
...
Remove old zone drawing
2015-05-12 14:29:42 +02:00
Clément Brisset
9bf4cf1262
Merge pull request #4830 from ZappoMan/moreZoneProperties
...
New Zone Features
2015-05-12 14:28:01 +02:00
Anthony Thibault
e1cbfcd901
Merge branch 'master' into ajt/particle-system-improvements
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-05-11 19:24:13 -07:00
Anthony Thibault
b3af515224
Particle entity improvements based on code review.
...
* Updated variable naming to match coding standards.
* Changed particle raw float arrays to vectors.
* Bug fix: changing maxParticles will no longer lead to memory corruption.
* Made particle ring buffer more explicit, added _particleTailIndex.
* Added getLivingParticleCount() private method.
* Moved integration and bounds code into private methods.
* Bug fix: high emit rates now properly integrate particles forward for the
remaing frame time, not the entire frame.
* Bug fix: new particles were not initiaized to origin.
* Added more particles to ajt-test.js.
* Bug fix: ajt-test.js script was not shutting down properly.
* Removed random seed, unless we have a psudo random number generator per
particle system instance, it's unlikely that this will preserve sync.
* Bumped packet version number.
2015-05-11 19:21:33 -07:00
Seth Alves
866a6fba9b
Merge pull request #4823 from birarda/master
...
repairs to AC stop and clean shutdown
2015-05-11 18:11:52 -07:00
Seth Alves
237eb72bec
if two people grab an enitity at once, don't forget about the original gravity
2015-05-11 16:01:50 -07:00
Ryan Huffman
24739d24e1
Fix calls to set draw zone boundaries
2015-05-11 15:23:39 -07:00
Ryan Huffman
6085aadbc7
Merge branch 'master' of github.com:highfidelity/hifi into edit-draw-zone-boundaries
...
Conflicts:
examples/libraries/zoneOverlayManager.js
2015-05-11 15:19:54 -07:00
ZappoMan
73428ec12d
add support to not displace very large clipboards on import
2015-05-11 14:21:58 -07:00
ZappoMan
28bacb4d82
add center in zone button to edit.js
2015-05-11 13:26:52 -07:00
Stephen Birarda
8c6715e4fc
resolve conflicts on merge with upstream/master
2015-05-11 11:10:22 -07:00
Clément Brisset
5160eb5b94
Merge pull request #4819 from ZappoMan/moreZoneProperties
...
More Zone Atmosphere Work: add automatic day/hour calculation
2015-05-11 19:38:27 +02:00
ZappoMan
4b8c6fc624
fix typo
2015-05-11 09:53:23 -07:00
