Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 15:11:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43331 commits 75 branches 59 tags 1.2 GiB
Commit graph

43331 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
9fe827a93b d'oh 2016-05-09 15:28: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
Zach Pomerantz
7db082b915 Amend comment that was not a busy wait 2016-05-09 15:05:13 -07:00
Seth Alves
7ab52b8869 don't check fbx files into sourc 2016-05-09 14:58:26 -07:00
Seth Alves
ced7a56e39 Philip's gravity example 2016-05-09 14:43:24 -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
howard-stearns
9edd18c017 Fix mouse seek bugs. 2016-05-09 14:05:59 -07:00
Anthony J. Thibault
9821c276ad warning fix in release 2016-05-09 13:56:56 -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
samcake
37f16e9c86 Merging with master 2016-05-09 12:01:58 -07:00
Anthony J. Thibault
7f5296f566 Increased tolerance for near zero length vectors 
Also, replaced some magic numbers with constants.
 2016-05-09 11:53:09 -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
howard-stearns
11ae685f04 Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer 2016-05-09 11:50:07 -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
howard-stearns
6f4204ca5b Remove alert for route remapping on hardware change. 2016-05-09 11:41:00 -07:00
howard-stearns
af8d0dc280 Fix setReticlePosition and getReticlePosition to match. 2016-05-09 11:34:52 -07:00
samcake
0bfad4a549 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-09 11:33:47 -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
howard-stearns
3f3233da66 Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer 2016-05-09 09:26:28 -07:00
Brad Davis
335841bf0f Fix plugin loading on OSX 2016-05-08 23:35:18 -07:00
Anthony Thibault
87d513b5f8 fixed unused variable warnings 2016-05-08 18:14:18 -07:00
Anthony Thibault
cb5c7a3559 compile fix for macosx 2016-05-08 17:14:14 -07:00
Anthony J. Thibault
641e152699 Eye tracking bug fix and debug rendering improvement 
* Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head.
* DebugDraw: added drawRay method.
* Application: Renamed preRender to postUpdate
* AvatarManager: added postUpdate method that iterates over all avatars.
* MyAvatar: Renamed preRender to preDisplaySide
* MyAvatar: split preRender code into postUpdate and preDisplaySide.
* Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw.
* Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking.
* "Show Look at Vectors" now draws the right eye red and the left eye blue.
* Removed Avatar and MyAvatar renderBody
* Removed look at rendering from head.
* GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal
 2016-05-08 16:20:32 -07:00
Brad Davis
c54d0bc993 Don't expose raw pointer to the display plugin 2016-05-08 10:35:31 -07:00
Seth Alves
b0a5d8b719 make Script.include(/~/system/libraries/utils.js) work from web again 2016-05-08 08:45:58 -07:00
Bradley Austin Davis
0f768b13b9 Working on OSX Rift functionality 2016-05-07 20:17:31 -07:00
Seth Alves
f8f86a0d45 only _exit if not DEBUG 2016-05-07 11:05:38 -07:00
Seth Alves
4b1274cb0f Merge branch 'master' of github.com:highfidelity/hifi into linux-qol 2016-05-07 11:04:50 -07:00
Seth Alves
a0771f8ee5 use smart pointers for entity simulations 2016-05-07 09:14:33 -07:00
Zach Pomerantz
173d2a590c Use sleep_until for ScriptEngine 2016-05-06 19:30:37 -07:00
samcake
1fec984ead fixing the linear COlor FOrmat flag 2016-05-06 19:07:07 -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
samcake
a8347cac6e Getting the unlit to work from the pipeline, and found the isLinear for texture bug! 2016-05-06 18:36:55 -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