Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-13 21:47:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43111 commits 22 branches 28 tags 1.2 GiB
Commit graph

17545 commits

Author SHA1 Message Date
Anthony J. Thibault
09a4e0eaa8 Fix for vive controllers sometimes not working 
* Fixed bug with input devices that where added, removed then re-added.
  The default mappings were being ignored on the second add.
* Fixed potential crash when hardware inputPlugin device poses were polled from the JavaScript thread
  by taking the UserInputManager lock during pluginUpdate.
* Renamed Controller.Hardware.Vive.LB & RB to LeftGrip and RightGrip, to better match Oculus touch.
* Updated resource/controller/vive.json to reflect this new mapping.
* Exposed touch pad capacitive touch events to JavaScript as
  Controller.Hardware.Vive.LSTouch and RSTouch.
* Added viveTouchpadTest.js script to test LSTouch and RSTouch events.
 2016-05-10 19:32:08 -07:00
Andrew Meadows
59c6a6dfea Merge pull request #7825 from sethalves/linux-qol 
Linux qol
 2016-05-09 15:34:10 -07:00
Andrew Meadows
ffc3123467 Merge pull request #7658 from sethalves/grab-fixes 
Grab fixes
 2016-05-09 15:30:37 -07:00
Brad Hefta-Gaub
22081a8606 Merge pull request #7833 from zzmp/fix/scriptable-resource 
Fix prefetching
 2016-05-09 15:09:20 -07:00
Brad Hefta-Gaub
2c0204b0d6 Merge pull request #7821 from Atlante45/fix/collision-sound 
Fix avatar/entity collision sound
 2016-05-09 14:24:19 -07:00
Brad Hefta-Gaub
343bc2a747 Merge pull request #7841 from jherico/mac_oculus 
OSX Rift functionality
 2016-05-09 13:12:46 -07:00
Brad Hefta-Gaub
312ea20e15 Merge pull request #7797 from zzmp/fix/cache-thread-safety 
Make ResourceCache::resetResourceCounters threadsafe
 2016-05-09 11:52:57 -07:00
Brad Hefta-Gaub
ab0a77c82b Merge pull request #7830 from ZappoMan/removeusleeps 
switch OctreeSendThread and OctreePersistThread to use std::this_thread::sleep_for() instead of usleep()
 2016-05-09 11:47:40 -07:00
Brad Hefta-Gaub
39a4e38485 Merge pull request #7837 from samcake/hdr 
Fixing the bad color format for skymaps
 2016-05-09 11:47:02 -07:00
Chris Collins
91a5d82af5 Merge pull request #7826 from zzmp/perf/mipmap 
Defer mipmap gen to gpu
 2016-05-09 10:52:49 -07:00
Chris Collins
4f22e0ad5a Merge pull request #7828 from sethalves/show-other-sim-owner 
show with debug icons when someone else is the simulation owner
 2016-05-09 10:49:30 -07:00
Brad Davis
335841bf0f Fix plugin loading on OSX 2016-05-08 23:35:18 -07:00
Bradley Austin Davis
0f768b13b9 Working on OSX Rift functionality 2016-05-07 20:17:31 -07:00
Seth Alves
4b1274cb0f Merge branch 'master' of github.com:highfidelity/hifi into linux-qol 2016-05-07 11:04:50 -07:00
samcake
da75c27188 fixing bad color format assignment code and bad color format for the cubemaps 2016-05-06 18:57:19 -07:00
Clément Brisset
b234d94d25 Merge pull request #7832 from birarda/session-location 
repairs to user heartbeats
 2016-05-06 15:15:52 -07:00
Zach Pomerantz
3f4f10a27e Fix prefetch state changes 2016-05-06 15:08:45 -07:00
Brad Hefta-Gaub
6d97ad609b Merge pull request #7818 from zzmp/fix/colliding-fbx-paths 
Fix colliding fbx tex names
 2016-05-06 15:03:58 -07:00
Stephen Birarda
6f6221840e put back the correct metaverse API url in NetworkingConstants 2016-05-06 13:26:23 -07:00
Stephen Birarda
ed1ddc2a8b remove code to update/store wallet balance 2016-05-06 11:54:49 -07:00
Brad Hefta-Gaub
47f8adf187 Merge pull request #7824 from sethalves/avatar-id-reliable 
use reliable and ordered packets for avatar identity
 2016-05-06 11:32:05 -07:00
