James B. Pollack
|
41aa485f11
|
one hand teleprt
|
2016-08-02 12:52:35 -07:00 |
|
James B. Pollack
|
7fae7e9c77
|
cleanup
|
2016-08-02 12:26:37 -07:00 |
|
James B. Pollack
|
108e7a2fc1
|
Merge remote-tracking branch 'upstream/master' into tweak_lazers
|
2016-08-02 12:25:27 -07:00 |
|
James B. Pollack
|
a7b8f2c9df
|
updates
|
2016-08-02 12:25:24 -07:00 |
|
Ryan Huffman
|
604c8f4a36
|
Merge pull request #8337 from humbletim/fix-Assets-getMapping
fix Assets.getMapping(path, callback) to return a value
|
2016-08-01 13:32:08 -07:00 |
|
Anthony Thibault
|
f71a59276c
|
Merge pull request #8317 from hyperlogic/bug-fix/web3doverlay-rendering
Fix alpha cut-outs and incorrect gamma on web overlays and entities
|
2016-07-29 17:44:46 -07:00 |
|
Anthony Thibault
|
8e3bc97ef9
|
fix for unused variable warnings
|
2016-07-29 08:10:10 -07:00 |
|
Zach Pomerantz
|
a9c6d69aa6
|
Merge pull request #8328 from ZappoMan/punishSlowScripts
Fix punished scripts stopping behavior and application shutdown while scripts being punished
|
2016-07-28 17:42:02 -07:00 |
|
Seth Alves
|
2f80c5b68c
|
Merge pull request #8327 from PhilipRosedale/autoReverb
Tuned haptic pulses for grab, release, equip, de-quip
|
2016-07-28 16:38:44 -07:00 |
|
Brad Hefta-Gaub
|
e879f22c95
|
fix behavior with no entity server
|
2016-07-28 15:15:52 -07:00 |
|
Brad Hefta-Gaub
|
74a3835a1e
|
CR feedback
|
2016-07-28 15:15:33 -07:00 |
|
Anthony Thibault
|
ea310bcc43
|
Web Entities now render correctly as well
|
2016-07-28 14:11:19 -07:00 |
|
Anthony Thibault
|
be6e401e9a
|
Merge branch 'master' into bug-fix/web3doverlay-rendering
|
2016-07-28 11:20:35 -07:00 |
|
Brad Hefta-Gaub
|
22619a66ba
|
process events also
|
2016-07-28 10:51:17 -07:00 |
|
Anthony Thibault
|
6b8e912114
|
Fix for mac and linux builds
|
2016-07-28 10:02:19 -07:00 |
|
Brad Hefta-Gaub
|
755989b8ff
|
don't allow punished scripts to slow stop or shutdown
|
2016-07-28 10:01:05 -07:00 |
|
Eric Levin
|
5167809342
|
release near and far grab at trigger click detent
|
2016-07-28 08:51:11 -07:00 |
|
Eric Levin
|
f37570dc9a
|
only pulse on release when held
|
2016-07-28 08:23:45 -07:00 |
|
humbletim
|
3e0ef7d43a
|
make Assets.getMapping(path) actually return the mapping
|
2016-07-28 10:13:30 -04:00 |
|
Eric Levin
|
0f7f9990c2
|
Tuned haptic pulses for grab, release, equip, de-quip
|
2016-07-27 17:58:24 -07:00 |
|
Brad Hefta-Gaub
|
17a5fa040d
|
Merge pull request #8322 from jherico/deferred_batches
Deferred batches
|
2016-07-26 21:43:53 -07:00 |
|
Bradley Austin Davis
|
5bbcbbb811
|
Update render perf tool to use the new API
|
2016-07-26 17:06:44 -07:00 |
|
Bradley Austin Davis
|
54a7265be8
|
Removing empty file, because jenkins
|
2016-07-26 16:32:56 -07:00 |
|
Bradley Austin Davis
|
a9740b803f
|
Defer batch execution to the end of the frame generation
|
2016-07-26 16:13:48 -07:00 |
|
Bradley Austin Davis
|
fa20898285
|
Remove last direct use of gpu::Context::render()
|
2016-07-26 16:13:22 -07:00 |
|
Bradley Austin Davis
|
bb6abf11d3
|
FramebufferCache, cleanup & thread safety
|
2016-07-26 15:32:31 -07:00 |
|
Bradley Austin Davis
|
a455f3a435
|
Add frame concept to gpu library
|
2016-07-26 15:25:36 -07:00 |
|
Andrew Meadows
|
5ce681154d
|
Merge pull request #8301 from AlexanderOtavka/asset-browser-ui
Asset browser ui
|
2016-07-26 15:04:10 -07:00 |
|
Chris Collins
|
a13c8385bb
|
Merge pull request #8319 from ZappoMan/punishSlowScripts
better allocation of CPU time while loading scenes and when slow scripts are running
|
2016-07-26 12:54:31 -07:00 |
|
Brad Hefta-Gaub
|
af9032e6fb
|
Merge pull request #8321 from jherico/depth_fix
Fix depth state caching / resetting
|
2016-07-26 12:49:04 -07:00 |
|
Bradley Austin Davis
|
ac743b6acb
|
PR feedback
|
2016-07-26 11:55:25 -07:00 |
|
Bradley Austin Davis
|
3962487ee3
|
Fix depth state caching / resetting
|
2016-07-26 11:55:25 -07:00 |
|
Brad Hefta-Gaub
|
2d199fe3d0
|
rename function for better clarity
|
2016-07-26 08:08:44 -07:00 |
|
Brad Hefta-Gaub
|
a12034cb45
|
fix unix warning, added comments
|
2016-07-26 07:54:55 -07:00 |
|
Brad Hefta-Gaub
|
83dc9ea6bb
|
punish slow scripts and don't send updates while physics is still loading
|
2016-07-25 21:46:30 -07:00 |
|
James B. Pollack
|
40c24b8cd1
|
Merge pull request #8312 from imgntn/whiteboard_far_swiper
Make whiteboard marker spawning work with 'far trigger'
|
2016-07-25 17:01:48 -07:00 |
|
James B. Pollack
|
6a72fe7df4
|
cleanup
|
2016-07-25 16:58:59 -07:00 |
|
James B. Pollack
|
5ed1e602e6
|
Merge pull request #8316 from AlexanderOtavka/fix-script-end-errors
Fix script end errors
|
2016-07-25 16:50:05 -07:00 |
|
Anthony J. Thibault
|
0a35c13a94
|
Moved creation of pipeline into call_once block
|
2016-07-25 16:30:29 -07:00 |
|
James B. Pollack
|
05e3a8613a
|
colors back to blue and red
|
2016-07-25 16:28:47 -07:00 |
|
Anthony J. Thibault
|
fb84f058d6
|
Fix alpha cut-outs and incorrect gamma on Web3DOverlays
|
2016-07-25 15:56:05 -07:00 |
|
Zander Otavka
|
90154158b6
|
Fix gravity zero vector
|
2016-07-25 14:08:07 -07:00 |
|
Zander Otavka
|
344ec25bcd
|
Fix gravity for dynamic entities
|
2016-07-25 14:01:57 -07:00 |
|
James B. Pollack
|
9240672c9d
|
change distance hold origin
|
2016-07-25 13:06:09 -07:00 |
|
Chris Collins
|
e1e1ca1c12
|
Merge pull request #8306 from AndrewMeadows/fix-crash-on-avatar-change
fix interface crash when chaning avatar models
|
2016-07-25 12:11:46 -07:00 |
|
Brad Hefta-Gaub
|
43602ab0fb
|
Merge pull request #8237 from imgntn/html5
updates to overlay web browser
|
2016-07-25 11:37:17 -07:00 |
|
James B. Pollack
|
38765e6fa4
|
extra space
|
2016-07-25 11:12:34 -07:00 |
|
James B. Pollack
|
84e4de4bad
|
update formatting
|
2016-07-25 11:11:37 -07:00 |
|
James B. Pollack
|
708cce64b6
|
work with far trigger
|
2016-07-25 11:05:55 -07:00 |
|
Chris Collins
|
3c9b9aef4f
|
Merge pull request #8304 from ChristophHaag/fixGridShader
fix grid shader
|
2016-07-25 09:47:12 -07:00 |
|