Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-31 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
39330 commits 71 branches 59 tags 1.2 GiB
Commit graph

5340 commits

Author SHA1 Message Date
samcake
edbcef20d4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-03 09:44:05 -08:00
Seth Alves
e0ab6b6716 Merge branch 'dressing-room' of github.com:imgntn/hifi into dressing-room 2016-02-03 09:30:21 -08:00
Babiuch, Ryan Nicholas
7dd5bca17f Bug fixes and debt reductions on energy calculations. 
- removed superfluous code interfacing with scripts
- favor floats over doubles in cost calculations
- default avatar energy is maximum float value for cases where energy script is not loaded in order to still manipulate entities.
 2016-02-03 10:46:28 -06:00
ericrius1
a95176be8f added 0 prefix to nums 2016-02-02 18:22:39 -08:00
samcake
cb59cccc0c Adding 2 lists per brick now, the subcelItems and the regular items, trying to use it, probably buggy 2016-02-02 18:10:56 -08:00
ericrius1
89d235e2c2 First cut complete 2016-02-02 18:09:26 -08:00
ericrius1
e6a1300cd9 random interval spread 2016-02-02 17:28:21 -08:00
ericrius1
c26d7e61b5 interval is working 2016-02-02 17:18:24 -08:00
ericrius1
1bfe14c70e If sound is already downloaded, it's fetched from cache 2016-02-02 16:38:14 -08:00
Seth Alves
30e97c2a76 run attachedEntitiesManager.js by default, but without a UI 2016-02-02 16:34:06 -08:00
Howard Stearns
59f1cdfc18 Reinit bestPromise with each proposal. 2016-02-02 16:18:33 -08:00
ericrius1
964763b88c caching sounds 2016-02-02 15:54:37 -08:00
Howard Stearns
03244fbeb5 fix promise-sending. 2016-02-02 15:37:22 -08:00
Bradley Austin Davis
f24f2749e1 Make users.js show QML window for edit friends 2016-02-02 15:19:12 -08:00
James B. Pollack
0587981a20 add doppleganger features 2016-02-02 15:07:38 -08:00
ericrius1
d08bdb371a receiving push messages from entity script 2016-02-02 14:50:30 -08:00
Howard Stearns
fbcacbe14a simpler betterNumber test. 2016-02-02 14:31:32 -08:00
Seth Alves
260d27f4d7 increase drop-on-joint radius. fix bug that kept from dropping on hips (index 0). save adjustments if in dressing room 2016-02-02 14:31:20 -08:00
Howard Stearns
3d01b3ec2b watchdog 2016-02-02 14:15:03 -08:00
ericrius1
0aa68328c8 adding sound entity script 2016-02-02 13:59:56 -08:00
Howard Stearns
61393818fe Merge branch 'master' of https://github.com/highfidelity/hifi into virtualBaton 2016-02-02 13:41:54 -08:00
Howard Stearns
38443af437 typo 2016-02-02 13:36:40 -08:00
Howard Stearns
cdff3323fb typo 2016-02-02 13:25:42 -08:00
Howard Stearns
d0af2220dc Virtual baton. 2016-02-02 13:20:41 -08:00
ericrius1
93220c3b01 two sounds 2016-02-02 10:51:10 -08:00
ericrius1
20d1ba11c3 Basic ac sound playing and entity searching 
Injecting sounds from entity
 2016-02-02 10:37:23 -08:00
Ryan Huffman
57d92bcfa6 Stop creation of GridTool altogether in edit.js 2016-02-02 10:13:24 -08:00
Seth Alves
3bbecf5c8b Merge branch 'adjust-palm-position' of github.com:sethalves/hifi into dressing-room 2016-02-02 10:04:35 -08:00
Seth Alves
53e3f5a5d1 Merge branch 'save-held-adjustments' of github.com:sethalves/hifi into dressing-room 2016-02-02 10:04:15 -08:00
Ryan Huffman
dad36b73fc Disable gridTool in edit.js 2016-02-02 09:57:52 -08:00
Seth Alves
fec479d70a Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-02 09:25:11 -08:00
James B. Pollack
d25dbfff9f Merge pull request #6993 from hyperlogic/tony/mirrored-doppelganger 
doppelganger.js: mirror joint rotations & translations about x-axis
 2016-02-01 19:09:42 -08:00
