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

16105 commits

Author SHA1 Message Date
Ryan Huffman
224c35d568 Clean up launch server in main.cpp 2016-10-04 16:47:59 -07:00
Ryan Huffman
0aba1d3e54 Fix server arguments causing crash on startup 2016-10-04 16:47:58 -07:00
Ryan Huffman
fe6382d1b6 Update server content path to be relative 2016-10-04 16:47:58 -07:00
Ryan Huffman
392ecb0dae Update interface to launch server 2016-10-04 16:47:58 -07:00
Ryan Huffman
847a5cc7a1 Remove old texture setting code in ModelOverlay 2016-10-04 16:25:48 -07:00
Ryan Huffman
93d995a5ae Fix model overlay visible not working 2016-10-04 16:25:40 -07:00
Ryan Huffman
c683c82817 Fix setting textures in model overlays 2016-10-04 16:24:43 -07:00
Anthony J. Thibault
aab974e6ae Merge branch 'master' into out-of-body-experience 2016-10-04 11:17:52 -07:00
Anthony Thibault
60aff44f33 Merge pull request #8717 from hyperlogic/bug-fix/near-grab-lag-fix 
Remove frame lag and jitter from near grabbed physical objects.
 2016-10-04 11:14:22 -07:00
Anthony J. Thibault
dcd425a165 Add an entityTree lock around the AvatarHoldAction::lateAvatarUpdate calls 2016-10-04 10:56:44 -07:00
Brad Davis
8c5028158f Fix crash on destroying web entities and overlays 2016-10-03 18:02:21 -07:00
Brad Davis
ca3572f991 Support external GL textures with proper fencing 2016-10-03 17:09:10 -07:00
Anthony J. Thibault
327fcc970b Remove frame lag from near grabbed physical objects. 
In the game loop, physics occurs before avatar update.
Before this PR, when the avatar is moved during avatar update, near grabbed objects will not pick up this move until one frame later, when
the physics is run on the next update.

After this PR, near grabbed objects are adjusted to reflect any position or rotation change that occurred during the avatar update.
 2016-10-03 16:01:54 -07:00
Ryan Huffman
b5eb943c1d Add hmd stats to stats event 2016-10-03 15:12:14 -07:00
Ryan Huffman
dafb5c5bab Add processor information to launch user activity event 2016-10-03 15:11:56 -07:00
David Rowe
caf1a93354 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
 2016-10-04 10:51:14 +13:00
howard-stearns
4fcddfdf2b Merge branch 'davidkelly-dk/triggerMenuInScriptPlus' into domain-check 2016-10-03 13:02:32 -07:00
howard-stearns
0809484e33 Merge branch 'dk/triggerMenuInScriptPlus' of https://github.com/davidkelly/hifi into davidkelly-dk/triggerMenuInScriptPlus 2016-10-03 13:01:51 -07:00
David Rowe
4818ad2615 Merge branch 'master' into 21055 2016-10-04 08:46:30 +13:00
samcake
0189e3aea7 Github is borked ? 2016-10-03 11:29:17 -07:00
samcake
5adedbbb8b replace the simple log by a unique log 2016-10-03 11:27:15 -07:00
samcake
0df69b8e15 Protecting the usage of the defaultSkyboxTexture in case its creation has failed to avoid crash on the first usage, removing an uncorrect assert in GL45BackendTexture that would trigger in debug 2016-10-03 10:06:58 -07:00
Clément Brisset
becee3bba3 Merge pull request #8685 from thoys/ac-fixes 
Assignment Client fixes
 2016-09-30 11:05:58 -07:00
David Kelly
621e3fc000 Expose triggerOption to scripts, plus _physicsEnabled 
Now any menu item can be triggered.  Plus you can do a
Window.isPhysicsEnabled to detect when we are done loading assets and
such.  Whee!
 2016-09-30 09:06:17 -07:00
