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

15250 commits

Author SHA1 Message Date
Anthony J. Thibault
544928b46e MyAvatar: fix for laggy avatar attachments 2016-04-18 14:51:33 -07:00
Zach Pomerantz
c9dc642d76 Fix type in AvatarManager::clearAllAvatars 2016-04-18 14:48:24 -07:00
Zach Pomerantz
c87eec4182 Fix typo in AvatarManager::clearAllAvatars 2016-04-18 14:45:33 -07:00
Zach Pomerantz
790e325248 Clear entities and avatars on exit 2016-04-18 14:31:16 -07:00
Anthony J. Thibault
dc92ccc2b2 MyAvatar: Removed unnecessary slot. 2016-04-18 13:19:49 -07:00
Brad Hefta-Gaub
374ba10524 more CR feedback 2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e CR feedback 2016-04-18 12:13:21 -07:00
Anthony J. Thibault
1682598be7 Added onLoadComplete signal to MyAvatar 
This can be used in javaScript to detect when the model has finished loading because the url has changed or the model has been reset.
 2016-04-18 11:37:02 -07:00
Brad Hefta-Gaub
0520363da8 cleanup 2016-04-18 10:37:15 -07:00
Brad Hefta-Gaub
d1f6b371c9 cleanup 2016-04-18 10:27:12 -07:00
Brad Davis
b50f835d35 Warning and error fixes 2016-04-17 10:22:26 -07:00
Brad Davis
f3e5306f90 Working on an automated performance test 2016-04-17 10:20:00 -07:00
Brad Hefta-Gaub
8f3d48190a switch to QRect instead of vec4 2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
6b5fd1e807 code review feedback 2016-04-16 16:11:36 -07:00
Brad Hefta-Gaub
54777c9cd5 Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-16 15:19:35 -07:00
Brad Hefta-Gaub
87078b1ea2 first cut at resetting entities script engine on domain change 2016-04-16 11:09:23 -07:00
David Rowe
8f6cfb72ea Fix QML warnings at shutdown 2016-04-16 15:23:41 +12:00
Brad Hefta-Gaub
04df84974c handle repositioning of qml windows 2016-04-15 19:50:12 -07:00
Zach Pomerantz
d96c97cdb4 Cleanup stars to persist BufferView 2016-04-15 16:40:02 -07:00
samcake
298300e42f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-15 14:16:02 -07:00
Brad Hefta-Gaub
c7f58dc17c first cut at exposing recommend overlay rectangle 2016-04-14 20:47:31 -07:00
Zach Pomerantz
f803ecd2e7 Merge pull request #7633 from Atlante45/fix/shared-resource 
Fix raw pointers in shared resource cache items
 2016-04-14 17:52:04 -07:00
Atlante45
4ed8573f74 CR 2016-04-14 17:28:24 -07:00
Brad Hefta-Gaub
ea4da05cba Merge pull request #7643 from AndrewMeadows/faster-bullet 
faster Bullet kinematics
 2016-04-14 12:16:54 -07:00
Brad Hefta-Gaub
c9b0531f55 Merge pull request #7662 from zzmp/fix/model-anim-cache 
Use AnimationCache for models
 2016-04-14 12:16:32 -07:00
Andrew Meadows
dcf28937cf cleanup cached Physics::sessionUUID 2016-04-14 11:18:10 -07:00
Zach Pomerantz
e80898f095 Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache 2016-04-14 10:12:16 -07:00
Ryan Huffman
e76ed6f73a Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-handling 2016-04-14 09:47:03 -07:00
Brad Hefta-Gaub
7b5075cce5 Merge pull request #7645 from sethalves/dont-run-bullet-too-soon 
add a heuristic for deciding when it's safe to enable bullet
 2016-04-14 09:35:58 -07:00
Brad Hefta-Gaub
285ebe8ec5 Merge pull request #7655 from sethalves/dont-spam-about-expired-actions 
don't flood log with messages about expired actions
 2016-04-14 09:32:56 -07:00
Brad Hefta-Gaub
623bfa3c35 Merge pull request #7653 from hyperlogic/tony/avatar-meta-item-bound-fix 
Fix for occasional invisible avatars
 2016-04-14 09:32:46 -07:00
Brad Hefta-Gaub
37dcfdad8a Merge pull request #7652 from huffman/feat/crash-menu 
Move crash menu items to submenu and add new crash types
 2016-04-14 09:32:36 -07:00
Seth Alves
ba0549dddd Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon 2016-04-14 09:18:58 -07:00
samcake
6c3e011b89 Expose cleanely the 3 different techniques 2016-04-14 02:43:28 -07:00
samcake
41d4d3b2d7 Providing a cleaner way to try different paths and exploring a simpler way 2016-04-13 19:21:17 -07:00
Chris Collins
47522e1774 Merge pull request #7659 from ZappoMan/newLODSettings 
improve reset settings
 2016-04-13 16:49:22 -07:00