Seth Alves
2501be16cb base palm position on finger joint rather than an offset from hand joint. double size of near-grab sphere 2016-02-01 18:11:27 -08:00
James B. Pollack
43844dd0be Merge pull request #7008 from ericrius1/editPropsDecimals 
Fixed bug where lack of 0 as prefix for numbers would throw an error
 2016-02-01 17:35:44 -08:00
ericrius1
1387f5f322 Fixed bug where lack of 0 as prefix for numbers would throw an error 2016-02-01 16:44:55 -08:00
Seth Alves
c570f4af67 Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-01 16:15:42 -08:00
Seth Alves
3209ac4f68 use controller hand rotation rather than IK hand rotation in grab script 2016-02-01 15:42:32 -08:00
ericrius1
25d5904d2d trying to destroy web window 2016-02-01 15:23:54 -08:00
Seth Alves
e4ef3ae869 automatically save adjustments to offset of equipped items 2016-02-01 15:06:53 -08:00
ericrius1
0bd6d22611 going to destroy entire page and recreate 2016-02-01 14:46:09 -08:00
Seth Alves
793b0f400f Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-01 14:35:37 -08:00
Brad Hefta-Gaub
9361c1655e Merge pull request #6980 from howard-stearns/performance-stats-repro-scripts 
Performance stats repro scripts
 2016-02-01 13:52:53 -08:00
Seth Alves
2207588c01 merge from upstream 2016-02-01 13:19:45 -08:00
ericrius1
81f95c6fc7 better starting values for particles 2016-02-01 12:48:40 -08:00
ericrius1
84f862d9c1 receiving web event from particle gui 2016-02-01 12:23:39 -08:00
howard-stearns
ae10d4343c Add data for a 2k triangle model. 2016-02-01 11:47:33 -08:00
Seth Alves
9dc6f08ae2 Merge pull request #6995 from imgntn/removeHighFreqMsg 
Remove high frequency messages from grab script
 2016-02-01 11:44:43 -08:00
Howard Stearns
d8069b6dbf Whitespace and jslinting. 2016-02-01 11:28:51 -08:00
Howard Stearns
11d80cdc94 Merge branch 'master' of https://github.com/highfidelity/hifi into performance-stats-repro-scripts 2016-02-01 10:38:13 -08:00
Seth Alves
aa6742a844 merge from james/removeHighFreqMsg 2016-02-01 10:01:50 -08:00
Seth Alves
d034850c49 Merge branch 'equip-via-parenting' of github.com:sethalves/hifi into dressing-room 2016-02-01 09:59:52 -08:00
Seth Alves
182ae22b44 merge James' doppelganger changes into Tony's 2016-02-01 09:58:35 -08:00
Seth Alves
6ca17a904a merge James' doppelganger changes into Tony's 2016-02-01 09:58:24 -08:00
Seth Alves
a65ff76da1 Merge branch 'tony/mirrored-doppelganger' of github.com:hyperlogic/hifi into dressing-room 2016-02-01 09:56:52 -08:00
Seth Alves
9a4431560f Merge branch 'master' of github.com:highfidelity/hifi into equip-via-parenting 2016-02-01 09:14:53 -08:00
Seth Alves
fb33131ac5 Merge pull request #6985 from imgntn/entitySpawnerAC 
Show how to use an AC to spawn / respawn entities
 2016-02-01 07:05:07 -08:00
Seth Alves
6927f9f503 Merge pull request #6984 from huffman/fix-edit-import-cancel 
Fix 'Import Entities' causing error when cancelling
 2016-02-01 07:04:36 -08:00
Seth Alves
f5ccf19f41 Merge pull request #6982 from howard-stearns/update-away-for-image-overlay 
Update away.js to use an image instead of text.
 2016-02-01 07:04:11 -08:00
Seth Alves
bc86298097 merge from upstream 2016-02-01 07:01:12 -08:00
Babiuch, Ryan Nicholas
47f7d55e2c Working energy usage for entity manipulation. 
- Working example in examples/example/ui/MyEnergyBar.js
 2016-02-01 08:32:52 -06:00
James B. Pollack
499e6d9804 update readme 2016-01-30 20:04:51 -08:00
James B. Pollack
7767dfb213 remove high freq messages 2016-01-30 19:59:56 -08:00
Anthony Thibault
6813f692da doppelganger.js: mirror joint rotations & translations about x-axis 
It's not pretty, mostly due to the lack of JavaScript access to the skeleton parent linkage information,
and lack of conversions between absolute and relative-to-parent joint rotations/translations.
 2016-01-30 16:16:26 -08:00
