David Rowe
|
a294170c74
|
Fix not being able to teleport to user when users window moved right
|
2016-05-21 15:50:06 +12:00 |
|
Brad Hefta-Gaub
|
5906f88226
|
Merge pull request #7952 from sethalves/fix-walking-far-grab
fix distance-grabbing and walking at the same time
|
2016-05-20 16:54:52 -07:00 |
|
Brad Hefta-Gaub
|
dc29e97d32
|
Merge pull request #7870 from jherico/input_cleanup
Update input plugins default active state & joint handling
|
2016-05-20 16:13:06 -07:00 |
|
Seth Alves
|
a24d63a39c
|
make distance-grab work better when avatar is walking
|
2016-05-20 15:45:00 -07:00 |
|
Brad Hefta-Gaub
|
2062291810
|
Merge pull request #7926 from zzmp/fix/debug-script-crash
fix crash on shutdown in debug
|
2016-05-20 15:35:32 -07:00 |
|
Brad Hefta-Gaub
|
9dded91af3
|
Merge pull request #7934 from AndrewMeadows/trim-convex-hulls
reduce number of points in unreasonable convex hulls
|
2016-05-20 15:30:36 -07:00 |
|
Chris Collins
|
8dbc6af719
|
Merge pull request #7944 from Atlante45/fix/edit-js
fix edit.js to handle userData that's not in JSON
|
2016-05-20 15:14:13 -07:00 |
|
Brad Hefta-Gaub
|
2a94b641e3
|
Merge pull request #7930 from zzmp/fix/zero-copy-crash
fix crash from zero-sized copy
|
2016-05-20 15:11:00 -07:00 |
|
Andrew Meadows
|
2e30f0916c
|
remove debug logging and add some comments
|
2016-05-20 15:07:47 -07:00 |
|
Brad Davis
|
73342b2758
|
PR feedback
|
2016-05-20 14:50:24 -07:00 |
|
Brad Davis
|
07562f72af
|
Doing a pass over the input plugins and controller code
|
2016-05-20 14:50:23 -07:00 |
|
Brad Hefta-Gaub
|
a7316069e6
|
Merge pull request #7948 from sethalves/fix-model-url-change
fix entity dissapears when switching between models in asset-server
|
2016-05-20 14:00:02 -07:00 |
|
Brad Hefta-Gaub
|
db78dcbb79
|
Merge pull request #7949 from howard-stearns/hand-controller-tuning
fix hand controller load and freezing
|
2016-05-20 13:47:54 -07:00 |
|
howard-stearns
|
c299aef8f2
|
fix 588, 558
|
2016-05-20 12:15:30 -07:00 |
|
Seth Alves
|
76f4a25694
|
move code that clears old scale and registration to after model is loaded
|
2016-05-20 11:40:46 -07:00 |
|
Atlante45
|
0353e562e4
|
entityProperties.html handles non object userData
|
2016-05-20 10:18:32 -07:00 |
|
Andrew Meadows
|
83b8ef8131
|
clean up stream formatting of vec3 and friends
|
2016-05-20 09:41:26 -07:00 |
|
Andrew Meadows
|
f3fc00bc3a
|
add comment for why MAX_HULL_POINTS is 42
|
2016-05-20 09:41:26 -07:00 |
|
Andrew Meadows
|
5a826d696a
|
cleanup after code review
|
2016-05-20 09:41:26 -07:00 |
|
Andrew Meadows
|
9fae1a7edd
|
tweak log format
|
2016-05-20 09:41:26 -07:00 |
|
Andrew Meadows
|
7866fcf78c
|
trim high-point convex hulls
|
2016-05-20 09:41:26 -07:00 |
|
Brad Hefta-Gaub
|
95f7ea5609
|
Merge pull request #7922 from samcake/red
improve performance of Light volume pass
|
2016-05-20 09:33:55 -07:00 |
|
Zach Pomerantz
|
4c8ff557db
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/debug-script-crash
|
2016-05-20 09:31:30 -07:00 |
|
Brad Hefta-Gaub
|
8760cd0807
|
Merge pull request #7929 from zzmp/fix/script-downloaded-shutdown
fix crash on shutdown from scriptDownloaded callback
|
2016-05-20 09:31:04 -07:00 |
|
Brad Hefta-Gaub
|
25e7b9935e
|
Merge pull request #7932 from zzmp/fix/shadows
fix shadow box that appears when flying
|
2016-05-20 09:30:29 -07:00 |
|
Brad Hefta-Gaub
|
f1278894c7
|
Merge pull request #7941 from zzmp/fix/vsync-halving
fix vsync halving fps
|
2016-05-20 09:30:13 -07:00 |
|
Zach Pomerantz
|
fff260c2b9
|
Guard against zero-sized gl buffer copy
|
2016-05-20 09:27:50 -07:00 |
|
Zach Pomerantz
|
2026226fe2
|
Handle vsync without halving fps
|
2016-05-20 09:04:39 -07:00 |
|
Brad Hefta-Gaub
|
1cce891f7c
|
Merge pull request #7947 from ZappoMan/zzmp-fix/avatar-inputs-pos
fix AvatarInputs spawning on bottom-left
|
2016-05-20 08:59:54 -07:00 |
|
Brad Hefta-Gaub
|
472c735d60
|
Merge branch 'master' of https://github.com/highfidelity/hifi into zzmp-fix/avatar-inputs-pos
|
2016-05-20 07:44:29 -07:00 |
|
Brad Hefta-Gaub
|
354661cc44
|
Merge branch 'fix/avatar-inputs-pos' of https://github.com/zzmp/hifi into zzmp-fix/avatar-inputs-pos
|
2016-05-20 07:44:07 -07:00 |
|
Brad Hefta-Gaub
|
313708ab5f
|
Merge pull request #7946 from Atlante45/fix/osx-warnings
Fix OSX warnings
|
2016-05-20 07:31:35 -07:00 |
|
Atlante45
|
8be6bc6460
|
Add missing overrides
|
2016-05-19 22:00:22 -07:00 |
|
Brad Hefta-Gaub
|
a1ec6c2961
|
Merge pull request #7938 from sethalves/set-age-of-imported-to-zero
fix age of imported entities
|
2016-05-19 17:53:31 -07:00 |
|
Brad Hefta-Gaub
|
d521cd82a0
|
Merge pull request #7908 from Atlante45/fix/settings
fix settings getting reset
|
2016-05-19 17:53:15 -07:00 |
|
Brad Hefta-Gaub
|
8ff7af28be
|
Merge pull request #7925 from sethalves/overlay-or-grab-not-both
fix mouse-grab moving both an overlay and an entity at the same time
|
2016-05-19 17:38:32 -07:00 |
|
Brad Hefta-Gaub
|
f85d5d3ca8
|
Merge pull request #7935 from ZappoMan/fixLogSpam
reduce log spam
|
2016-05-19 17:38:16 -07:00 |
|
Zach Pomerantz
|
9a4b30a50b
|
Fix AvatarInputs phantom movement
|
2016-05-19 13:19:15 -07:00 |
|
Brad Hefta-Gaub
|
cef4a49c35
|
Merge pull request #7867 from huffman/fix/query-octree-crash
Fix crash in JurisdictionMap
|
2016-05-19 11:53:54 -07:00 |
|
Brad Hefta-Gaub
|
ac15097f47
|
Merge pull request #7834 from huffman/feat/user-agent-plugins
Add system information to UserAgent in AccountManager requests
|
2016-05-19 11:53:14 -07:00 |
|
samcake
|
67929a018c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-05-19 11:52:47 -07:00 |
|
Clément Brisset
|
cddf587d6b
|
Merge pull request #7919 from zzmp/fix/osx-warnings
Fix OSX warnings
|
2016-05-19 11:11:30 -07:00 |
|
samcake
|
039bb3ac3c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-05-19 10:21:38 -07:00 |
|
Seth Alves
|
7ea7bd3e1d
|
set created-time for imported entities to 'now'
|
2016-05-19 10:21:04 -07:00 |
|
samcake
|
2d7118dacc
|
clening up the code
|
2016-05-19 10:21:00 -07:00 |
|
samcake
|
d0c883f75a
|
Merge pull request #7923 from jherico/gpu_breakup2
breaking up OpenGL GPU backend
|
2016-05-19 10:02:42 -07:00 |
|
Brad Hefta-Gaub
|
232bd475df
|
Merge pull request #7927 from zzmp/fix/script-timer-crash
fix crash on shutdown from script timers
|
2016-05-19 09:52:04 -07:00 |
|
Seth Alves
|
6c3c9f45d1
|
Merge branch 'master' of github.com:highfidelity/hifi into overlay-or-grab-not-both
|
2016-05-19 09:48:50 -07:00 |
|
Brad Hefta-Gaub
|
53956c8210
|
reduce log spam
|
2016-05-19 07:50:06 -07:00 |
|
Brad Davis
|
7efcad38d2
|
PR feedback
|
2016-05-18 23:11:36 -07:00 |
|