Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-20 10:30:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38535 commits 25 branches 0 tags 1.1 GiB
Commit graph

5115 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Seth Alves
18a1f0884e Merge pull request #6884 from ericrius1/junkyardReset 
Junkyard reset script
 2016-01-27 11:19:02 -08:00
James B. Pollack
d8dbb717d5 Update junkyardResetEntityScript.js 2016-01-26 14:06:17 -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