Anthony J. Thibault
eccd01e88f Merge remote-tracking branch 'upstream/master' into out-of-body-experience 2016-09-29 16:36:25 -07:00
Thijs Wenker
3d14a32d17 fix controller::ScriptingInterface not found warning in AC 2016-09-29 22:11:12 +02:00
Andrew Meadows
d29386c43f better tracking of avatar gravity setting 2016-09-29 11:14:19 -07:00
Brad Hefta-Gaub
38eccd32a8 add developer menu support to enable/disable dynamic texture management 2016-09-29 10:18:54 -07:00
David Rowe
f8572096b1 Merge branch 'master' into 21055 2016-09-28 20:00:04 +13:00
Anthony J. Thibault
62dc250237 removed DebugDraw calls 2016-09-27 16:48:15 -07:00
Anthony J. Thibault
961d262df1 Improved body follow behavior 
* follow helper lean re-centering / reconciliation now modifies bodySensorMatrix, NOT the character controller.
* The character controller now always follows the bodySensorMatrix (in world space).

This decouples the lean re-centering velocity from the velocity used to move the character controller.
We can now independently tune these things separately.
 2016-09-27 16:38:48 -07:00
Zach Pomerantz
b9c4018b8e expose AudioStats to qml/js 2016-09-26 15:35:29 -07:00
Anthony J. Thibault
0a72805874 Tuned transition from idle to back to reduce foot sliding 2016-09-26 10:41:16 -07:00
Anthony J. Thibault
203ff95849 Animation tuning to reduce foot sliding. 
* Navigation walk speed has been reduced
* Tuned IdleToWalk timescale and interp time to reduce foot sliding
* Tuned fwd, back and lateral characteristicSpeeds to better match the
  animations.  This reduces foot sliding when moving forward and backward.
* Reduced rig state machine hysteresis to 1/60th of a second.
 2016-09-26 09:59:50 -07:00
Anthony Thibault
10c5da5728 Smooth transition of hands from in-body to out-of-body modes. 2016-09-24 14:28:56 -07:00
Anthony Thibault
27e6c0f872 Added debug draw path trace for left and right feet 2016-09-24 13:01:16 -07:00
Anthony J. Thibault
f4c4b3474b capsule projection and distance tests now work for non-vertical capsules 2016-09-23 16:55:38 -07:00
Anthony J. Thibault
9567ec11af Prevent character from walking when pinned against collision. 
This is fixed by using the pre-action velocity from CharacterController, which does not include any motors or follow velocity.
This pre-action velocity reflects the actual rigid body velocity after collision constraints are resolved.

This should prevent the character f
 2016-09-23 15:22:52 -07:00
Chris Collins
be33524990 Merge pull request #8636 from zzmp/clean/audio-config 
strip unused audio settings, hide the rest
 2016-09-23 15:08:48 -07:00
Zach Pomerantz
277eefafd7 remove the audio stats dialog 2016-09-23 14:39:07 -07:00
Zach Pomerantz
d0f4a29031 Merge branch 'master' of github.com:highfidelity/hifi into fix/local-audio-injection 2016-09-23 13:12:39 -07:00
Zach Pomerantz
a9318d052b Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config 2016-09-23 13:11:52 -07:00
Brad Davis
f33d3a3b36 Migrate logging functionality to shared library 2016-09-23 12:04:58 -07:00
Brad Davis
a7f0ba24ed Dynamic texture memory management 2016-09-23 12:04:42 -07:00
Anthony J. Thibault
b68dbab994 Fix for incorrect hand offset when backing into collision. 
We know properly account for the offset of the head due to clamping from a small maxHipsOffset.
This means the hands should look more natural when you are out-of-body and are moving your hand controllers.
 2016-09-23 11:47:44 -07:00
Anthony J. Thibault
98ffea2fb9 Merge branch 'master' into out-of-body-experience 2016-09-22 18:08:23 -07:00
Andrew Meadows
06ff984f90 sky-hook for walking up steps 2016-09-22 09:48:59 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Zach Pomerantz
e2ff738fc3 strip unused audio settings 
- remove parameters on the jitter buffer algorithm, these are now static
- remove parameters on the output starve detection algorithm, now static
- move interface audio settings to the Developer menu
 2016-09-21 17:35:27 -07:00
