Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 12:00:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41499 commits 25 branches 0 tags 1.1 GiB
Commit graph

41499 commits

This branch
This branch
All branches
Author SHA1 Message Date
PhilipRosedale
8c4ecc64d9 fix entity script location 2016-03-23 22:49:18 -07:00
Seth Alves
462da3aaf3 don't call getMesh from render 2016-03-23 22:46:43 -07:00
Seth Alves
2d7f32a554 redo polyvox locking 2016-03-23 22:03:27 -07:00
Brad Hefta-Gaub
2b0670718f Merge pull request #7449 from howard-stearns/report-previous-session-data 
Report previous session data
 2016-03-23 20:58:51 -07:00
Brad Hefta-Gaub
3505c14552 Merge pull request #7444 from birarda/uncover-qml 
Attachments Dialog QML updates (from contractor)
 2016-03-23 20:45:50 -07:00
Brad Hefta-Gaub
cdd5126589 Merge pull request #7451 from hyperlogic/tony/increased-deadlock-timer 
DeadlockWatchdogThread: bumped up age from 10 to 15 seconds.
 2016-03-23 20:39:12 -07:00
James B. Pollack
d8b728f30f doppel the fun 2016-03-23 19:27:37 -07:00
Atlante45
69c516caaf Have ATP respect request limit 2016-03-23 19:09:28 -07:00
Stephen Birarda
ef3f5e0221 fix for race in last receiver response 2016-03-23 18:23:30 -07:00
Anthony J. Thibault
de3144cde5 Merge branch 'master' into tony/vive-rendering-work 2016-03-23 18:13:59 -07:00
Stephen Birarda
1b322c8d01 don't oversend because of packet pairs 2016-03-23 18:07:28 -07:00
Anthony J. Thibault
0ef5c45815 DeadlockWatchdogThread: bumped up age from 10 to 15 seconds. 
This will, hopefully, prevent false positives from people loading content on slow PCs.
 2016-03-23 17:59:54 -07:00
PhilipRosedale
7b326c9d7b fixes per review 2016-03-23 17:56:02 -07:00
Brad Hefta-Gaub
62a56ecbfa fix typos 2016-03-23 17:45:22 -07:00
Anthony Thibault
88c4e54cff openvr: predict 3 frames into the future 
Becasue I revered the latency fix in the GLEscrow queue.

*sigh*
 2016-03-23 17:38:40 -07:00
Howard Stearns
a393f36978 Forgot important comment. 2016-03-23 17:31:21 -07:00
Stephen Birarda
57da7c2ba7 add handling for short circuit loss in SendQueue 2016-03-23 17:29:46 -07:00
Howard Stearns
c09c1438f8 ivar init order. 2016-03-23 17:28:54 -07:00
Philip Rosedale
e1f3665185 Merge pull request #7435 from hyperlogic/tony/all-jitter-must-die 
MyAvatar: fix jitter in hands when moving
 2016-03-23 17:28:47 -07:00
Brad Hefta-Gaub
574642a6e4 Merge pull request #7440 from zzmp/feat/resource-finished 
Add finished signal to Resource loading
 2016-03-23 17:17:53 -07:00
Anthony J. Thibault
73725106f0 OpenGLDisplayPlugin: For non-threaded present use fetchAndReleasewithGpuWait 2016-03-23 17:13:29 -07:00
Anthony J. Thibault
cec6e7dd8d Application: reduced idle PROFILE_RANGE spam 2016-03-23 17:12:48 -07:00
Anthony J. Thibault
8bb387dc74 Revert GLEscrow changes 2016-03-23 17:11:16 -07:00
Brad Hefta-Gaub
fdd0b48ae1 reduce log spam 2016-03-23 17:06:03 -07:00
howard-stearns
dbdf79f96f Restore whitespace so there aren't superfluous diffs. 2016-03-23 17:01:50 -07:00
howard-stearns
c435ca212a Report previous session time. 2016-03-23 16:59:17 -07:00
James B. Pollack
7934eee368 Merge pull request #13 from ericrius1/homereset 
Water effect for water can created on hold and deleted on release now
 2016-03-23 16:50:53 -07:00
ericrius1
22629bf6c4 water effect created on hold 2016-03-23 16:46:38 -07:00
ericrius1
7bbb8167d0 fixed rotation plant 2016-03-23 16:41:57 -07:00
Menithal
12ecd592ab Added Refresh Buttons to entityProperties 
Pressing buttons next to the url bar will now allow for content to have an
automatic unix timestamp to be applied / updated to the end of the url.
Applies for all url entity Properties
 2016-03-24 01:14:48 +02:00
samcake
22191a2864 When an albedo texture is replaced from script,make sure its aloha channel is checked for opacity 2016-03-23 16:12:43 -07:00
James B. Pollack
6f0d3201de poster 2016-03-23 16:10:33 -07:00
Anthony J. Thibault
0d37515784 Merge branch 'master' into tony/vive-rendering-work 2016-03-23 15:59:59 -07:00
samcake
1e46b0803c fixing repported issues during review 2016-03-23 15:59:57 -07:00
Brad Hefta-Gaub
3fa3b40f43 fix non-animated motor proteins 2016-03-23 15:56:31 -07:00
howard-stearns
550738776c Pass whether or not previous session crashed to the UserActivityLogger. 2016-03-23 15:56:29 -07:00
James B. Pollack
536027d96b posters 2016-03-23 15:53:52 -07:00
samcake
7d99183474 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-23 15:47:00 -07:00
James B. Pollack
3acd37dc90 faxing berlin 2016-03-23 15:34:09 -07:00
James B. Pollack
057c31c384 enable reset 2016-03-23 15:32:40 -07:00
James B. Pollack
95d246e483 Merge pull request #12 from ericrius1/homereset 
Clock works with arbitrary rotations
 2016-03-23 15:24:45 -07:00
ericrius1
c4f36dc02e reverted pistol changes 2016-03-23 15:22:56 -07:00
ericrius1
dd5e972a5c adeed blocks 2016-03-23 15:18:21 -07:00
ericrius1
42196ea5c4 homereset 2016-03-23 15:09:14 -07:00
James B. Pollack
5a508d6f23 tanksss 2016-03-23 15:05:36 -07:00
Andrew Meadows
ecfe198e35 patch btCompoundShape memory leak 2016-03-23 14:39:49 -07:00
Andrew Meadows
119ef24d5d cleanup ShapeManager API and fix bitrot in tests 2016-03-23 14:39:49 -07:00
Andrew Meadows
a52ac3cc50 remove excess whitespace 2016-03-23 14:39:49 -07:00
Brad Hefta-Gaub
dbfea6ec82 Merge pull request #7439 from jherico/deadlock_qml 
Fix potential deadlock in QML
 2016-03-23 14:16:37 -07:00
Brad Hefta-Gaub
61651b21db Merge pull request #7443 from Atlante45/readme 
Update readme
 2016-03-23 14:16:07 -07:00