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

43223 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
8a3336ae95 use the networking logging category 2016-05-04 16:31:12 -07:00
Seth Alves
91af732516 if we receive an update from the entity-server that doesn't include one of our actions, resend the action data 2016-05-04 16:30:38 -07:00
Stephen Birarda
effa2fc235 typo fix for comment 2016-05-04 16:28:26 -07:00
Stephen Birarda
7192ad301f add debug for socket errors and state changes 2016-05-04 16:23:40 -07:00
Andrew Meadows
8c7ee00849 Merge pull request #7808 from ctrlaltdavid/20904 
Increase maximum friction value from 0.99 to 10.0
 2016-05-04 16:11:43 -07:00
Zach Pomerantz
1553f532ba Specialize usleep for Win32 2016-05-04 15:40:53 -07:00
Seth Alves
9db839bc13 don't allow someone else to delete an action that I own. reset dynamic property when releasing and entity, even if refCount isn't 0 2016-05-04 15:01:00 -07:00
Zach Pomerantz
526143b097 Improve perf of Win32 usleep 2016-05-04 13:36:07 -07:00
Zach Pomerantz
3619821b82 Improve timing tests with averages 2016-05-04 13:23:10 -07:00
Zach Pomerantz
0f6162d683 Use appropriate units for timing tests 2016-05-04 13:23:10 -07:00
David Rowe
4b05d8ed95 Increase maximum friction to 10.0 - Bullet's maximum 2016-05-05 07:50:15 +12:00
James B. Pollack
8d48f54313 fix ribosome location 2016-05-04 12:41:33 -07:00
James B. Pollack
e5ed5218e3 fix ribsome 2016-05-04 12:30:07 -07:00
James B. Pollack
83a7677766 update button position 2016-05-04 12:28:09 -07:00
Seth Alves
382a0c48da fix warning 2016-05-04 12:09:26 -07:00
Zach Pomerantz
56ec0e5db0 Abort infinite JS loops on quit 2016-05-04 12:02:08 -07:00
Seth Alves
b6918f59a6 remove extra qualification 2016-05-04 11:33:41 -07:00
Seth Alves
44beca1687 try having all spring derived actions agree on a target 2016-05-04 11:29:17 -07:00
Brad Hefta-Gaub
2c9608489f fix recursive mutex in Entites.callEntityMethod() 2016-05-04 10:01:20 -07:00
Zach Pomerantz
284feaf5d4 Properly shut down scripting thread 2016-05-03 20:29:31 -07:00
howard-stearns
d3c6662198 Take the deadband down a notch, following feedback from P. 2016-05-03 16:35:20 -07:00
howard-stearns
acc216726a Cleanup 2016-05-03 16:32:53 -07:00
howard-stearns
6eccf98050 Merge branch 'hand-controller-pointer' of https://github.com/howard-stearns/hifi into hand-controller-pointer 2016-05-03 16:27:33 -07:00
howard-stearns
fdf9c0a217 Fix offset so that non-full-size window can be located anywhere on screen. 2016-05-03 16:26:45 -07:00
David Rowe
d1064bf5ea Increase maximum friction to 1.0 - bullet can handle it 2016-05-04 10:58:33 +12:00
Seth Alves
5a86640526 Merge branch 'grab-fixes' of github.com:sethalves/hifi into grab-fixes 2016-05-03 15:49:05 -07:00
Seth Alves
9e53055d43 parentID and parentJointIndex are now protected by simulation ownership 2016-05-03 15:48:50 -07:00
Seth Alves
f585a62c66 Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-03 15:43:22 -07:00
Brad Hefta-Gaub
42169ddcb3 Merge pull request #7806 from Atlante45/fix/warnings 
Fix couple OSX warnings
 2016-05-03 15:42:47 -07:00
Howard Stearns
71a885998b Don't duplicate script. 2016-05-03 15:17:53 -07:00
howard-stearns
eb0517f3cd fix updateSeeking 2016-05-03 14:36:52 -07:00
Seth Alves
6f395cd97a Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-03 14:36:33 -07:00
howard-stearns
adb11c9266 Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer 2016-05-03 14:03:10 -07:00
David Rowe
bc04d1b477 Increase maximum friction value from 0.99 to 0.9999 2016-05-04 09:01:26 +12:00
Andrew Meadows
ba226b9cb4 promote priority immediately when already owned 2016-05-03 13:43:08 -07:00
Howard Stearns
5bd77bf343 Matching "final" version of test script. 2016-05-03 13:23:04 -07:00
Brad Hefta-Gaub
d2889dbda4 Merge pull request #7804 from imgntn/diceFix2 
Move Dice GUI
 2016-05-03 13:05:46 -07:00
James B. Pollack
d98732d5a1 dressing room updates 2016-05-03 12:08:44 -07:00
Brad Hefta-Gaub
bbf358f81d Merge pull request #7796 from samcake/blue 
Improve Translucent shapes global lighting with support for the ambient map reflection
 2016-05-03 11:14:06 -07:00
Brad Hefta-Gaub
754ef071eb Merge pull request #7786 from sethalves/web-scripts-use-local-libs 
allow scripts on the web to refer to local libraries with /~/
 2016-05-03 11:10:48 -07:00
Seth Alves
99ffb6b79d Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-03 10:29:41 -07:00
Zach Pomerantz
0bc89d6b18 Avoid missing pipeline log flood 2016-05-03 09:39:31 -07:00
Brad Hefta-Gaub
eb209c7483 Merge pull request #7752 from Geenz/master 
Correction To sRGB Conversions
 2016-05-03 08:01:51 -07:00
Howard Stearns
773770a7fc All but origin-correction. 2016-05-03 07:01:23 -07:00
Brad Hefta-Gaub
ad285ff9a1 Merge pull request #7769 from ZappoMan/abortForInfiniteLoops 
add support to abort evaluation of long running scripts on shutdown
 2016-05-02 20:44:12 -07:00
Brad Hefta-Gaub
2b54813075 Merge pull request #7783 from zzmp/fix/script-engine-deletion 
Fix script engine deletion
 2016-05-02 18:16:07 -07:00
Brad Hefta-Gaub
49d02b802a Merge pull request #7719 from zzmp/feat/resource-prefetch 
Add prefetching to exposed caches
 2016-05-02 18:04:26 -07:00
Brad Hefta-Gaub
530a06f5f5 Merge pull request #7802 from sethalves/ignore-my-own-actions-on-net 
keep track of actions we are editing and ignore updates from server for these actions
 2016-05-02 17:58:49 -07:00
Atlante45
eb21b9c5d7 OSX warnings 2016-05-02 17:18:57 -07:00
James B. Pollack
a9ab531e27 clear up toolbar name 2016-05-02 17:01:44 -07:00