Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 18:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45862 commits 71 branches 56 tags 1.2 GiB
Commit graph

45862 commits

This branch
This branch
All branches
Author SHA1 Message Date
sam
557f898d95 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-20 19:57:24 -07:00
Brad Hefta-Gaub
857e97e979 Merge pull request #8480 from sethalves/dont-say-insufficient-data-during-login 
don't send a login-denied packet when we're still waiting for user's public key
 2016-08-20 13:48:10 -07:00
Chris Collins
74cb2d4bcf Merge pull request #8461 from imgntn/demo_movement 
Movement changes for Hand Controllers
 2016-08-19 18:36:40 -07:00
samcake
9cdd079213 And again 2016-08-19 18:22:14 -07:00
Chris Collins
9cd870bd34 Merge pull request #8485 from Atlante45/master 
Move steam.js to unpublishedScripts
 2016-08-19 17:18:08 -07:00
Atlante45
dd60683e29 Move steam.js to unpublishedScripts 2016-08-19 17:14:14 -07:00
James B. Pollack
0d42920f1b Merge remote-tracking branch 'upstream/master' into demo_movement 2016-08-19 16:45:44 -07:00
James B. Pollack
2b1e629cca some extra checks on settings values 2016-08-19 14:51:15 -07:00
James B. Pollack
3922192cfc update 2016-08-19 14:31:47 -07:00
James B. Pollack
653b1acc4a cleanup 2016-08-19 14:29:14 -07:00
Seth Alves
ac4ecc9907 don't send a login-denied packet when we're still waiting for user's public key. 2016-08-19 14:10:27 -07:00
samcake
5ad66a17ee Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-19 11:09:31 -07:00
samcake
6a076bcee4 PRoviding a fix for the macOS build 2016-08-19 11:09:12 -07:00
James B. Pollack
98f0290565 Merge pull request #8436 from huffman/feat/more-user-activity-data 
Add more user activity data
 2016-08-19 10:48:28 -07:00
samcake
a4945fe45c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-19 10:00:40 -07:00
James B. Pollack
b694b8e541 update turn rate for left stick 2016-08-18 17:24:18 -07:00
James B. Pollack
855561c014 moar 2016-08-18 16:52:32 -07:00
James B. Pollack
a0d4fd4c0e fix bug 2016-08-18 16:51:04 -07:00
James B. Pollack
214a705199 slow 180 rate 2016-08-18 16:50:50 -07:00
Chris Collins
a9fbc4ec2c Merge pull request #8448 from huffman/feat/domain-specify-backup-location 
Add backup directory setting to domain server
 2016-08-18 16:45:50 -07:00
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
samcake
b5296410c3 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-18 10:20:33 -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
Ryan Huffman
d46af500c1 Fix wrong property name in entity activity tracking 2016-08-17 17:00:56 -07:00
James B. Pollack
e69c89a93e y 2016-08-17 17:00:17 -07:00
Ryan Huffman
25b9d756ca Update entity edit tracking to track count rather than bool 2016-08-17 16:54:04 -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