Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 16:30:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45459 commits 25 branches 28 tags 1.2 GiB
Commit graph

45459 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony Thibault
8e3bc97ef9 fix for unused variable warnings 2016-07-29 08:10:10 -07:00
Zander Otavka
bcff561eb8 Add category collapsing and expanding 2016-07-28 18:14:00 -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
Ryan Huffman
91f847a7f0 Update progress bar image 2016-07-28 17:24:35 -07:00
Zander Otavka
987a8c802f Add basic input validation 2016-07-28 17:21:40 -07:00
Zander Otavka
aa909a1366 Polish category/row addition and deletion 2016-07-28 17:21:40 -07:00
Zander Otavka
93f9f93b5a Enable adding groups 2016-07-28 17:21:40 -07:00
Zander Otavka
3234de9f92 Add category headers to groups 2016-07-28 17:21:40 -07:00
Ryan Huffman
58932a6806 Add reset of progress bar when domain changes 2016-07-28 17:13:05 -07:00
Ryan Huffman
a786224297 Add easing back to progress.js 2016-07-28 16:55:45 -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
Ryan Huffman
873e7b63df Update progress-bar.svg 2016-07-28 16:26:12 -07:00
Ryan Huffman
c1b86fe3d2 Update progress.js to only track total number of downloads 2016-07-28 16:16:11 -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
Seth Alves
5a96c8bf57 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-27 18:07:29 -07:00
Eric Levin
0f7f9990c2 Tuned haptic pulses for grab, release, equip, de-quip 2016-07-27 17:58:24 -07:00
Seth Alves
cd2f61c90c if logging in, send username signature even when connecting to localhost 2016-07-27 14:03:51 -07:00
Seth Alves
390ee9aaeb clean up some code, add some debugging prints 2016-07-27 14:03:32 -07:00
Seth Alves
3a3b1489c6 code review 2016-07-27 11:46:52 -07:00
Seth Alves
8663b260f6 code review -- applyPermissionsForUser to setPermissionsForUser, don't take input permissions as an argument 2016-07-27 10:14:18 -07:00
Seth Alves
d69d5bff28 remove redundant call to userPerms.setVerifiedUserName 2016-07-27 10:06:02 -07:00
Seth Alves
a2d35df34e fix a couple of mistakes made during code-review response 2016-07-27 09:57:57 -07:00
Seth Alves
bc2ded2f97 code review 2016-07-27 08:46:46 -07:00
Seth Alves
148793011d code review 2016-07-27 07:55:09 -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
Seth Alves
b9fb4e91d6 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-26 10:08:15 -07:00
Seth Alves
b3e04b5370 small cleanups for permissions help text 2016-07-26 09:35:58 -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