Seth Alves
6697b5ae5f get multi-near-grabs working again 2016-01-29 18:36:22 -08:00
Seth Alves
9a16bc7d22 when a parented equip or grab releases and the object should fall, give it a little velocity so bullet doesn't consider it static 2016-01-29 18:01:57 -08:00
Seth Alves
0c5c682887 unmuddle saved state in Settings and userData 2016-01-29 17:38:24 -08:00
ericrius1
f9a76a7502 Merge branch 'master' into particlesInEdit2 2016-01-29 17:20:48 -08:00
Philip Rosedale
1766f3fc23 remove debug 2016-01-29 17:20:22 -08:00
Philip Rosedale
ca459e0bd6 Merge branch 'master' of https://github.com/highfidelity/hifi into flocking 2016-01-29 17:18:35 -08:00
Philip Rosedale
11890badd8 Changes per PR suggestions 2016-01-29 17:16:48 -08:00
ericrius1
559fb9cbde fixed merge conflicts 2016-01-29 16:42:10 -08:00
Seth Alves
464f74fc1b don't attempt to distance-grab non-physical objects 2016-01-29 16:37:19 -08:00
Seth Alves
9ca89172f6 change grab script to equip with parenting rather than action. various other changes to messaging. added initial version of attachedEntitiesManager.js. updated toybox scripts to track messaging changes 2016-01-29 15:17:46 -08:00
Seth Alves
f554e25e36 Merge branch 'master' of github.com:highfidelity/hifi into equip-via-parenting 2016-01-29 15:15:28 -08:00
James B. Pollack
cb2fbd7e7f clear octree interval 2016-01-29 14:29:27 -08:00
James B. Pollack
5e5c6158bb show how to use an ac to spawn and respawn entities 2016-01-29 14:22:21 -08:00
Ryan Huffman
9a2af26906 Fix 'Import Entities' causing error when cancelling 2016-01-29 14:12:27 -08:00
Brad Davis
c4794dd0d5 Fix entity properties HTML 2016-01-29 13:41:43 -08:00
Howard Stearns
a117e73ea4 Update away.js to use an image instead of text. 2016-01-29 11:56:08 -08:00
howard-stearns
5376ba9b7d update to match lod doc 2016-01-29 11:27:27 -08:00
Philip Rosedale
a72c49793e speedups per code review 2016-01-29 10:57:17 -08:00
James B. Pollack
43f3b6409a Merge pull request #6966 from ericrius1/zoneEntityProps 
Moves zone props to top of entity properties panel
 2016-01-29 09:34:04 -08:00
Philip Rosedale
ee95f7906b Fish flocking example 2016-01-29 00:59:06 -08:00
Philip Rosedale
9f95a9de89 Limits on distance and mass for far grabbing 2016-01-29 00:52:59 -08:00
Brad Hefta-Gaub
8efe15cb21 Merge pull request #6963 from jherico/qmlOverlays 
Make all 2D overlays QML-based
 2016-01-28 23:33:30 -08:00
ericrius1
6be550a144 resolved conflicts 2016-01-28 17:08:24 -08:00
ericrius1
1a7887520d in progress 2016-01-28 16:38:24 -08:00
Brad Davis
5b817ccc21 Make all 2D overlays QML 2016-01-28 16:03:26 -08:00
James B. Pollack
96ddb9febb Merge pull request #6970 from ericrius1/webEntityURL 
Moved source URL up to top of entity properties panel
 2016-01-28 16:02:21 -08:00