Zach Pomerantz
7a15339631 Use AnimationCache for models 2016-04-13 15:44:47 -07:00
Ryan Huffman
47c2a1722b Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-menu 2016-04-13 14:40:46 -07:00
Ryan Huffman
bc247ec058 Remove unused Application::crashApplication() 2016-04-13 14:01:41 -07:00
Howard Stearns
f24c2c7714 Merge pull request #7657 from ZappoMan/avatarLicenseSupport 
add support for avatar licenses in FST files
 2016-04-13 14:01:37 -07:00
Brad Hefta-Gaub
0af47fd3d5 Merge pull request #7617 from jherico/vr_menu 
VR menu fixes
 2016-04-13 13:53:36 -07:00
Brad Hefta-Gaub
9c437c0824 CR feedback 2016-04-13 13:36:28 -07:00
Brad Hefta-Gaub
67af3917bc improve reset settings 2016-04-13 13:18:23 -07:00
Brad Hefta-Gaub
4b3b917af6 add support for avatar licenses in FST files 2016-04-13 12:26:09 -07:00
Ryan Huffman
2d39551a35 Fix style in CrashReporter.cpp 2016-04-13 10:56:27 -07:00
Ryan Huffman
fa49c213cc Add threaded crashes 2016-04-13 10:24:56 -07:00
Seth Alves
3288bff963 don't flood log with messages about expired actions. also, try to remove such actions 2016-04-13 09:47:07 -07:00
Brad Hefta-Gaub
93f8cfc80a new default LOD settings, and support for reset settings without crashing 2016-04-13 09:26:01 -07:00
samcake
de4345bdc5 Trying to use several FBO instead to avoid changing the REnderBUffers for overlay but... 2016-04-13 01:27:57 -07:00
samcake
8800dd84f1 Trying to use several FBO instead to avoid changing the REnderBUffers for overlay but... 2016-04-13 01:25:46 -07:00
Anthony J. Thibault
97f836d3bb Avatar: fix for avatar meta item bound. 
* In the case where a SkeletonModel was renderable, but had not actually
  created the render items yet, don't use the the rendererableMeshBound
  for the meta render item, because it hasn't been computed yet!  Instead
  wait until the render items have been added to the scene before using
  the more accurate bound...
 2016-04-12 17:32:49 -07:00
Ryan Huffman
0c1277ae7a Add CrashHelpers.h and add to separate submenu 2016-04-12 16:44:11 -07:00
Seth Alves
688de6f100 quiet warning 2016-04-12 14:10:14 -07:00
Atlante45
e45939d18f Make sure ResourceCacheSharedItems deals with strong refs 2016-04-12 13:51:11 -07:00
Atlante45
afdfef1482 Make sure we don't use raw resource ptr 2016-04-12 13:51:11 -07:00
Seth Alves
e4c91e5064 add a heuristic for deciding when it's safe to enable bullet 2016-04-12 11:46:00 -07:00
Brad Davis
3349093908 Fix vr menu login item update 2016-04-12 11:15:06 -07:00
Brad Hefta-Gaub
83494c4a96 Merge pull request #7594 from huffman/feat/include-rolled-logs-bugsplat 
Add rolled log files to BugSplat
 2016-04-12 08:33:17 -07:00
Brad Hefta-Gaub
3f05ded932 Merge pull request #7611 from zzmp/guard/amd 
Disable gradient QML items on AMD
 2016-04-12 08:32:57 -07:00
Brad Hefta-Gaub
a1fe6aee6d Merge pull request #7625 from hyperlogic/tony/third-person-hmd-camera-improvements 
Improve comfort of third-person HMD camera.
 2016-04-12 08:32:23 -07:00
Brad Hefta-Gaub
c5840f217a Merge pull request #7630 from jherico/fps_fix 
Fix FPS counter
 2016-04-12 08:31:58 -07:00
Ryan Huffman
2dfe96a654 Cleanup headers 2016-04-11 14:50:28 -07:00
Ryan Huffman
afe502e1d2 Fix typo 2016-04-11 14:43:05 -07:00
Ryan Huffman
02a17c4497 Fix commented out code 2016-04-11 14:38:29 -07:00
Ryan Huffman
9faeb13ae9 Remove error testing code 2016-04-11 14:38:19 -07:00
Ryan Huffman
63aee23bf1 Move crash testing to CrashHelpers.h 2016-04-11 14:29:16 -07:00
Ryan Huffman
316d533d19 Update crash reporting to cover a larger area 2016-04-11 13:50:42 -07:00
Zach Pomerantz
ab72d8d8fb Init QML GL from share context 2016-04-11 13:47:45 -07:00
Brad Davis
df8ad57185 Fix FPS counter 2016-04-11 00:25:16 -07:00
Anthony J. Thibault
93a5bdd79a Prevent avatar rotation due to HMD head turning in third-person camera. 
Also, fix one frame glitch during snap turning, by updating the sensorToWorld matrix
after the MyAvatar::updateOrientation rotates the avatar, but before we perform IK.
 2016-04-08 15:27:43 -07:00
