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
47197 commits 25 branches 28 tags 1.2 GiB
Commit graph

47197 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
2bb2aca2be Remove commented line in LogHandler 2016-10-04 16:54:37 -07:00
Ryan Huffman
a52e2d8bc5 Add category to log lines 2016-10-04 16:49:24 -07:00
Ryan Huffman
ff8f45d36c Fix application directory path 2016-10-04 16:47:59 -07:00
Ryan Huffman
224c35d568 Clean up launch server in main.cpp 2016-10-04 16:47:59 -07:00
Ryan Huffman
0aba1d3e54 Fix server arguments causing crash on startup 2016-10-04 16:47:58 -07:00
Ryan Huffman
fe6382d1b6 Update server content path to be relative 2016-10-04 16:47:58 -07:00
Ryan Huffman
392ecb0dae Update interface to launch server 2016-10-04 16:47:58 -07:00
Ryan Huffman
9dfa3e4a17 Move ScriptCache from AssignmentClient to Agent 2016-10-04 16:43:14 -07:00
Ryan Huffman
ae507c4609 Add ScriptCache to assignment clients 2016-10-04 16:43:14 -07:00
Ryan Huffman
82aa1bafad Update BatchLoader to use ScriptCache 2016-10-04 16:43:13 -07:00
Ryan Huffman
ca4022814e Add extra logging to asset client 2016-10-04 16:43:13 -07:00
Ryan Huffman
c6485cc50c Fix scriptcache only serving empty strings 2016-10-04 16:43:12 -07:00
Ryan Huffman
3c374e8ee2 Add retry logic to ScriptCache 2016-10-04 16:43:12 -07:00
Ryan Huffman
1fff480b73 Add timeout to AssetResourceRequest 2016-10-04 16:43:12 -07:00
Ryan Huffman
8343cfd687 Add grip to unequip 2016-10-04 16:34:18 -07:00
Ryan Huffman
289cd6ba2b Adjust hand controller unequip rotation threshold 2016-10-04 16:34:18 -07:00
Ryan Huffman
847a5cc7a1 Remove old texture setting code in ModelOverlay 2016-10-04 16:25:48 -07:00
Ryan Huffman
93d995a5ae Fix model overlay visible not working 2016-10-04 16:25:40 -07:00
Ryan Huffman
c683c82817 Fix setting textures in model overlays 2016-10-04 16:24:43 -07:00
Seth Alves
7261fcae4a possible fix for domain-server crash-on-exit 2016-10-04 14:35:23 -07:00
Howard Stearns
4974c88880 Merge pull request #8663 from howard-stearns/address-bar-text-area-changes 
Address bar text area changes
 2016-10-04 13:50:40 -07:00
Chris Collins
4a9c5958df Merge pull request #8720 from highfidelity/RC-22 
Beta Release 22 - Includes up to Developer Release 5424
 2016-10-04 11:42:28 -07:00
howard-stearns
fd8287dae3 Merge branch 'summon-crowd' into domain-check 2016-10-04 11:38:25 -07:00
howard-stearns
cdd658d4dd report results 2016-10-04 11:31:49 -07:00
Anthony Thibault
60aff44f33 Merge pull request #8717 from hyperlogic/bug-fix/near-grab-lag-fix 
Remove frame lag and jitter from near grabbed physical objects.
 2016-10-04 11:14:22 -07:00
Anthony J. Thibault
dcd425a165 Add an entityTree lock around the AvatarHoldAction::lateAvatarUpdate calls 2016-10-04 10:56:44 -07:00
howard-stearns
1c73b3c043 Merge branch 'domain-check' of https://github.com/highfidelity/hifi into summon-crowd 2016-10-04 10:40:48 -07:00
Atlante45
2e46ed3cac Make static control packets class members 2016-10-04 10:40:06 -07:00
Ken Cooke
02f15bd338 Inverted the CMAKE logic, to make the version comparison more clear 2016-10-04 10:40:05 -07:00
Ken Cooke
6d25c40ac7 remove Installer debugging code 2016-10-04 10:40:05 -07:00
Ken Cooke
8d3b30cef6 Select the correct plugin in the Installer, based on Windows version 2016-10-04 10:40:05 -07:00
Ken Cooke
92f4294302 Don't pre-delete qtaudio_windows.dll in Installer 2016-10-04 10:40:05 -07:00
Ken Cooke
0c74aad799 Post-build command to use qtaudio_windows.dll for Win7, qtaudio_wasapi.dll for Win8/10, or include both for Installer 2016-10-04 10:40:05 -07:00
Ken Cooke
32bac92530 Increase audio input buffering on Windows 7 2016-10-04 10:40:05 -07:00
howard-stearns
5ea4d48e36 poll for ready, and include physics in definition of ready, based on #8723 2016-10-04 10:23:10 -07:00
Chris Collins
1087885380 Merge pull request #8721 from kencooke/audio-fixes2 
Fix audio support on Windows7
 2016-10-04 10:14:37 -07:00
Brad Hefta-Gaub
9554befb68 Merge pull request #8714 from Atlante45/ack2 
Fix potential race condition on static memory
 2016-10-04 10:05:53 -07:00
Ken Cooke
6838dc0247 Inverted the CMAKE logic, to make the version comparison more clear 2016-10-04 09:01:43 -07:00
Ken Cooke
40393bd8ef remove Installer debugging code 2016-10-03 22:31:43 -07:00
Ken Cooke
541f7ebb05 Select the correct plugin in the Installer, based on Windows version 2016-10-03 21:46:55 -07:00
Ken Cooke
eb5b03d008 Don't pre-delete qtaudio_windows.dll in Installer 2016-10-03 20:52:24 -07:00
Ken Cooke
372b631448 Post-build command to use qtaudio_windows.dll for Win7, qtaudio_wasapi.dll for Win8/10, or include both for Installer 2016-10-03 19:59:27 -07:00
Ken Cooke
8491254664 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-fixes2 2016-10-03 18:13:43 -07:00
Brad Davis
8c5028158f Fix crash on destroying web entities and overlays 2016-10-03 18:02:21 -07:00
Ken Cooke
46526a309d Increase audio input buffering on Windows 7 2016-10-03 17:46:09 -07:00
Brad Davis
ca3572f991 Support external GL textures with proper fencing 2016-10-03 17:09:10 -07:00
Brad Davis
b77636b5bf Merge pull request #8719 from jherico/stable-merge 
Stable merge
 2016-10-03 17:04:46 -07:00
Brad Davis
b4f2d93d68 Merge remote-tracking branch 'upstream/stable' into stable-merge 
Conflicts:
	server-console/src/content-update.css
	server-console/src/main.js
 2016-10-03 17:04:25 -07:00
Chris Collins
ca1a7135eb Merge pull request #8706 from kencooke/audio-fixes 
Improve support for audio when input rate != output rate
 2016-10-03 16:46:56 -07:00
Chris Collins
bb9b23f036 Merge pull request #8716 from huffman/feat/stats-proc-info 
Add HMD and processor info to stats and launch events
 2016-10-03 16:12:49 -07:00