Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 08:33:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
39035 commits 76 branches 59 tags 1.2 GiB
Commit graph

39035 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
6d64da2df7 expiration time is 5 seconds now 2016-02-05 17:28:55 -08:00
Ken Cooke
7a07e57144 Compiler fixes 2016-02-05 17:27:33 -08:00
Philip Rosedale
a98efbc660 Merge pull request #6997 from jagwire/WorkingEnergy 
Working energy usage for entity manipulation.
 2016-02-05 17:17:45 -08:00
ericrius1
4c33c6e171 clean up 2016-02-05 17:13:29 -08:00
Philip Rosedale
dbbeb90873 Merge pull request #7039 from ericrius1/gunFix 
updated gun position
 2016-02-05 16:56:28 -08:00
Ken Cooke
ad0383114b Compiler fixes 2016-02-05 16:34:04 -08:00
ericrius1
1c54de6f57 better logging 2016-02-05 16:11:43 -08:00
ericrius1
a5c037b23f possible bug fix for sound not playing on avatar rentry 2016-02-05 16:09:30 -08:00
ericrius1
39bb68931f updated gun position 2016-02-05 15:48:34 -08:00
Ken Cooke
1a1b34296c Compiler fixes 2016-02-05 15:44:31 -08:00
ericrius1
208007c9d8 log 2016-02-05 15:43:15 -08:00
Ken Cooke
721fa9d43a HRTF-based audio spatialization engine 2016-02-05 15:24:09 -08:00
Seth Alves
d567020283 trying to zero velocity during an equiped adjustment 2016-02-05 15:01:46 -08:00
Seth Alves
07c70a1ba2 refix double action grabs 2016-02-05 14:25:46 -08:00
Seth Alves
b1267f9d37 try to put things back when a double-parent equip is released. if an equpped object is pulled too far from a hand, automatically unequip it. 2016-02-05 13:53:45 -08:00
ericrius1
609ddda74e adjusting for interval and interval spread 2016-02-05 13:49:44 -08:00
Andrew Meadows
09bdccb18c Merge pull request #7032 from hyperlogic/tony/standing-jump 
MyAvatar: Standing Takeoff and In-Air Animations
 2016-02-05 13:45:52 -08:00
ericrius1
a65c869239 removed commenting 2016-02-05 13:36:31 -08:00
ericrius1
120c5ac370 Able to switch url sounds 2016-02-05 13:35:45 -08:00
Zach Pomerantz
c334e4ebcb Add JSON interface to render::Job::Config 2016-02-05 13:03:47 -08:00
Zach Pomerantz
8bf6c66327 Add (de)serializer for QObject->JSON 2016-02-05 13:03:46 -08:00
Brad Hefta-Gaub
f738f2b6f6 Merge pull request #7035 from howard-stearns/fix-mouth-movement 
fix-mouth-movement
 2016-02-05 12:08:23 -08:00
Howard Stearns
47694b90ee Fix inverted boolean that was preventing other people's avatars from mouth-animating. 2016-02-05 11:47:21 -08:00
Bradley Austin Davis
ebf0bf394a Fix native text rendering by forcing positions to integer values 2016-02-05 11:43:31 -08:00
Zach Pomerantz
d9132f3973 Clean up geometry instanced calls 2016-02-05 11:22:45 -08:00
Zach Pomerantz
b0a9c299ed Add tone mapping to overlay shaders 2016-02-05 11:18:42 -08:00
ericrius1
355f60f088 Not adding deleted avatars to the list of avatars to use for querying 2016-02-05 11:07:21 -08:00
Anthony J. Thibault
f13e31c7fc CharacterController: removed unnecessary code. 2016-02-05 10:53:58 -08:00
Zach Pomerantz
a1ed29e6f8 Rename setupTransparent->setupBatch 2016-02-05 10:53:01 -08:00
Babiuch, Ryan Nicholas
aab98db812 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-05 12:49:38 -06:00
Zach Pomerantz
aa50d1e98e Add factor and shading to overlay/translucent light shaders 2016-02-05 10:27:07 -08:00
ericrius1
aa49db9992 updating sound volume 2016-02-04 19:21:12 -08:00
Anthony J. Thibault
bfeace78f7 AnimInverseKinematics: warning fixes 2016-02-04 18:51:48 -08:00
Seth Alves
ae6a5aa286 add some debugging to handControllerGrab 2016-02-04 18:10:43 -08:00
Seth Alves
27711a04b9 Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-04 18:10:03 -08:00
ericrius1
9b0e20d82b stopping sound injector if sound was looping 2016-02-04 17:57:25 -08:00
Anthony J. Thibault
51189cfc50 AnimInverseKinematics: opened up UpLeg and Leg constraints 
This improves the quality of the jump animations, while IK is enabled.
 2016-02-04 17:56:41 -08:00
Anthony J. Thibault
8ca8550f26 MyAvatar: Standing Takeoff and In-Air Animations 
Now there are two sets of of jump takeoff and in-air animations.
* Run - Used when the character jumps or falls with a small forward velocity.
* Standing - Used when the character jumps or falls in-place or backward.

CharacterController
* increased takeoff duration to 250 ms
* increased takeoff to fly duration to 1100 ms
* added standing jump and in-air animations
* added 250 milisecond delay between ground and hover, to prevent going into hover when walking over cracks.
* take-off to in-air transitions now use the new snapshotPrev interp type for a smoother tweening.
 2016-02-04 17:56:07 -08:00
Andrew Meadows
725f9e29a3 Merge pull request #7026 from hyperlogic/tony/fly-like-an-eagle 
MyAvatar: Use head to turn while flying in HMD mode
 2016-02-04 17:52:47 -08:00
ericrius1
f6a091b941 basic of new design working 2016-02-04 17:41:52 -08:00
ericrius1
16af9b9e31 deleting sound entity if it hasn't been around for a while 2016-02-04 17:12:25 -08:00
Zach Pomerantz
a4cea0a307 Conform model/overlay shaders 2016-02-04 16:21:56 -08:00
ericrius1
c8704234b1 basic setup for new design 2016-02-04 16:19:23 -08:00
Brad Hefta-Gaub
817245accc Merge pull request #7025 from jherico/qml 
QML Work
 2016-02-04 16:03:39 -08:00
Zach Pomerantz
44d297e7e2 Differentiate named calls by pipeline 2016-02-04 15:32:47 -08:00
Zach Pomerantz
f0797d8ea0 Move instanced pipeline setup to lambda from batch 2016-02-04 15:32:28 -08:00
James B. Pollack
0c92c52d26 more volume 2016-02-04 14:52:50 -08:00
Babiuch, Ryan Nicholas
fb5236e9b2 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-04 16:50:43 -06:00
James B. Pollack
76350a39f8 increase volume more and fix not having logDebug function 2016-02-04 14:46:58 -08:00
James B. Pollack
c377254cb0 revert junkyardreset 2016-02-04 14:34:41 -08:00