Brad Hefta-Gaub
fe14bc8e52 also switch OctreePersistThread to use std::this_thread::sleep_for() 2016-05-06 11:19:27 -07:00
Seth Alves
f80333ee9e fix indentation, move an early exit to earlier 2016-05-06 10:06:51 -07:00
Seth Alves
71738d4841 Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-06 09:59:17 -07:00
Seth Alves
073d845bb5 show with debug icons when someone else is the simulation owner 2016-05-05 18:33:01 -07:00
Seth Alves
aeebf7d9bf Merge pull request #7823 from Atlante45/fix/potential-it-invalidation 
Fix potential iterator invalidation
 2016-05-05 18:28:49 -07:00
Seth Alves
16a5030159 Merge pull request #7810 from zzmp/perf/usleep 
Improve CPU performance of Win32 usleep
 2016-05-05 18:23:31 -07:00
Zach Pomerantz
7f496ea069 Fix colliding fbx tex names 2016-05-05 17:54:00 -07:00
Zach Pomerantz
6a6d6dd20f Defer mipmap gen to gpu 2016-05-05 16:34:02 -07:00
Seth Alves
cb523a3a71 disable webSurface differently 2016-05-05 16:01:05 -07:00
Stephen Birarda
a5d09e268d fix sessionID pull and re-sent for HB 2016-05-05 15:56:16 -07:00
Seth Alves
b5a3baf322 Merge branch 'master' of github.com:highfidelity/hifi into linux-qol 2016-05-05 15:55:37 -07:00
Stephen Birarda
839c7fb8c2 provide session ID for metaverse heartbeat once received 2016-05-05 15:45:11 -07:00
Stephen Birarda
0ea46cb415 send fallback socket, don't send HB if send usage disabled 2016-05-05 15:35:37 -07:00
Seth Alves
96174468b3 use reliable and ordered packets for avatar identity 2016-05-05 15:27:30 -07:00
Atlante45
f65b15803a Fix potential iterator invalidation 2016-05-05 15:04:39 -07:00
Atlante45
bc6544a3c5 Fix MyAvatar's velocity change 2016-05-05 14:55:28 -07:00
Atlante45
07adef9465 Fix entities collision sounds 2016-05-05 14:55:28 -07:00
Atlante45
96ee33e80e Fix avatars collision sounds 2016-05-05 14:55:28 -07:00
Seth Alves
cd934bab90 set _actionDataDirty when adding an action. 2016-05-05 14:16:13 -07:00
Zach Pomerantz
79c8001d7a Audit thread safety of ResourceCache 2016-05-05 11:17:38 -07:00
Seth Alves
ec50744aa1 Merge pull request #7817 from AndrewMeadows/ignore-echo-of-stale-data 
fix bug preventing sim ownership release
 2016-05-05 11:14:55 -07:00
Seth Alves
3c41df53e4 Merge branch 'ignore-echo-of-stale-data' of github.com:AndrewMeadows/hifi into grab-fixes 2016-05-05 11:00:55 -07:00
Andrew Meadows
967a67256e fix bug preventing sim ownership release 2016-05-05 10:52:53 -07:00
Seth Alves
0c794cac5d Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-05 10:13:07 -07:00
Seth Alves
929d831212 Merge pull request #7807 from AndrewMeadows/ignore-echo-of-stale-data 
fix object position glitch of owned simulations on networks with long ping-time
 2016-05-05 10:11:02 -07:00
samcake
a78719bc85 Merge pull request #7813 from ZappoMan/fixRecursiveMutex 
fix recursive mutex in Entites.callEntityMethod()
 2016-05-05 10:06:58 -07:00
Seth Alves
f5be64ed96 Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-05 09:52:33 -07:00
Seth Alves
24289b1e66 Merge pull request #7815 from birarda/stuck-assignment 
add warnings for socket error and unexpected state change
 2016-05-05 08:58:51 -07:00
Andrew Meadows
3202a723b8 remove warning about unused variable 2016-05-05 08:54:09 -07:00