Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-18 13:55:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38449 commits 26 branches 28 tags 1.2 GiB
Commit graph

5095 commits

Author SHA1 Message Date
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
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
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
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
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
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
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