Anthony J. Thibault
711a1b8c7d Avatar: update renderItems when avatar position or render mesh is in the frustum. 
Previously, when render mesh was visible the renderItems they were not updated with the latest avatar mixer joints rotations and position.
This would result in a frozen avatar being visible.

Now the renderItems are updated when the render mesh is in the frustum or the bounding sphere around the avatar position is visible.
 2016-04-08 13:14:50 -07:00
Ryan Huffman
6232c82f66 Update BugSplat to only send first and last log files 2016-04-08 09:39:25 -07:00
Ryan Huffman
2d60a9a51e Reduce log size limit from 1MB to 512KB 2016-04-08 09:39:08 -07:00
Zach Pomerantz
e08c9db469 Expose GL property to QML 2016-04-07 18:27:07 -07:00
Brad Hefta-Gaub
5287c174b4 Merge pull request #7605 from jherico/route_log_errors 
Fixing logging errors on initial load of controller routes
 2016-04-07 17:13:13 -07:00
Brad Hefta-Gaub
3d94558d6b Merge pull request #7589 from jherico/oculus_input 
Support oculus remote input
 2016-04-07 15:05:45 -07:00
Brad Hefta-Gaub
157dd96303 Merge pull request #7612 from ZappoMan/mirrorReturnsToLastView 
when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror
 2016-04-07 14:56:53 -07:00
Brad Davis
72d8990fed Fix menu launch from Oculus remote 2016-04-07 14:13:02 -07:00
Brad Hefta-Gaub
d1a2a30c02 fix build buster 2016-04-07 13:41:05 -07:00
Brad Hefta-Gaub
09004680d0 handle a couple edge cases 2016-04-07 13:32:26 -07:00
Brad Hefta-Gaub
81bb5ff07d when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror 2016-04-07 13:13:19 -07:00
Brad Hefta-Gaub
bd1eb5842a fix crash related to menu vs watchdog create order 2016-04-07 12:45:24 -07:00
Brad Davis
85019b2b5e Fixing logging errors on initial load of controller routes 2016-04-07 10:41:54 -07:00
Brad Hefta-Gaub
2c3aeddbe4 reduce log spam for the deadlock watchdog 2016-04-07 10:25:08 -07:00
Brad Hefta-Gaub
e78b202433 Merge pull request #7602 from ZappoMan/default1PView 
default to first person view
 2016-04-07 09:16:04 -07:00
Brad Hefta-Gaub
5f4d6ca1d3 CR feedback 2016-04-06 19:07:26 -07:00
Brad Hefta-Gaub
47aed9c8bd fix redraw issue when logging in to or out of a domain 2016-04-06 14:56:20 -07:00
Brad Hefta-Gaub
1f708ccb57 default to first person view 2016-04-06 13:35:08 -07:00
Brad Hefta-Gaub
2ee5b45ca6 Merge pull request #7583 from zzmp/log/bookmarks-exists 
Do not warn if no bookmarks file
 2016-04-06 11:20:06 -07:00
Ryan Huffman
5fb898de74 Add rolled log files to BugSplat 2016-04-06 10:14:12 -07:00
Brad Hefta-Gaub
51660ab3a8 Merge pull request #7579 from sethalves/log-about-webengine-remote-debugging 
Log about webengine remote debugging
 2016-04-06 08:28:37 -07:00
Brad Hefta-Gaub
699c717828 Merge pull request #7580 from hyperlogic/tony/keyboard-focus-on-web-entity-fix 
Application: focusOut keyboard device when clicking on web entity.
 2016-04-05 18:44:30 -07:00
Brad Hefta-Gaub
70f3a39463 Merge pull request #7593 from hyperlogic/tony/keyboard-focus-improvements 
Application: change keyboard input focus when using ui overlay.
 2016-04-05 18:44:16 -07:00
Anthony J. Thibault
07ff687bfe Application: change keyboard input focus when using ui overlay. 
call focusOutEvent on keyboard input plugin when an offscreen ui has activeFocus.
 2016-04-05 18:12:02 -07:00
Brad Hefta-Gaub
891cc12d3f Merge pull request #7549 from zzmp/feat/resource-vis 
Add a visualization of cacheable resource usage
 2016-04-05 15:43:27 -07:00
Zach Pomerantz
cba866b375 Do not warn if no bookmarks file 2016-04-05 14:59:57 -07:00
Seth Alves
bda8761e00 fix how env variable is accessed 2016-04-05 14:30:41 -07:00
Seth Alves
f42e968dda commit to repush to see if github is working yet 2016-04-05 14:12:46 -07:00
Anthony J. Thibault
4c632cb4c4 Application: focusOut keyboard device when clicking on web entity. 2016-04-05 14:00:43 -07:00
Seth Alves
d8282ae799 log value of QTWEBENGINE_REMOTE_DEBUGGING before exit 2016-04-05 13:56:39 -07:00