Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-28 03:31:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45818 commits 25 branches 0 tags 1.1 GiB
Commit graph

45818 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
3a8de5ab0d fix rotation function 2016-08-18 15:58:12 -07:00
James B. Pollack
bae51bcfd4 remove prints 2016-08-18 15:29:49 -07:00
James B. Pollack
c89103481b change load order 2016-08-18 14:40:08 -07:00
James B. Pollack
859d3ccadc tweaks 2016-08-18 14:36:52 -07:00
James B. Pollack
2e22bc5e46 new coolin 2016-08-18 14:08:31 -07:00
James B. Pollack
402bad3417 Merge remote-tracking branch 'upstream/master' into demo_movement 2016-08-18 13:43:54 -07:00
James B. Pollack
992504e179 adjust coolin 2016-08-18 13:35:51 -07:00
Brad Hefta-Gaub
1cec7b2db0 Merge pull request #8429 from SamGondelman/loadingFade2 
Don't do fade effect once physics kick in
 2016-08-18 12:46:24 -07:00
Brad Davis
37192e8251 Merge pull request #8472 from zzmp/fix/buffer-debug-flood 
fix log flood in debug mode from Buffer::Iterator (c)end access
 2016-08-18 12:06:45 -07:00
James B. Pollack
b8213aed7b naming and some logging for teleport stuff 2016-08-18 11:59:58 -07:00
Chris Collins
140b0c4d02 Merge pull request #8462 from jherico/openvr_random_position_fix 
Address issues with random camera locations
 2016-08-18 11:51:47 -07:00
Zach Pomerantz
813fefd599 reimplement buffer get for (c)end 2016-08-18 11:26:25 -07:00
James B. Pollack
37846d9f0c store settings 2016-08-18 11:07:50 -07:00
Clément Brisset
d1fb723b01 Merge pull request #8444 from zzmp/fix/skybox 
fix flashing in default skybox, and allow skybox lighting without textures
 2016-08-18 11:07:09 -07:00
James B. Pollack
1eaac8605f invert the structure and make it work with oculus 2016-08-18 10:43:37 -07:00
James B. Pollack
09cd0b8f4a debug prints 2 2016-08-18 09:24:01 -07:00
James B. Pollack
7768e65e8b update name 2016-08-18 09:22:43 -07:00
James B. Pollack
54a5bf3b23 Merge pull request #8465 from sethalves/fix-3d-overlay-lines 
fix -- make 3d-line overlays work again
 2016-08-18 09:06:26 -07:00
James B. Pollack
9e14191217 recondition 2016-08-18 08:57:37 -07:00
James B. Pollack
cfbc589829 debug prints 2016-08-18 08:43:26 -07:00
Seth Alves
8487f825a0 don't return reference to local variables 2016-08-18 08:01:42 -07:00
Seth Alves
2ff35768aa make 3d-line overlays work again 2016-08-17 18:45:09 -07:00
James B. Pollack
8ede4ddb66 longform 2016-08-17 17:33:24 -07:00
James B. Pollack
e69c89a93e y 2016-08-17 17:00:17 -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
James B. Pollack
fdfcc235b6 as functions 2016-08-17 16:24:59 -07:00
James B. Pollack
514d6ec139 get lsy lsx rsy values 2016-08-17 16:22:44 -07:00
James B. Pollack
fc65d246ee update whens 2016-08-17 16:13:23 -07:00
James B. Pollack
a4a41faf24 demo and only do for vive 2016-08-17 16:12:07 -07:00
James B. Pollack
82a8887275 add whens 2016-08-17 15:50:19 -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
Brad Davis
a32ab77b7d Address issues with random camera locations caused by bad HMD sensor poses 2016-08-17 15:22:30 -07:00
James B. Pollack
a7ba4ce1f9 jumping 2016-08-17 15:11:07 -07:00
James B. Pollack
8bc6ca2fa1 demo changes 2016-08-17 15:08: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