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

46872 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Ken Cooke
46526a309d Increase audio input buffering on Windows 7 2016-10-03 17:46:09 -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
Anthony J. Thibault
327fcc970b Remove frame lag from near grabbed physical objects. 
In the game loop, physics occurs before avatar update.
Before this PR, when the avatar is moved during avatar update, near grabbed objects will not pick up this move until one frame later, when
the physics is run on the next update.

After this PR, near grabbed objects are adjusted to reflect any position or rotation change that occurred during the avatar update.
 2016-10-03 16:01:54 -07:00
Ryan Huffman
0b2def6013 Fix style error 2016-10-03 15:23:39 -07:00
Ryan Huffman
e213a47814 Fix incorrect return values in getProcessorInfo 2016-10-03 15:19:03 -07:00
Ryan Huffman
b5eb943c1d Add hmd stats to stats event 2016-10-03 15:12:14 -07:00
Ryan Huffman
dafb5c5bab Add processor information to launch user activity event 2016-10-03 15:11:56 -07:00
Atlante45
573d5898cc Make static control packets class members 2016-10-03 13:46:55 -07:00
Chris Collins
f84f98f804 Merge pull request #8708 from samcake/color 
Fix the crash on start up if default ambient map fails to load
 2016-10-03 12:36:45 -07:00
samcake
0189e3aea7 Github is borked ? 2016-10-03 11:29:17 -07:00
samcake
5adedbbb8b replace the simple log by a unique log 2016-10-03 11:27:15 -07:00
Chris Collins
4c247aecb3 Merge pull request #8702 from Atlante45/console 
Restore "Are you sure?" pop-up. Default to "No"
 2016-10-03 11:12:18 -07:00
Howard Stearns
d3606da059 Merge pull request #8709 from howard-stearns/initial-domain-check 
initial domain-check script
 2016-10-03 10:47:03 -07:00
Howard Stearns
ee801f4cc2 initial domain-check script 2016-10-03 10:29:33 -07:00
samcake
afcb5b8557 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-10-03 10:17:46 -07:00
samcake
0df69b8e15 Protecting the usage of the defaultSkyboxTexture in case its creation has failed to avoid crash on the first usage, removing an uncorrect assert in GL45BackendTexture that would trigger in debug 2016-10-03 10:06:58 -07:00
Chris Collins
0ee1156e5c Merge pull request #8705 from ZappoMan/removeMicNotifications 
remove mic and window resize notifications
 2016-10-03 09:51:00 -07:00
Ken Cooke
9590d2eef9 Fix support for audio when input rate != output rate 2016-10-03 09:08:32 -07:00
Brad Hefta-Gaub
3612ed95c3 Merge pull request #8703 from hyperlogic/bug-fix/qml-surface-get-root-item-crash 
Fix for crash bug in web entities
 2016-10-02 20:31:35 -07:00
Atlante45
fab0f8019d Ask windows to not try to be helpful 2016-10-02 17:33:07 -07:00
Brad Hefta-Gaub
546d4ff986 remove mic and window resize notifications 2016-10-02 09:10:12 -07:00
Brad Hefta-Gaub
c7551a2207 Merge pull request #8700 from ZappoMan/fetchTextureMapCrashFix 
fix crash when bouncing to eschatology and eschatology-dev
 2016-10-01 21:34:20 -07:00
Brad Hefta-Gaub
51e67df39a Merge pull request #8669 from jherico/oglplus_b_gone 
Remove oglplus usage in Offscreen QML rendering
 2016-10-01 21:20:51 -07:00
Brad Hefta-Gaub
7ef8e53d03 Merge pull request #8701 from ZappoMan/getShapeKeyCrashFix 
add guards to getShapeKey
 2016-10-01 20:23:50 -07:00
samcake
964f766427 Merge pull request #8704 from ZappoMan/calculateMaterialSizeFixes 
make calculateTextureInfo thread safe
 2016-10-01 17:15:39 -07:00
Brad Hefta-Gaub
7fe16442fa make calculateTextureInfo thread safe 2016-10-01 15:47:17 -07:00
Atlante45
2d87e3eb1a Fix CSS to wrap folder path 2016-10-01 14:07:11 -07:00
Atlante45
12ecc02899 Default popup choices to "No" 2016-10-01 13:44:41 -07:00
Atlante45
46c0e83127 Restore "Are you sure" popup 2016-10-01 13:44:41 -07:00
Anthony Thibault
a79485f8c2 Fix for crash bug in web entities 
Guard against nullptrs in RenderableWebEntitItem and WebEntityAPIHelper.
These pointers can go null if the webEntity is deleted on the main thread.
Also, the backing offscreen qml surface can be destroyed if the webEntity has not been rendered for 30 seconds
due to frustum culling.
 2016-10-01 13:43:49 -07:00
Brad Hefta-Gaub
04f6547940 add guards to getShapeKey 2016-10-01 12:15:03 -07:00
Brad Davis
933388bc61 Remove oglplus usage from offscreen UI 2016-10-01 11:39:46 -07:00
Brad Davis
265996156c Remove unused header and typedef 2016-10-01 11:39:45 -07:00
Brad Hefta-Gaub
769a29332c Merge pull request #8695 from jherico/texture_transfer_crash 
Fix crash in initializing texture transfer thread
 2016-10-01 11:31:37 -07:00