Zach Pomerantz
9e2ec27b29 always play audio injectors locally 2016-09-21 17:20:51 -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
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
Seth Alves
2468b56079 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-20 13:28:20 -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
8dd5c9b92b fix kinematic motion for ground and hover 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
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
Anthony J. Thibault
a028d3ba58 Remove hacks for debug rendering of IK targets 
A AnimContext class was introduced.  This context is passed into every node during evaluation/overlay.
It holds non-animVar "global" data passed from the application.
 2016-09-19 15:03:46 -07:00
Brad Hefta-Gaub
fd474f6319 add basic support for master vs stable builds 2016-09-19 14:14:32 -07:00
Chris Collins
3d9f231543 Merge pull request #8609 from zzmp/fix/audio-stats 
fix audio network stats
 2016-09-19 09:08:35 -07:00
Andrew Meadows
c77f6a7c16 Merge pull request #8614 from hyperlogic/out-of-body-experience 
Turn and drive the HMD with linear velocity
 2016-09-16 15:43:29 -07:00
Andrew Meadows
20418d5f58 fix hips sweep test 2016-09-15 18:39:57 -07:00
Zach Pomerantz
bbbe070af1 bring audio network latencies to standard 2016-09-15 18:19:58 -07:00
Zach Pomerantz
5b03d3e13d render audio network stats immediately 2016-09-15 18:19:57 -07:00
Zach Pomerantz
177466e4c7 calculate unplayed ms on all streams/buffers as max 2016-09-15 17:54:41 -07:00
Anthony J. Thibault
c7caf9fe06 Turn and drive the HMD with linear velocity 2016-09-15 17:08:36 -07:00
Andrew Meadows
83157b573a measure max hips offset and clamp it in IK 2016-09-15 14:55:04 -07:00
Zach Pomerantz
53f5899a69 add audio jitter simulator 2016-09-15 14:51:39 -07:00
Anthony J. Thibault
d51898f60d Merge branch 'out-of-body-experience' of github.com:highfidelity/hifi into out-of-body-experience 2016-09-15 14:23:38 -07:00
Zach Pomerantz
9792d025fa clean up audio stats 2016-09-15 13:09:06 -07:00
Seth Alves
d67701f7bb new logging category for deadlock debug prints 2016-09-15 13:02:18 -07:00
Andrew Meadows
821570fa76 fix Windows build and minor format/namechange 2016-09-15 09:32:03 -07:00
Seth Alves
4470338663 catagorize some qDebugs 2016-09-14 21:39:45 -07:00
Andrew Meadows
f5c5c68937 adding kinematic character controller demo 2016-09-14 11:43:52 -07:00
Seth Alves
59db640cb5 add explaining comment 2016-09-14 11:33:03 -07:00
Seth Alves
8734661a0e add explaining comment 2016-09-14 11:28:22 -07:00
Seth Alves
e5e9bb0052 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-14 11:28:10 -07:00
Seth Alves
e6a1c14de6 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-14 09:43:19 -07:00
Ryan Huffman
e506491026 Remove blank lines 2016-09-13 16:35:13 -07:00
Ryan Huffman
23450e929b Add special avatar id for attaching overlays 2016-09-13 16:33:58 -07:00
Anthony J. Thibault
bc130eaf26 ramp support with comfort mode option 2016-09-13 16:26:10 -07:00
Anthony J. Thibault
0fde3a2d76 Fix for TRUNCATE_IK_CAPSULE globals 2016-09-13 10:26:38 -07:00
Anthony J. Thibault
362e185098 Revert "When out-of-body have your avatar face toward your HMD." 
This reverts commit ffb1bae1f0.
 2016-09-13 09:54:19 -07:00
