Howard Stearns
09e9d353ea
Deprecate globalCollisionsExample.js, and add entityCollisionExample.js
2015-05-25 17:15:55 -07:00
Howard Stearns
706c837886
Use collisionSoundURL for billiards.js, instead of the global collision event.
2015-05-25 17:12:36 -07:00
Atlante45
18812ab25f
Fix entityProperties.html undefined ref
2015-05-24 19:21:04 +02:00
Triplelexx
9a29489784
expose particle properties for editing
...
I have made these changes to aid with experimenting with particles when
running the edit scripts locally.
2015-05-23 17:57:25 +01:00
Brad Hefta-Gaub
225021671a
Merge pull request #4950 from ericrius1/particleScriptName
...
renamed ajt-test to particles.js since ajt-test doesn't tell us anyth…
2015-05-22 22:17:39 -07:00
Eric Levin
71c0aa4913
renamed ajt-test to particles.js since ajt-test doesn't tell us anything about what the script does
2015-05-22 15:33:38 -07:00
Eric Levin
d40d9cca69
deleted look.js (no longer needed) and removed from default scripts
2015-05-22 10:02:28 -07:00
Brad Hefta-Gaub
9b469226f3
Merge pull request #4934 from sethalves/fix-edit-js
...
fix edit.js -- selectionManager.selections holds ids, not properties
2015-05-21 18:32:05 -07:00
Seth Alves
35b1a6eee4
selectionManager.selections holds ids, not properties
2015-05-21 18:15:05 -07:00
Philip Rosedale
05a73d8a79
Merge pull request #4933 from ericrius1/inspectFix
...
added oldMode as global vairable
2015-05-21 18:14:40 -07:00
Eric Levin
ce1ccf1c40
added oldMode as global vairable
2015-05-21 18:08:04 -07:00
Eric Levin
8a0c1cab1e
inspect now uses accurate picking and camera slerps to looks at target. pointer does not show u when user is inspecting
2015-05-21 15:31:30 -07:00
Seth Alves
aa1d3eb82a
respond to code review
2015-05-20 17:31:57 -07:00
Seth Alves
d8beed34d6
remove // ? comments
2015-05-20 16:27:28 -07:00
Seth Alves
782402b4c8
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-20 14:53:05 -07:00
Brad Hefta-Gaub
6955626b77
Merge pull request #4900 from ericrius1/hockey
...
added check to airhockey script so entities that have never been crea…
2015-05-20 14:50:00 -07:00
Brad Hefta-Gaub
6d20fa72db
Merge pull request #4899 from Nex-Pro/plankyUpdate
...
Planky Game. Added values for friction and restitution in the entity parameters.
2015-05-20 14:49:39 -07:00
Brad Hefta-Gaub
75f6092023
Merge pull request #4902 from Atlante45/fix_source_url
...
Fix sourceUrl box in edit.js
2015-05-20 14:49:15 -07:00
Ryan Huffman
6f69ed2561
Fix calculated dimensions of spotlight
...
The spotlights region of effect is the intersection of the spotlight
with radius r, and the sphere of radius r
2015-05-20 09:11:48 -07:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07:00
Andrew Meadows
139ebca258
less bad behavior when dragging across horizon
2015-05-18 23:09:08 -07:00
Andrew Meadows
d486899aad
remove unused experimental grab placement
2015-05-18 22:54:00 -07:00
Andrew Meadows
fbd1b7e8b0
grabHockey.js can also rotate objects again
2015-05-18 22:49:23 -07:00
Andrew Meadows
b60907570a
safe to use grabHockey.js to grab misc objects
2015-05-18 22:32:20 -07:00
Andrew Meadows
bb1fe8f439
cleanup and stability for grabHockey.js script
2015-05-18 16:57:25 -07:00
Seth Alves
58b6205433
pull in Andrew's adjustment of paddle confinement
2015-05-18 14:10:58 -07:00
Seth Alves
34b381d48c
have airHockey.js provide the floor of the table, rather than the collision hull
2015-05-18 13:47:10 -07:00
Seth Alves
ab13eb2d16
put lowered friction back on table. incorportate Andrew's fix for the paddle crashing through the new table corners
2015-05-18 13:30:28 -07:00
Seth Alves
e2a39b4597
airhockey -- drop from slightly lower so paddle doesn't flip over. update grab script with new table name
2015-05-18 12:18:27 -07:00
Seth Alves
6d9db21d88
Merge branch 'master' of github.com:highfidelity/hifi into airhockey-hull
2015-05-18 12:09:10 -07:00
Seth Alves
5ea506f2c1
use a collision hull for table. make deletion code safer
2015-05-18 11:47:06 -07:00
Stephen Birarda
b5fb8b0d12
Merge pull request #4908 from howard-stearns/edit-script-type
...
Fix (long-standing?) typo in edit.js file reference.
2015-05-18 13:37:45 -04:00
Howard Stearns
adfe21b743
Fix (long-standing?) typo in edit.js file reference.
2015-05-18 10:28:47 -07:00
Andrew Meadows
257a730029
keep hokey paddle in playing field
2015-05-18 09:42:55 -07:00
Atlante45
9d27108acb
Fix sourceUrl box in edit.js
2015-05-18 13:29:13 +02:00
Eric Levin
03a4e08573
deleted unecsesary whitespace
2015-05-16 07:41:25 -07:00
Eric Levin
b6f1a1b89b
added check to airhockey script so entities that have never been created are not attempting to be deleted
2015-05-16 07:34:32 -07:00
Philip Rosedale
831148e280
Merge pull request #4888 from sethalves/finglonger
...
more pointer.js fixes
2015-05-15 17:18:32 -07:00
Philip Rosedale
1c3873358d
Merge pull request #4896 from huffman/update-web-icon
...
Update web icon
2015-05-15 17:18:11 -07:00
Philip Rosedale
534869a7ad
Merge pull request #4889 from ericrius1/dice
...
changed dice to use collisionSoundURL prop
2015-05-15 17:17:45 -07:00
Nex Pro
75ddad7ec1
Added values for friction and restitution in the entity parameters.
2015-05-16 00:43:05 +01:00
Ryan Huffman
a0369d243a
Update web icon
2015-05-15 15:58:02 -07:00
Eric Levin
9bfca7f54d
'moved icons up so they don't interfere with dice icons and changed spanw icon from dice to puck icon'
...
'
2015-05-15 15:43:23 -07:00
Eric Levin
6e1c5d704c
'modified airHockey script to be able to spawn and delete using buttons, added light flashing on score, and puck now respawns on player's side who just got scored on
2015-05-15 15:24:10 -07:00
Seth Alves
60bd345e57
shorter timeout
2015-05-15 14:20:29 -07:00
Seth Alves
0d3add8596
left mouse button only
2015-05-15 14:16:06 -07:00
Seth Alves
aeb5cead65
more fixes to pointer.js
2015-05-15 14:02:25 -07:00
Eric Levin
9c6be26290
changed dice to use collisionSoundURL prop
2015-05-15 13:55:48 -07:00
Seth Alves
042713d1ec
Merge branch 'master' of github.com:highfidelity/hifi into finglonger
2015-05-15 13:55:28 -07:00
Seth Alves
f535bd2a76
more fixes to pointer.js
2015-05-15 13:54:24 -07:00
Seth Alves
de8d06acf6
Merge pull request #4887 from PhilipRosedale/hockeygame
...
remove line pointers from grab and hockey grab
2015-05-15 13:43:55 -07:00
Philip Rosedale
cb0112e14e
remove line pointers from grab and hockey grab
2015-05-15 13:21:58 -07:00
Seth Alves
bb3d1a6a58
rays never pick a line entity. some fixes to pointer.js
2015-05-15 13:10:16 -07:00
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
