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

43078 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Pomerantz
70d0ebb91c Consolidate stoppingAllScripts to ScriptEngines::_stopped 2016-05-13 15:24:15 -07:00
Zach Pomerantz
68731973d8 Keep locker when adding script engine 2016-05-09 18:04:38 -07:00
Zach Pomerantz
2d820221dc Clear queued processing on quit 2016-05-09 17:32:25 -07:00
Zach Pomerantz
694dc1bbf6 Delay Overlays cleanup for scripting 2016-05-09 17:32:25 -07:00
Zach Pomerantz
a0d80b9508 Fix hang on new script on shutdown 2016-05-09 17:32:25 -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
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
0fbbbaa985 Add tex loadPerfTest.js 2016-05-06 15:08:45 -07:00
Zach Pomerantz
3f4f10a27e Fix prefetch state changes 2016-05-06 15:08:45 -07:00
Zach Pomerantz
eee487723c Fix headers of scriptableResource tests 2016-05-06 15:08:44 -07:00
Zach Pomerantz
83fad4c52f Fix equalities in scriptableResource tests 2016-05-06 15:08:44 -07:00
Chris Collins
8eb61e9470 Merge pull request #7820 from imgntn/usersJS 
Add users.js to default, start visible to friends only
 2016-05-06 16:07:23 -06: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
fb09efc0c9 send location updates immediately on mode change and startup 2016-05-06 12:01:03 -07:00
Stephen Birarda
258c5308db don't require an active domain connection for location update 2016-05-06 11:57:25 -07:00
Stephen Birarda
ed1ddc2a8b remove code to update/store wallet balance 2016-05-06 11:54:49 -07:00
Stephen Birarda
7dd8515bd8 send a simple heartbeat if location has not changed 2016-05-06 11:50:40 -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
Brad Hefta-Gaub
99d35c37db switch OctreeSendThread to use std::this_thread::sleep_for() instead of usleep() 2016-05-06 10:42:07 -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
Atlante45
df2683d989 Fix compile error 2016-05-05 16:09:45 -07:00
Stephen Birarda
a5d09e268d fix sessionID pull and re-sent for HB 2016-05-05 15:56:16 -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
James B. Pollack
97e1621776 increase width 2016-05-05 15:02:16 -07:00
James B. Pollack
d1755649b1 order 2016-05-05 14:55:41 -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
James B. Pollack
67b1015f4a re add users to default, default to visible friends only 2016-05-05 14:54:04 -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