Andrew Meadows
954d690b8a expose setting avatar collisionless 2016-09-12 16:24:08 -07:00
Anthony J. Thibault
ffb1bae1f0 When out-of-body have your avatar face toward your HMD. 2016-09-12 16:20:13 -07:00
David Rowe
fe8b3b4d0d Merge branch 'master' into 21040 2016-09-13 09:12:47 +12:00
Anthony J. Thibault
baee5180c1 Moved outOfBody detection into MyAvatar::FollowHelper 
in preparation for different follow behavior for in-body and out-of-body.
 2016-09-12 11:52:27 -07:00
Anthony J. Thibault
5e0c2286ec Use OUTOFBODY_HACK as searchable token 2016-09-12 10:58:06 -07:00
Seth Alves
51fe9b2a80 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-12 09:59:19 -07:00
Howard Stearns
b949c83a05 remove jpg error popup behavior 2016-09-10 11:18:14 -07:00
Anthony J. Thibault
86351ca21c Teleport bugs 
* made HMD.setPosition thread safe
* changed script to use HMD.position = foo;
 2016-09-09 17:32:02 -07:00
Andrew Meadows
97623f489c expose setting HMD sensorToWorld from JS script 2016-09-09 16:32:57 -07:00
Andrew Meadows
0f248c4540 expose MyAvatar::setSensorToWorldMatrix() 2016-09-09 16:31:36 -07:00
Brad Hefta-Gaub
258c83f864 Merge pull request #8551 from jherico/texture_load_test_pbo 
Stuttering: Sparse Textures
 2016-09-09 13:47:27 -07:00
Anthony J. Thibault
7e7803c648 Added developer option to draw IK targets in world. 2016-09-09 12:50:34 -07:00
Brad Hefta-Gaub
dbf29ba79d Merge pull request #8569 from jherico/gli 
Stuttering: Upgrade GLM & add GLI integration
 2016-09-09 12:11:08 -07:00
Seth Alves
f6398315b1 avoid a crash-on-exit 2016-09-09 11:48:14 -07:00
Brad Davis
ecfe56085d GLM update and GLI integration 2016-09-09 10:18:15 -07:00
Brad Hefta-Gaub
fddbeb6d11 Merge pull request #8588 from zzmp/test/audio-jitter 
add a test for audio jitter in DEV/PR builds
 2016-09-09 10:17:34 -07:00
David Rowe
ce58edc4e0 Add frustum property to JavaScript Camera object 2016-09-09 18:56:05 +12:00
Brad Davis
bc6b43b7be Add debug option to lower texture resolution 2016-09-08 22:19:17 -07:00
Brad Hefta-Gaub
b56ad737d4 Merge pull request #8567 from hyperlogic/feature/tablet-ui-foundation 
Web Entities Virtual Keyboard + Event Bridge support
 2016-09-08 18:36:46 -07:00
Brad Hefta-Gaub
3d54600843 Merge pull request #8513 from Atlante45/feat/network-port 
Add settings to change local port
 2016-09-08 18:10:32 -07:00
Zach Pomerantz
e785c0cdf8 add test for audio jitter 2016-09-08 17:50:11 -07:00
Andrew Meadows
bc56df0be1 out-of-body with reduced recovery speeds 2016-09-08 14:31:31 -07:00
Seth Alves
624cc655dd disable code that backs-up in time to pick release velocity 2016-09-07 13:24:53 -07:00
Anthony J. Thibault
dc0d0c2d5c Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 09:49:55 -07:00
SamGondelman
99176588cc remove old webwindowclass that relied on qwebkit 2016-09-06 17:36:59 -07:00
SamGondelman
716647037e removed unused code 2016-09-06 17:36:54 -07:00
SamGondelman
9d447d4dcc enabled qnetworkrequest redirects everywhere I could find them 2016-09-06 17:35:06 -07:00
Brad Davis
20deae3242 Working on Qt 5.6 compatibility 2016-09-06 17:35:04 -07:00
Atlante45
eb007b24cd Use invalid port to signal no value passed 2016-09-06 11:59:07 -07:00
Atlante45
9f07511fd8 Move setter to LimitedNodeList 2016-09-06 10:18:42 -07:00
Atlante45
fcf44911a3 Fix Windows warning 2016-09-06 10:18:42 -07:00
Atlante45
a8de6f0a57 Add settings to change local port 2016-09-06 10:18:42 -07:00
Seth Alves
37db1cba26 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-06 09:38:44 -07:00
Anthony J. Thibault
9122a33fff only raise the webEntity virtual keyboard in HMD mode 2016-09-02 16:53:40 -07:00
Seth Alves
342f7edff3 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-02 16:12:41 -07:00
Brad Davis
94210d2e69 Use dynamic count for global thread pool 2016-09-02 15:23:35 -07:00
Brad Davis
91bfa7677c Updating stats display for threaded rendering 2016-09-02 14:41:49 -07:00
Seth Alves
25f6e1d79d Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-01 15:06:52 -07:00
Brad Hefta-Gaub
b3e5e21f40 Merge pull request #8559 from birarda/android-interface 
create a foundation for interface target compile on android
 2016-09-01 13:10:45 -07:00
