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 |
|
samcake
|
3c80767ec3
|
Adding the shadingMOdel read from the fbx material
|
2016-05-03 18:43:20 -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 |
|
James B. Pollack
|
e971da7dcb
|
move dice GUI
|
2016-05-02 16:54:32 -07:00 |
|
Howard Stearns
|
5bffa14436
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer
|
2016-05-02 16:49:27 -07:00 |
|
James B. Pollack
|
0b867713cb
|
dressing room updates
|
2016-05-02 16:26:05 -07:00 |
|
Seth Alves
|
1da041de9b
|
don't consume the physics related property changes from the packet that informs us that we are the simulationOwner of an entity
|
2016-05-02 15:09:08 -07:00 |
|
Brad Hefta-Gaub
|
b98419e537
|
add units to debug message
|
2016-05-02 14:58:38 -07:00 |
|
Seth Alves
|
ae8f502808
|
keep track of actions we are editing and ignore updates from server for these actions
|
2016-05-02 14:23:36 -07:00 |
|
Brad Hefta-Gaub
|
4569032314
|
more CR feedback
|
2016-05-02 12:44:07 -07:00 |
|
Clément Brisset
|
2ef87557fc
|
Merge pull request #7798 from zzmp/clean/override
Fix warnings on vanilla XCode compilations
|
2016-05-02 10:56:07 -07:00 |
|
Brad Hefta-Gaub
|
cddcac60c1
|
Merge pull request #7768 from ctrlaltdavid/20891
Add Interface "Home" bookmark function
|
2016-05-02 10:14:57 -07:00 |
|
Brad Hefta-Gaub
|
a447ce4633
|
Merge pull request #7770 from AndrewMeadows/avoid-crosseyes
don't cross the eyes
|
2016-05-02 10:13:25 -07:00 |
|
Brad Hefta-Gaub
|
e117f280cc
|
Merge pull request #7779 from zzmp/fix/fst-crash
Avoid crashing on missed pipelines
|
2016-05-02 10:12:17 -07:00 |
|
Brad Hefta-Gaub
|
44fb572248
|
Merge pull request #7775 from ctrlaltdavid/20896
Use UI Toolkit border styles for various dialogs
|
2016-05-02 10:11:29 -07:00 |
|
Brad Hefta-Gaub
|
d599d008c3
|
Merge pull request #7757 from imgntn/cellProduction
Move cellscience to production s3 bucket
|
2016-05-02 10:11:08 -07:00 |
|
samcake
|
a5b32b59a7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2016-05-02 09:54:54 -07:00 |
|
Zach Pomerantz
|
29e0744b89
|
Fix equality in scriptableResource/lib
|
2016-05-02 09:40:08 -07:00 |
|