Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41959 commits 2 branches 0 tags 1.1 GiB
Commit graph

41959 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
afdfef1482 Make sure we don't use raw resource ptr 2016-04-12 13:51:11 -07:00
Seth Alves
b952147fca Merge pull request #7635 from birarda/master 
fix domain-server settings change without password change
 2016-04-12 12:49:55 -07:00
Seth Alves
2b63c2a8ba Merge pull request #7641 from hyperlogic/tony/macos-cpuid-fix 
Rename CPUID to CPUIdent to fix XCode 7.2 builds
 2016-04-12 12:48:15 -07:00
Seth Alves
0980ab5c2d Merge pull request #7634 from birarda/asset-server-clean 
cleanup unmapped asset server files
 2016-04-12 11:59:41 -07:00
Seth Alves
460fdc0761 Merge pull request #7536 from samcake/orange 
First pass at using compressed format when uploading textures
 2016-04-12 11:59:10 -07:00
Anthony J. Thibault
32ccc1d68e Windows build fixes 2016-04-12 10:53:04 -07:00
Chris Collins
0faab41057 Merge pull request #7624 from birarda/new-home-set 
allow ATP scripts to be used by scripted Agent
 2016-04-12 09:42:14 -07:00
Stephen Birarda
455d2d5048 allow for an empty password with a username 2016-04-12 09:37:26 -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
ad8d7b2ffa Merge pull request #7620 from sethalves/make-fixupMissingParents-more-thread-safe 
guard access to _missingParent vector with a lock
 2016-04-12 08:32:38 -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
9a687bea44 Merge pull request #7628 from jherico/save_scripts 
Save the set of running scripts when they change, as well as at shutdown
 2016-04-12 08:32:10 -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
Stephen Birarda
76af3efe73 fix for active socket check on ATP script download 2016-04-11 17:59:27 -07:00
Stephen Birarda
190d11e0bf rename the set of hashes to check for deletion 2016-04-11 17:16:52 -07:00
Stephen Birarda
026f58c866 don't perform asset cleanup if mapping file load fails 2016-04-11 17:14:31 -07:00
Zach Pomerantz
1df2fc7809 Disable qml gradient for AMD for ContentSection 2016-04-11 13:59:08 -07:00
Zach Pomerantz
ab72d8d8fb Init QML GL from share context 2016-04-11 13:47:45 -07:00
Zach Pomerantz
52958ffc70 Move gl info queries to GLHelpers 2016-04-11 13:28:18 -07:00
Stephen Birarda
aad98cc25d make sure password setting is set before checking length 2016-04-11 11:56:47 -07:00
Anthony J. Thibault
470aac3acf Rename CPUID to CPUIdent to fix XCode 7.2 builds 2016-04-11 11:54:17 -07:00
Zach Pomerantz
d719b3692e Consolidate qml alpha gradient workaround to desktop 2016-04-11 11:36:42 -07:00
Seth Alves
1d63f6d354 Merge branch 'master' of github.com:highfidelity/hifi into make-fixupMissingParents-more-thread-safe 2016-04-11 09:58:08 -07:00
Brad Hefta-Gaub
b758acb7d8 Merge pull request #7610 from zzmp/fix/standard-qt-gl 
Codify qt qml version in one header
 2016-04-11 09:45:21 -07:00
Brad Hefta-Gaub
47ff5c090d Merge pull request #7623 from ZappoMan/fixAnimationFrameExport 
fix export of animation properties
 2016-04-11 09:37:47 -07:00
Brad Hefta-Gaub
94f970dd89 Merge pull request #7622 from hyperlogic/tony/frozen-avatar-fix 
Fix for frozen ghost avatars
 2016-04-11 09:37:30 -07:00
Brad Hefta-Gaub
a204b9d923 Merge pull request #7627 from jherico/qml_key_interaction 
Suppress key release events for presses that were absorbed by QML
 2016-04-11 09:31:46 -07:00
Stephen Birarda
334dc3cb6c cleanup left file debug, add check for deleted mapping 2016-04-11 09:05:11 -07:00
Stephen Birarda
775898893b add deletion of unmapped files during delete op 2016-04-11 08:57:07 -07:00
Stephen Birarda
fae9b061a3 promote a debug to info 2016-04-11 08:42:52 -07:00
Stephen Birarda
4d0976f730 remove migration code for pre-mapping migrations 2016-04-11 08:41:42 -07:00
Brad Davis
df8ad57185 Fix FPS counter 2016-04-11 00:25:16 -07:00
Brad Hefta-Gaub
cc418c615f Merge pull request #7631 from sethalves/parent-equipping-and-platform-hack 
treat children of avatars and children of entities differently until velocity handling is fixed
 2016-04-10 14:55:03 -07:00
Andrew Meadows
013f575cc9 Merge pull request #7632 from sethalves/fix-physics-feedback-loop 
avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.
 2016-04-10 10:40:09 -07:00
Seth Alves
43f735dd21 avoid loop where bullet moves an entity and then an entity tells bullet that it has moved. 2016-04-09 22:18:43 -07:00
Brad Davis
5a5583d3a5 PR comments 2016-04-09 21:43:50 -07:00
Seth Alves
2aa3e5d418 re-enabled EntityItem::simulateKinematicMotion for things with parents 2016-04-09 09:06:18 -07:00
Seth Alves
3890a71433 treat children of avatars and children of entities differently until this is fixed 2016-04-09 08:37:41 -07:00
Brad Davis
c5b5746646 Save the set of running scripts when they change, as well as at shutdown 2016-04-08 17:29:54 -07:00
Brad Davis
7827c0f6f6 Suppress key release events for presses that were absorbed by QML 2016-04-08 17:09:11 -07:00
Stephen Birarda
bf3324fc6b hold download of ATP script if Asset Server isn't ready 2016-04-08 15:28:12 -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
Brad Hefta-Gaub
f1f8fd8a24 fix export of animation properties 2016-04-08 14:40:06 -07:00
Stephen Birarda
1df0dce971 use ResourceRequest in Agent to handle ATP scripts 2016-04-08 14:38:26 -07:00
Brad Davis
b87e8220c4 Merge pull request #7619 from imgntn/noRefresh 
Remove refresh feature from edit.js for now
 2016-04-08 13:35:17 -07:00
Seth Alves
95f446183f use for loop rather than iterator 2016-04-08 13:32:33 -07:00
Brad Davis
2353daa254 Merge pull request #7614 from ctrlaltdavid/20876 
Disable arrow keys being able to move between HTML form fields
 2016-04-08 13:28:30 -07:00
Brad Davis
8e1e11a6f8 Merge pull request #7615 from zzmp/fix/amd-particles 
Add explicit layout to textured particle shader
 2016-04-08 13:19:41 -07:00
Seth Alves
6088612ce0 guard access to _missingParent vector with a lock to allow safe access from multiple threads 2016-04-08 13:16:30 -07:00