Seth Alves
1a9f43cb67 fix AvatarActionHold's idea of where the controllers are when the avatar has been scaled 2016-09-01 12:17:34 -07:00
Seth Alves
dc31525794 remove some left-over code 2016-08-31 16:39:57 -07:00
Seth Alves
280b603747 remove some leftover code 2016-08-31 16:30:51 -07:00
Seth Alves
74dc2ce493 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-31 16:26:21 -07:00
Chris Collins
02afa460ff Merge pull request #8557 from jherico/location_bar 
Don't show address bar when starting up in a connected state
 2016-08-31 16:03:37 -07:00
Brad Davis
b9a97712d5 Don't show address bar when starting up in a connected state 2016-08-31 15:17:57 -07:00
Stephen Birarda
feef76cbab add tools, no plugins, add InterfaceActivity 2016-08-31 11:31:07 -07:00
Zach Pomerantz
441005bba0 use existing defaults for zoneless keylight 2016-08-31 09:47:53 -07:00
Zach Pomerantz
372c52fea5 restore default ambient skybox 2016-08-30 17:07:34 -07:00
Seth Alves
cdd08bd38e more anti-jitter changes 2016-08-30 14:59:30 -07:00
Seth Alves
78f54a7f33 get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away 2016-08-30 14:39:11 -07:00
Seth Alves
5bda94b2ba use same data as used for drawing show-hand-targets for controller joints in MyAvatar 2016-08-30 12:39:30 -07:00
Seth Alves
2a9ffc1529 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-30 10:26:14 -07:00
Stephen Birarda
74fac8c7c9 Merge pull request #8512 from birarda/shareable-address 
add shareable address from default name, leverage for steam join/invite
 2016-08-30 09:35:24 -07:00
Seth Alves
87fbbd68ae Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-29 17:37:58 -07:00
Brad Hefta-Gaub
f3d157c396 Merge pull request #8500 from jherico/gl_context 
Custom OpenGL context creation
 2016-08-29 16:22:21 -07:00
Howard Stearns
a1ae9eebf2 Merge pull request #8534 from howard-stearns/silence-address-bar-log-warning 
Silence address bar log warning
 2016-08-29 11:48:43 -07:00
Brad Davis
617633b85c Moving to custom context creation 2016-08-29 11:21:54 -07:00
howard-stearns
01af8899bf silence address bar dialog qml warning 2016-08-29 10:47:22 -07:00
Seth Alves
178a68c967 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-29 10:21:07 -07:00
Seth Alves
3fb10d0eea action for arrow flight, etc 2016-08-28 19:08:13 -07:00
Seth Alves
76b72e32f0 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-27 09:06:45 -07:00
Brad Davis
587d015c57 Give names to offscreen contexts for easier debugging 2016-08-26 19:09:26 -07:00
Brad Hefta-Gaub
3d6691f3d1 Merge pull request #8527 from zzmp/fix/skybox-default-color 
fix skybox default
 2016-08-26 15:14:44 -07:00