ericrius1
804f82f2f1 good progress- can create particle entity from menu 2016-01-28 15:57:35 -08:00
ericrius1
0511ff70ac particle panel in tool window 2016-01-28 14:34:19 -08:00
ericrius1
628158e2fb Merge branch 'master' into zoneEntityProps 2016-01-28 13:26:10 -08:00
ericrius1
c30109ec29 trying to sync again 2016-01-28 13:21:48 -08:00
ericrius1
2acc88261f added particles 2016-01-28 13:14:36 -08:00
Howard Stearns
33226796ff Merge pull request #6964 from ericrius1/editHref 
Validate href entity property (hifi:// only)
 2016-01-28 12:29:18 -08:00
ericrius1
98453c085b Moved source URL up to top of entity properties panel 2016-01-28 12:08:21 -08:00
Andrew Meadows
3e35a5fc2d Merge pull request #6937 from ctrlaltdavid/20790 
Make entity properties be undefined after entity is unloaded
 2016-01-28 11:59:01 -08:00
ericrius1
3fff5868e8 Fix syntax error 2016-01-28 11:57:33 -08:00
ericrius1
40c66a94be Moves text props to top of Entity Props panel 2016-01-28 11:44:50 -08:00
ericrius1
191e6090e7 Moves zone props to top of entity props panel 2016-01-28 11:36:23 -08:00
ericrius1
cd5e81de36 Validating href for edit.js 2016-01-27 16:02:02 -08:00
howard-stearns
1fcb90ad7f checkpoint 2016-01-27 13:34:25 -08:00
Seth Alves
18a1f0884e Merge pull request #6884 from ericrius1/junkyardReset 
Junkyard reset script
 2016-01-27 11:19:02 -08:00
Seth Alves
3b7f8ef77d honor hardcoded equip offsets 2016-01-26 15:44:26 -08:00
James B. Pollack
d8dbb717d5 Update junkyardResetEntityScript.js 2016-01-26 14:06:17 -08:00
Seth Alves
11d2f9a8fc equip via parenting rather than action. change name of a messaging channel. minor cleanups. 2016-01-26 14:02:21 -08:00
ericrius1
e6379fcaa8 Naming changes 2016-01-26 12:57:41 -08:00
David Rowe
2834dee00d Remove erroneous edit.js call with missing entity ID 2016-01-26 22:07:42 +13:00
Brad Hefta-Gaub
1ef01d670d Revert "Make entity properties be undefined after entity is unloaded" 2016-01-25 18:07:14 -08:00
ericrius1
793654cbca Merge branch 'master' into junkyardReset 2016-01-25 17:10:58 -08:00
Eric Levin
d92b527f99 Merge pull request #6928 from imgntn/bow-parented-string 
Fix Separation of Bow and Bowstring
 2016-01-25 16:19:57 -08:00
Brad Hefta-Gaub
7d8a3de711 Merge pull request #6927 from AndrewMeadows/zero-velocities 
entity.js will zero velocities when entities cease to be dynamic
 2016-01-25 16:00:54 -08:00
James B. Pollack
eca75ba66d cleanup 2016-01-25 14:48:15 -08:00
Andrew Meadows
73805e831b zero velocities when entities cease to be dynamic 2016-01-25 14:05:48 -08:00
James B. Pollack
9be2a73d4a update bow to use parenting for prenotch string 2016-01-25 12:36:03 -08:00
David Rowe
9429f48a7c Remove erroneous edit.js call with missing entity ID 
JavaScript exception was being thrown now that entity properties are
undefined if entity is not found.
 2016-01-24 08:39:50 +13:00
Seth Alves
41a2173901 adjust grab script so that avatars can't bootstrap themselves during an object hand-off 2016-01-22 16:38:28 -08:00
samcake
f98f8d5bbb Revert "Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque" 2016-01-22 11:51:02 -08:00
samcake
7df3e9f306 Merge pull request #6876 from ericrius1/droplets 
Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque
 2016-01-21 18:32:43 -08:00
Brad Hefta-Gaub
e1c369dc10 Merge pull request #6766 from samcake/hdr 
Ambient Occlusion
 2016-01-21 18:10:52 -08:00
samcake
2471a88e85 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-21 15:53:25 -08:00
Brad Davis
ae6cba85e8 More atmosphere removal 2016-01-21 15:15:16 -08:00
ericrius1
e11e4d196b tweaks for coding standards 2016-01-21 13:24:07 -08:00
ericrius1
b3b1793035 removed edit.js changes 2016-01-21 12:03:09 -08:00
Philip Rosedale
7387d6e5f1 Merge pull request #6869 from imgntn/pistolfix 
Make Pistol Quieter and Minor Adjustments
 2016-01-21 11:15:07 -08:00
ericrius1
5132406d37 Test script for lod testing 2016-01-21 10:51:15 -08:00
ericrius1
641607f334 reset script 2016-01-21 10:22:56 -08:00
James B. Pollack
e63e509835 Update createPistol.js 2016-01-21 09:33:38 -08:00
Chris Collins
5dc1eb986e Merge pull request #6874 from imgntn/fixgrabparticlesystems 
Remove Particle Search Beams from Grab Script and Create / Destroy Systems on Demand
 2016-01-21 09:25:11 -08:00
Seth Alves
311e0cee67 Merge pull request #6820 from AndrewMeadows/collision-mask 
use "collidesWith" instead of "collisionMask"
 2016-01-21 09:13:34 -08:00
Eric Levin
0cfd9e429a Merge pull request #6872 from imgntn/messageTests 
Add Messaging Tests and Organize
 2016-01-21 09:05:23 -08:00
samcake
8d1ab01018 exposing one more parameter 2016-01-20 18:32:44 -08:00
ericrius1
99e69616fa basic comms 2016-01-20 17:50:52 -08:00
Eric Levin
6f646dc193 Update weatherBox.js 
Added header
 2016-01-20 17:41:40 -08:00
ericrius1
3b75cbea3a removed old weather box 2016-01-20 16:32:30 -08:00
James B. Pollack
c2b5dfdfe6 clear sphere 2016-01-20 16:09:37 -08:00
James B. Pollack
6f1ea9a3d3 cleanup 2016-01-20 15:20:59 -08:00
ericrius1
eb5a950f85 texture opacity potential fix 2016-01-20 15:08:39 -08:00
James B. Pollack
53b4a509f7 remove particle search beams and create / destroy systems on demand 2016-01-20 14:17:32 -08:00
ericrius1
055d56b9e5 lightning texture appearing> 2016-01-20 14:16:38 -08:00
James B. Pollack
a57ccdd0e8 messages 2016-01-20 13:37:58 -08:00
ericrius1
44fd7e8c15 Model and lightning showing up 2016-01-20 11:57:33 -08:00
samcake
07c630bcda And cleaning again hopping to have the pr build 2016-01-20 11:44:01 -08:00
James B. Pollack
b91e5c27e1 Update createPistol.js 2016-01-20 10:45:40 -08:00
ericrius1
fa9a066f9a model tweaks 2016-01-20 10:44:25 -08:00
James B. Pollack
8d3468265f make pistol collision sound quieter, other adjustments 2016-01-20 10:44:02 -08:00
samcake
320c799379 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-20 10:14:02 -08:00
samcake
379c882834 Debugging the darkness and pointing out bugs 2016-01-20 02:03:09 -08:00
ericrius1
a16b267b24 Merge branch 'master' into droplets 2016-01-19 18:27:40 -08:00
ericrius1
4e052dca61 color cloud adjustment 2016-01-19 18:26:32 -08:00
ericrius1
d2a815176b lightning strikes 2016-01-19 17:09:39 -08:00
ericrius1
713496a8a0 lightning strikes 2016-01-19 16:02:41 -08:00
Brad Hefta-Gaub
55093aafea Merge pull request #6826 from kevinmthomas-carpool/LoadScriptFromEntityFix 
Fixed entity script loading functionality for the jsstreamplayer.
 2016-01-19 13:14:43 -08:00
samcake
c5c3f464cd Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-19 12:13:11 -08:00
samcake
6f93fb3114 Can now process the AO at lower resolution in orer to gsave performances 2016-01-19 12:12:51 -08:00
Andrew Meadows
4a91ed3d66 fix bad conflict resolution 2016-01-19 11:42:29 -08:00
Andrew Meadows
d990482c0a use collidesWith for bow.js workaround 2016-01-19 11:42:29 -08:00
Andrew Meadows
db77f22a61 use "collidesWith" instead of "collisionMask" 
but make "collisionMask" work for those who want it
 2016-01-19 11:41:22 -08:00
Seth Alves
8ba800fda8 Merge pull request #6851 from AndrewMeadows/collisionless2 
namechange "ignoreForCollisions" to "collisionless"
 2016-01-19 11:33:55 -08:00
ericrius1
5245bdc96e tweaks 2016-01-19 11:09:30 -08:00
Brad Hefta-Gaub
e15c7f089e Merge pull request #6850 from sethalves/various-fixes 
Various fixes
 2016-01-19 10:15:46 -08:00
Brad Hefta-Gaub
15899558aa Merge pull request #6842 from AlessandroSigna/vrShop 
Vr shop
 2016-01-19 09:39:28 -08:00
Andrew Meadows
48374ef5bc more ignoreForCollisions to collisionless 2016-01-19 09:06:17 -08:00
Andrew Meadows
7fb145e819 namechange ignoreForCollisions --> collisionless 2016-01-19 09:06:17 -08:00
samcake
df496b065c Merging with master 2016-01-18 16:40:34 -08:00
Seth Alves
9428da61cf fix property name typo 2016-01-18 14:31:55 -08:00
samcake
91dff3195e Remove the setup values used for debuging 2016-01-18 14:28:26 -08:00
samcake
93c7c182b3 Exposing the gpu RangeTimer counter for the AO effect 2016-01-18 14:10:59 -08:00
Seth Alves
823428290d Merge branch 'master' of github.com:highfidelity/hifi into various-fixes 2016-01-18 13:26:45 -08:00
Seth Alves
94bafb4a1e Merge pull request #6832 from AndrewMeadows/no-collisionsWillMove 
namechange collisionsWillMove --> dynamic
 2016-01-18 11:51:59 -08:00
Seth Alves
8b6e89a5c4 fix stopFarTrigger entity method call. re-add code to keep more than one distance grab per object from happening 2016-01-18 11:13:33 -08:00
samcake
10de1ac9b5 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-18 11:03:34 -08:00
Seth Alves
d8dceade2e Merge pull request #6833 from PhilipRosedale/searchChoice 
Choice of hand ray pick or head pick
 2016-01-18 11:03:30 -08:00
AlessandroSigna
737a00a2cb Typo fixed 2016-01-18 16:20:32 +01:00
Philip Rosedale
9b3155188d Squeeze a little to search, a lot to grab 2016-01-17 19:10:40 -08:00
Philip Rosedale
23a8d57ca2 Always show search ray 2016-01-17 14:14:00 -08:00
Philip Rosedale
588719a4c2 merge conflict fix 2016-01-17 13:07:55 -08:00
samcake
86e9c5ac9b Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-16 22:17:08 -08:00
samcake
39f1649cdf refining the settings for the blur pass and splitting the uniforms in 2 buffers, one per frame with transform info and one for the parameters which are rarely changing 2016-01-16 22:16:07 -08:00
James B. Pollack
8c4abd2a2d Merge pull request #6847 from howard-stearns/tribbles 
tribbles
 2016-01-16 18:28:58 -08:00
James B. Pollack
28f1a86527 Merge pull request #6821 from ericrius1/whiteboardFix 
Some fixes to whiteboard to get rid of gaps between lines and jagged …
 2016-01-16 18:19:33 -08:00
James B. Pollack
3631db4e2d Merge pull request #6845 from howard-stearns/render-matrix 
render test script
 2016-01-16 18:16:49 -08:00
Andrew Meadows
c1a1cbf718 fix typo 2016-01-16 15:55:10 -08:00
Howard Stearns
1985aa9d77 Drops a bunch of "tribbles" (small spheres) in front of you. 
They edit change color at 60hz and jump randomly at an average 1hz for 30 seconds, and then dissapear after 60 seconds.
Useful for testing the load of physical objects.
 2016-01-16 13:26:39 -08:00
Howard Stearns
994d13df5a A test script to confirm that the specified edit rate can be achieved for the specified number of objects. 2016-01-16 11:32:19 -08:00
Howard Stearns
63db6d0f72 A script to test rendering load by creating a rectangular matrix of the specified objects, with no physical or entity changes after creation, either in front of you or overhead. 2016-01-16 11:17:13 -08:00
ericrius1
d54c177a5f add weather box 2016-01-15 15:37:52 -08:00
Andrew Meadows
84282d0114 final repairs after rebase 2016-01-15 15:28:26 -08:00
Andrew Meadows
e763c055b3 more namechanges in JS scripts 2016-01-15 15:24:46 -08:00
Andrew Meadows
29a52bf0ba namechange collisionsWillMove --> dynamic 2016-01-15 15:23:52 -08:00
ericrius1
dcb346fffb lillypond 2016-01-15 15:14:11 -08:00
samcake
fef5e3c8da Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-15 14:44:57 -08:00
Philip Rosedale
210b3ba1ec Merge pull request #6819 from sethalves/grab-script-fixes 
grab script fixes
 2016-01-15 09:40:57 -08:00
samcake
3f4f10c38c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-15 09:21:13 -08:00
samcake
ae18bb8ef7 FIxed the stereo rendering 2016-01-14 19:23:29 -08:00
AlessandroSigna
41e6dd48e0 Overlay manager exposing findRayIntersection 2016-01-14 18:27:17 -08:00
AlessandroSigna
e4501e3a8f Added cart, cash, inspect and readme 2016-01-14 18:23:39 -08:00
EdgarPironti
40279c8fc5 Item, Review, Shop and Vendor scripts. 2016-01-14 18:20:40 -08:00
Philip Rosedale
c5556b1c29 Merge pull request #6841 from ericrius1/diceOverlay 
added dice icon back to dice.js script
 2016-01-14 17:49:04 -08:00
ericrius1
d4491a9ec2 added dice icon back to dice.js script 2016-01-14 17:13:07 -08:00