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
|
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 |
|
Brad Davis
|
4a28361e05
|
Fix mirror to display on Oculus
|
2015-09-03 22:12:21 -07:00 |
|
Brad Davis
|
0f70797ab4
|
Merge pull request #5711 from ZappoMan/fixEntityScriptIncludes
fix a bug in entity script includes and file based includes on windows
|
2015-09-03 21:21:42 -07:00 |
|
James B. Pollack
|
a9ad18ec80
|
cleanup, comments, and consolidation.
|
2015-09-03 20:42:56 -07:00 |
|
Brad Davis
|
c8069ba73c
|
Working on magballs polish
|
2015-09-03 20:09:54 -07:00 |
|
Anthony J. Thibault
|
3716d5612b
|
Merge branch 'master' into ajt/new-anim-system
|
2015-09-03 19:20:06 -07:00 |
|
Anthony J. Thibault
|
dcecd7b73a
|
Added hysteresis to the state machine for turning and moving states.
This should help a bit with the jerkiness, as state transitions
occur less often due to noise or the user straddling the boundary
between two states.
|
2015-09-03 19:13:39 -07:00 |
|
Brad Hefta-Gaub
|
b0f239b89d
|
also make sure local file includes work for non-entity scripts
|
2015-09-03 19:06:26 -07:00 |
|
Andrew Meadows
|
16dfc39f5f
|
fix collision shape of avatars
|
2015-09-03 18:22:35 -07:00 |
|
James Pollack
|
1e9bac8dee
|
add create wand script, add offset to bubble spawn point so that it is at the end of the wand
|
2015-09-03 17:42:41 -07:00 |
|
James Pollack
|
cf0d236174
|
silence logging statements for now
|
2015-09-03 16:50:37 -07:00 |
|
James Pollack
|
80c18c227e
|
Attach the wand.js script to an entity and then move it around to make bubbles. Customize bubble behavior with bubble.js - make sure to update the path reference in wand.js
|
2015-09-03 16:42:14 -07:00 |
|
Brad Hefta-Gaub
|
063320771c
|
fix a bug in entity script includes and file based includes on windows
|
2015-09-03 16:37:24 -07:00 |
|
Seth Alves
|
e12b7807ad
|
merge from upstream
|
2015-09-03 16:36:04 -07:00 |
|
Howard Stearns
|
41daea7d92
|
Merge pull request #5710 from sethalves/fix-stuck-avatars
Fix stuck avatars
|
2015-09-03 16:26:07 -07:00 |
|
Seth Alves
|
218521fc02
|
put AVATAR_MIN_ROTATION_DOT back to previous value
|
2015-09-03 16:08:46 -07:00 |
|
Seth Alves
|
0c8848a463
|
don't update _lastSendJointData if we didn't send
|
2015-09-03 15:41:40 -07:00 |
|