Commit graph

45783 commits

Author SHA1 Message Date
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Brad Davis
89df5768f3 Merge pull request #8435 from imgntn/touch_grip
Map oculus touch grip to trigger
2016-08-17 16:38:58 -07:00
Clément Brisset
8b54c92494 Merge pull request #8459 from ctrlaltdavid/21032
QA READY: Fix Asset Browser dialog
2016-08-17 15:37:43 -07:00
David Rowe
9fa4a20e55 Fix Asset Browser dialog 2016-08-18 09:37:26 +12:00
Brad Hefta-Gaub
87964c89da Merge pull request #8453 from huffman/feat/sandbox-logs-button
Add a button to the sandbox log window to open the log directory
2016-08-17 10:47:04 -07:00
Ryan Huffman
8ba105d1e4 Fix open-log-dir button handler 2016-08-17 09:36:42 -07:00
Ryan Huffman
0e259dcd29 Add open log dir button to server-console 2016-08-17 09:29:45 -07:00
Brad Hefta-Gaub
f66b36ff07 Merge pull request #8441 from imgntn/marketplace_spawn_location
Better create locations for Entities
2016-08-17 09:09:00 -07:00
Brad Hefta-Gaub
1ad1c48adc Merge pull request #8414 from jherico/logging_fix
Categorize some debug logging in FBX parsing
2016-08-17 09:07:27 -07:00
Brad Hefta-Gaub
cd28df6c2e Merge pull request #8446 from sethalves/local-velocity-for-scripts
Local velocity for scripts
2016-08-17 09:06:54 -07:00
Brad Hefta-Gaub
f16cbbe270 Merge pull request #8445 from huffman/fix/procedural-entity-render
Fix transparency on procedural shapes
2016-08-17 09:04:31 -07:00
James B. Pollack
0810ad0e7b use square of sides 2016-08-16 18:13:42 -07:00
James B. Pollack
e9c2a1d509 cleanup prints 2016-08-16 18:03:34 -07:00
James B. Pollack
06787029b7 small 2016-08-16 17:58:35 -07:00
Seth Alves
f5f88fbacc Merge branch 'master' of github.com:highfidelity/hifi into local-velocity-for-scripts 2016-08-16 16:47:27 -07:00
Seth Alves
7bc1235c54 local velocity and angular velocity in scripts is now handled the way local position and rotation are 2016-08-16 16:47:13 -07:00
Stephen Birarda
3355a90e7d Merge pull request #8413 from huffman/feat/atp-bandwidth
Add asset server bandwidth to stats
2016-08-16 15:54:11 -07:00
Ryan Huffman
dae8461773 Fix transparency on procedural shapes 2016-08-16 15:42:17 -07:00
Chris Collins
b80828d262 Merge pull request #8442 from sethalves/grab-adjustments
don't show equip sphere until hand is in position to equip.  widen unequip/drop cone
2016-08-16 14:59:28 -07:00
Seth Alves
c85e8d0580 don't show equip sphere until hand is in position to equip. widen unequip/drop cone 2016-08-16 11:18:12 -07:00
James B. Pollack
1632f4cb3d better create locations 2016-08-16 10:52:05 -07:00
James B. Pollack
5a2c7cf58e cleanup 2016-08-16 09:58:18 -07:00
Chris Collins
2ec54c4fd7 Merge pull request #8439 from huffman/fix/transparent-against-procedural-skybox
Fix transparent items not being rendered correctly against procedural skybox
2016-08-16 09:19:51 -07:00
Ryan Huffman
1d2ea3be03 Fix transparent items not being rendered correctly against procedural skybox 2016-08-15 16:35:25 -07:00
Brad Davis
8fdecc6e56 Merge pull request #8438 from zzmp/fix/amd-cubemap
fix cubemaps on AMD cards running GL 4.5
2016-08-15 16:06:32 -07:00
Zach Pomerantz
af915c7923 replace cube tex DSA transfer with EXT 2016-08-15 15:31:04 -07:00
James B. Pollack
b4943a4c4b Merge pull request #8437 from huffman/fix/assets-example
Fix assets example not using correct API
2016-08-15 15:27:39 -07:00
James B. Pollack
f143c62e9c whoops 2016-08-15 11:53:32 -07:00
James B. Pollack
a078b20f9d make it work with click 2016-08-15 10:24:24 -07:00
James B. Pollack
493adca04f map oculus grip to trigger 2016-08-15 10:02:53 -07:00
samcake
8d12a23efb Merge pull request #8325 from jherico/deferred_batches_threaded
Threaded rendering
2016-08-15 09:59:44 -07:00
James B. Pollack
8c7f89ce44 Merge pull request #8425 from imgntn/pistol_sensitivity
Adjust pistol sensitivity
2016-08-15 09:50:34 -07:00
Ryan Huffman
9773c58da6 Fix assets example not using correct API 2016-08-15 09:28:26 -07:00
Ryan Huffman
b5e2913eb9 Move node received bandwidth tracking to LimitedNodeList 2016-08-15 09:23:02 -07:00
Brad Davis
fdbbd70eed Merge pull request #8422 from sethalves/sidestep-linux-gcc-bug
sidestep linux gcc linker? bug
2016-08-13 12:08:05 -07:00
Brad Davis
5b09748c00 Merge pull request #8431 from imgntn/assetbutton
Open Asset Browser with Button from Edit.js Toolbar
2016-08-13 12:04:21 -07:00
Brad Davis
438205b875 Fixing last buffer flush 2016-08-12 22:29:05 -07:00
Brad Davis
99009d8a2d Enable reprojection on OpenVR 2016-08-12 22:29:04 -07:00
Brad Davis
574737fbb5 More GPU api fixes, protect Buffer::flush 2016-08-12 22:29:04 -07:00
Brad Davis
d34ac2cea8 Fix hand laser alignment 2016-08-12 22:29:03 -07:00
Brad Davis
511eb34e5f Fixing mac build 2016-08-12 22:29:02 -07:00
Brad Davis
0c990c621d Fix perf tool build 2016-08-12 22:29:01 -07:00
Brad Davis
58c7df115f Reduce API surface area, make render batches const correct 2016-08-12 22:29:01 -07:00
Brad Davis
cac529a1b1 Display plugins now use gpu::Context API 2016-08-12 22:29:00 -07:00
Brad Davis
6d7edd38cc Rename clearViewTransform 2016-08-12 22:28:59 -07:00
Brad Davis
ff24bc982c Re-disable reprojection in OpenVR 2016-08-12 22:28:58 -07:00
Brad Davis
82081d7d57 Address vsync weirdness 2016-08-12 22:28:58 -07:00
Brad Davis
39b424645a Cropping no-preview image 2016-08-12 22:28:57 -07:00
Brad Davis
e352883a88 Fix Gamma in Oculus display plugin 2016-08-12 22:28:56 -07:00
Brad Davis
719e555381 Restoring reprojection to OpenVR 2016-08-12 22:28:55 -07:00