Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 15:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

32492 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
e8435b6218 Procedural rendering for box entities 2015-09-05 12:10:45 -07:00
David Rowe
8b296f53e6 Short-circuit radius values and interpolation when can 2015-09-05 11:13:48 -07:00
David Rowe
8d85309925 Use cubic interpolation instead of cosine 2015-09-05 10:50:05 -07:00
David Rowe
12b8a5a1d5 Add alpha property support to ParticleEffect entities 
Add at same "level" as color so that it's available for other entity
types to use in the future.
 2015-09-05 10:23:27 -07:00
Brad Hefta-Gaub
50e6d2f769 Merge pull request #5712 from highfidelity/bubblewand 
wand.js + bubble.js = bubblewand
 2015-09-04 20:07:22 -07:00
Brad Hefta-Gaub
7b4e69a92d Merge pull request #5698 from Nex-Pro/20657 
CR for Job #20657 - Entities list trouble past 100 entities
 2015-09-04 20:06:33 -07:00
James B. Pollack
ec06c2ff4a Merge pull request #5725 from ZappoMan/breakdanceToy 
have breakdance entity script use the model and location of the entity
 2015-09-04 19:27:15 -07:00
Seiji Emery
68a4f4ac5e Added js benchmark scripts 
Adds a small declarative benchmarking library and some sample tests to
examples/utils/tests.
 2015-09-04 17:36:09 -07:00
Anthony Thibault
083c5b6738 Merge pull request #5721 from howard-stearns/default-avatar-for-animations 
avatar animation defaults
 2015-09-04 17:06:53 -07:00
Brad Hefta-Gaub
10585a1b30 have breakdance entity script use the model and location of the entity 2015-09-04 16:20:12 -07:00
Brad Davis
644e81e20b Toggle mute while holding the hydras 2015-09-04 16:19:58 -07:00
Anthony J. Thibault
bb5d061d78 linux and mac compile fixes. 
Removed "friend MyAvatar" from Rig and JointState.
This was only there for debugging, but I accidentally committed it.
 2015-09-04 16:17:35 -07:00
Anthony J. Thibault
69e463bbfd AnimDebugDraw Improvements 
* Now always works, regardless of whether or not Rig or AnimGraph animations
  are enabled.
* Changed joint radius to 1 cm.
* Changed xyz axis length to 4 cm.
 2015-09-04 16:01:05 -07:00
James Pollack
5684e13400 updates for cleaner PR 2015-09-04 15:49:12 -07:00
David Rowe
c9cf426dba Fix EntityPropertyList merge 2015-09-04 15:31:21 -07:00
Seth Alves
66bd59b142 Merge pull request #5722 from ZappoMan/fixPPSError 
fix a bug in bad PPS calculation
 2015-09-04 15:29:20 -07:00
Brad Hefta-Gaub
b63e15f2e9 fix a bug in bad PPS calculation 2015-09-04 15:06:56 -07:00
Howard Stearns
d3106de7c1 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-04 14:32:58 -07:00
Howard Stearns
086afc47b1 Avatar animations on by default. (Using the now old animation machinery.) 
Default robot avatar consistent with the animations.
Don't require all the bones to be present.
 2015-09-04 14:24:37 -07:00
Seth Alves
e0840b79ef Merge pull request #5720 from ZappoMan/fixHoldAction 
fix hold action with zero offsetLength
 2015-09-04 14:19:13 -07:00
Brad Hefta-Gaub
21afafd4e6 fix hold action with zero offsetLength 2015-09-04 14:07:12 -07:00
David Rowe
e86581ab64 Update scripts to use HiFi smoke particle 2015-09-04 13:51:25 -07:00
David Rowe
18bc7befee Merge branch 'master' into 20669 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2015-09-04 13:49:46 -07:00
David Rowe
c910da7179 Add radiusStart and radiusFinish entity particle properties 2015-09-04 12:27:18 -07:00
Stephen Birarda
875d10575f add filename rename somehow missed in previous commit 2015-09-04 12:43:43 -06:00
Stephen Birarda
3875a7d881 fix bad copy on merge to FileResourceRequest 2015-09-04 12:39:35 -06:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
Seth Alves
7d2bdb3689 Merge pull request #5719 from ericrius1/spraypaint 
added spraypaint-can entity script
 2015-09-04 11:27:52 -07:00
Howard Stearns
d623ba3ef2 Merge pull request #5700 from hyperlogic/ajt/new-anim-system 
New Animation System
 2015-09-04 11:24:31 -07:00
Anthony J. Thibault
5882ec02d0 Merge branch 'master' into ajt/new-anim-system 2015-09-04 11:05:29 -07:00
Anthony J. Thibault
3f258c89b4 Fix transition from AG+Rig to AG only. 2015-09-04 11:03:59 -07:00
ericrius1
f48cfa1208 added spawner script for spray paint toy 2015-09-04 10:36:14 -07:00
Andrew Meadows
5d40517edd Merge pull request #5706 from sethalves/polyvox-again 
Polyvox improvements
 2015-09-04 10:32:36 -07:00
ericrius1
878d42a8d0 added spraypaint can entity script 2015-09-04 10:30:12 -07:00
Brad Hefta-Gaub
143376f501 Merge pull request #5718 from jherico/homer 
Magballs: Cleaning up some debugging spew and fixing UI HTML paths
 2015-09-04 10:01:01 -07:00
Brad Davis
80f2ecbab6 Cleaning up some debugging spew and fixing UI HTML paths 2015-09-04 09:59:42 -07:00
Brad Davis
3573fe8d11 Merge pull request #5717 from ZappoMan/breakDanceEntityScript 
add breakdance game as entity script that works with hydra grab
 2015-09-04 09:49:54 -07:00
Seth Alves
1b92ae95d7 put glm:: before vec3 2015-09-04 09:41:53 -07:00
Brad Hefta-Gaub
895028134b add breakdance game as entity script that works with hydra grab 2015-09-04 09:40:09 -07:00
Seth Alves
8c3bea6d0d Merge pull request #5713 from AndrewMeadows/flerovium 
fix collision shape of avatars
 2015-09-04 09:37:17 -07:00
Anthony J. Thibault
df28c7bf1a Merge branch 'master' into ajt/new-anim-system 2015-09-04 09:27:02 -07:00
Seth Alves
72322c0270 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-04 09:12:32 -07:00
Brad Hefta-Gaub
762bed8223 Merge pull request #5715 from jherico/apu 
Fix mirror to display on Oculus
 2015-09-04 09:06:40 -07:00
Brad Hefta-Gaub
20bd14c8db Merge pull request #5684 from rabedik/fxaa 
Post-process anti-aliasing effect
 2015-09-04 09:01:39 -07:00
Brad Hefta-Gaub
2eb3d90ac2 Merge pull request #5708 from howard-stearns/new-default-avatar-collision-sound 
Change default avatar collision sound
 2015-09-04 08:48:30 -07:00
Brad Hefta-Gaub
127271110c Merge pull request #5714 from jherico/lisa 
Magballs polish
 2015-09-04 08:48:15 -07:00
Leonardo Murillo
b836abd246 Merge pull request #5716 from murillodigital/master 
Including Visual Studio 2010 Redistributable in installer
 2015-09-04 09:30:36 -06:00
Leonardo Murillo
2f2558724f Including Visual Studio 2010 Redistributable in installer 2015-09-04 09:28:28 -06:00
Seth Alves
fff3da0cc3 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-04 07:17:01 -07:00
Raffi Bedikian
6b2897ca8f Fix AA bugs with display plugins and mini-mirror 2015-09-03 23:11:53 -07:00