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

46750 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
98ffea2fb9 Merge branch 'master' into out-of-body-experience 2016-09-22 18:08:23 -07:00
Anthony Thibault
fa4e8d2792 Merge pull request #8634 from AndrewMeadows/oobe4 
out-of-body-experience: help avatar walk up steps and ledges
 2016-09-22 17:08:14 -07:00
Andrew Meadows
61be99b87e fix IK bug for RotationOnly head target 2016-09-22 16:14:19 -07:00
Andrew Meadows
819e1dc694 prevent avatars from walking up vertical walls 2016-09-22 16:12:35 -07:00
Howard Stearns
3c82a489fa Merge pull request #8641 from sethalves/fix-domain-server-cl-args 
fix domain-server command-line arguments
 2016-09-22 15:18:02 -07:00
Seth Alves
bd2ee56a27 fix domain-server command-line arguments 2016-09-22 12:45:49 -07:00
Chris Collins
216c6b8f6f Merge pull request #8624 from sethalves/ice-troubles 
ICE server related utilities and changes
 2016-09-22 11:26:23 -07:00
Chris Collins
a2f6dd859e Merge pull request #8640 from sethalves/reenable-web-entities-on-linux 
re-enable web entity-items on linux
 2016-09-22 11:23:32 -07:00
Seth Alves
c43c83019d Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles 2016-09-22 10:34:25 -07:00
Seth Alves
e6de9d7d51 Merge branch 'ice-troubles' of github.com:sethalves/hifi into ice-troubles 2016-09-22 10:34:19 -07:00
Seth Alves
0192f72a11 use named constant rather than 7337 2016-09-22 10:34:00 -07:00
Seth Alves
dc5e63c4f1 re-enable web entity-items on linux 2016-09-22 10:25:26 -07:00
Andrew Meadows
06ff984f90 sky-hook for walking up steps 2016-09-22 09:48:59 -07:00
Brad Hefta-Gaub
2be961ef10 Merge pull request #8631 from sethalves/avoid-modal-edit-dialogs 
edit.js indicates errors via notifications.js
 2016-09-22 09:19:52 -07:00
Clément Brisset
f8501d410a Merge pull request #8637 from ZappoMan/redirectOnFull 
add support for redirection on domain at max capacity
 2016-09-22 08:56:00 -07:00
Andrew Meadows
e27ee050bf Merge pull request #8632 from hyperlogic/out-of-body-experience 
MyAvatar.addThrust() works again.
 2016-09-21 18:30:55 -07:00
Anthony J. Thibault
9fa8fc11c9 More stability in hips offset calculation. 2016-09-21 18:20:35 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Ken Cooke
b14f43b11e Merge pull request #8610 from zzmp/test/audio-jitter 
add audio jitter simulator testing tool
 2016-09-21 16:43:36 -07:00
Anthony J. Thibault
1f7dc25f12 MyAvatar.addThrust() works again. 2016-09-21 11:48:54 -07:00
Seth Alves
785e187a27 edit.js uses notification.js to indicate errors instead of a modal dialog. in HMD, notification messages no longer jitter around 2016-09-21 11:39:25 -07:00
Seth Alves
b9ea93de57 use qWarning rather than qCritical because qCritical may exit 2016-09-21 10:08:02 -07:00
Seth Alves
5802159d16 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles 2016-09-21 10:07:25 -07:00
Andrew Meadows
99da6c68e3 Merge pull request #8630 from hyperlogic/out-of-body-experience 
Re-enable flying behavior
 2016-09-21 08:50:19 -07:00
Clément Brisset
f26fbca699 Merge pull request #8623 from ZappoMan/improvedPreview 
Improved preview
 2016-09-20 19:05:26 -07:00
Anthony J. Thibault
4c99848f29 disable vertical re-centering behavior 2016-09-20 17:05:01 -07:00
Anthony J. Thibault
4afd60f22a Flying behavior now works again 2016-09-20 16:01:39 -07:00
Anthony Thibault
fdb6110c46 Merge pull request #8626 from AndrewMeadows/oobe3 
out of body experience: avatar follows HMD position using velocity motor instead of micro teleports
 2016-09-20 16:00:17 -07:00
Brad Hefta-Gaub
cc8aa540b4 fix unix build 2016-09-20 15:54:57 -07:00
Brad Hefta-Gaub
52f0b5f6c8 cleanup 2016-09-20 14:06:02 -07:00
Brad Hefta-Gaub
6c68d9abb3 beter center image around center of eye 2016-09-20 14:04:51 -07:00
Andrew Meadows
dfe828982b remove cruft 2016-09-20 14:04:22 -07:00
Andrew Meadows
3c5e13b34b final tuning of follow speeds 2016-09-20 13:45:31 -07:00
Andrew Meadows
3e02bac412 more velocity tuning 2016-09-20 10:45:13 -07:00
Seth Alves
6bce73db80 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles 2016-09-20 10:37:32 -07:00
Brad Hefta-Gaub
73a7d1b63b redraw no-preview message if window size changes 2016-09-20 10:15:27 -07:00
Andrew Meadows
55e1d05887 more follow velocity tuning 2016-09-20 10:11:25 -07:00
Andrew Meadows
0ef8ef4734 tune follow speeds 2016-09-20 09:37:51 -07:00
Andrew Meadows
7258835f3f restore orientation from physics to Avatar 2016-09-20 09:14:11 -07:00
Andrew Meadows
59e6ca8f8d avatar follows HMD using velocity motor 2016-09-20 08:29:55 -07:00
Andrew Meadows
a8af8d6027 move code into CharacterController::updateState() 2016-09-20 08:29:55 -07:00
Andrew Meadows
8dd5c9b92b fix kinematic motion for ground and hover 2016-09-20 08:29:55 -07:00
Andrew Meadows
1db1295556 cleanup around CharacterController::_targetVelocity 2016-09-20 08:29:55 -07:00
Andrew Meadows
80b970f2d9 adding MyAvatar::_canonicalScale, but not used yet 2016-09-20 08:29:55 -07:00
Brad Hefta-Gaub
8f5c5ebf0e improved disabled preview wording 2016-09-19 18:19:35 -07:00
Andrew Meadows
e6d40e6e4d Merge pull request #8625 from hyperlogic/bug-fix/oobe-desktop-motor-fix 
Fixed motor velocity
 2016-09-19 17:04:54 -07:00
Anthony J. Thibault
6f0acb3826 Fixed motor velocity in HMD mode 2016-09-19 16:56:36 -07:00
Seth Alves
ba8aa5b50c fix camelcase 2016-09-19 16:38:34 -07:00
Brad Hefta-Gaub
2b01c60a55 Merge pull request #8615 from davidkelly/dk/1264 
Make the equip sphere emissive
 2016-09-19 16:33:55 -07:00
Brad Hefta-Gaub
09b3292f94 fix unix build 2016-09-19 16:32:36 -07:00