Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-20 01:07:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
42919 commits 29 branches 28 tags 1.2 GiB
Commit graph

17402 commits

Author SHA1 Message Date
Clément Brisset
2ef87557fc Merge pull request #7798 from zzmp/clean/override 
Fix warnings on vanilla XCode compilations
 2016-05-02 10:56:07 -07:00
Brad Hefta-Gaub
a447ce4633 Merge pull request #7770 from AndrewMeadows/avoid-crosseyes 
don't cross the eyes
 2016-05-02 10:13:25 -07:00
Brad Hefta-Gaub
e117f280cc Merge pull request #7779 from zzmp/fix/fst-crash 
Avoid crashing on missed pipelines
 2016-05-02 10:12:17 -07:00
Zach Pomerantz
13945aa4d9 Annotate all virtual fns with override 2016-04-30 13:48:59 -07:00
Ryan Huffman
5dadfa9e7e Merge pull request #7792 from Atlante45/fix/crash-asset-request 
Fix dangling reference into container
 2016-04-29 17:58:11 -07:00
Atlante45
6d9080162c Make slots private method 2016-04-29 17:39:53 -07:00
Brad Hefta-Gaub
d2d4ba277d Merge pull request #7791 from birarda/anon-events 
use a setting handle for UAL disabled to fix startup race
 2016-04-28 19:11:09 -07:00
Stephen Birarda
09981db834 use a setting handle for UAL disabled to fix startup race 2016-04-28 18:05:06 -07:00
Atlante45
9a7bebaaa2 Fix dangling reference into container 2016-04-28 18:04:04 -07:00
Brad Hefta-Gaub
19e069f6ef Merge pull request #7790 from birarda/anon-events 
don't require authentication to send usage data
 2016-04-28 18:01:33 -07:00
Stephen Birarda
6883891748 don't require authentication to send user activity 2016-04-28 17:08:40 -07:00
Brad Hefta-Gaub
e92e4e57b1 Merge pull request #7772 from AndrewMeadows/minor-optimizations 
minor cleanup and optimizations around EntityItem::getDimensions()
 2016-04-28 17:04:42 -07:00
Andrew Meadows
b95c81d0ba Merge pull request #7763 from huffman/fix/gpu-ident-debug 
Fix assert crash in GPUIdent
 2016-04-28 08:02:11 -07:00
Zach Pomerantz
2f20e58301 Avoid crashing on missed pipelines 2016-04-27 19:54:52 -07:00
Andrew Meadows
9c0aeb9b81 remove cruft 2016-04-27 16:58:13 -07:00
Andrew Meadows
8a691cf449 Merge pull request #7765 from hyperlogic/tony/cone-sphere-angle 
Improve eye tracking when face to face
 2016-04-27 16:54:07 -07:00
Andrew Meadows
4160e0c1df Merge pull request #7773 from imgntn/defaultScripts 
change path for defaultscripts.js in scriptengine
 2016-04-27 16:35:51 -07:00
James B. Pollack
bced3c2c3c change path for defaultscripts.js in scriptengine 2016-04-27 13:34:42 -07:00
Andrew Meadows
5042561e80 Merge pull request #7730 from imgntn/defaultScripts 
/scripts for launch
 2016-04-27 11:36:20 -07:00
Andrew Meadows
b5ad989811 more optimized uses of EntityItem::getDimensions() 2016-04-27 11:04:22 -07:00
Andrew Meadows
c686418be0 optimize use of EntityItem::getDimensions() 2016-04-27 10:34:29 -07:00
Andrew Meadows
f6aa0a11a8 Merge pull request #7766 from ZappoMan/fixAutoResize 
fix auto resize of models on import
 2016-04-27 10:03:18 -07:00
Andrew Meadows
93f4bc759d Merge pull request #7743 from samcake/color 
group several separate glUniform parameters into a single Uniform Buffer
 2016-04-27 10:02:56 -07:00
Brad Hefta-Gaub
19416fe722 Merge pull request #7761 from samcake/lemon 
Add support for equi-rectangular skymaps (2 by 1)
 2016-04-26 17:15:24 -07:00
James B. Pollack
afb2342781 Merge remote-tracking branch 'upstream/master' into defaultScripts 2016-04-26 16:16:56 -07:00
James B. Pollack
37fa703279 use system path instead of default for loading scripts 2016-04-26 15:50:45 -07:00
Brad Hefta-Gaub
b597f7001b fix auto resize 2016-04-26 15:13:11 -07:00
Anthony J. Thibault
d9063b199e GeometryUtils: coneSphereAngle test 2016-04-26 13:31:06 -07:00
Brad Hefta-Gaub
ee277dcf9d Merge branch 'master' of https://github.com/highfidelity/hifi into qmlWindowFixes 2016-04-26 11:44:51 -07:00
Andrew Meadows
3d1abf8fb1 use the new JS script location 2016-04-26 11:20:08 -07:00
Ryan Huffman
e5f2658fd9 Update GPUIdent to take address of spInstance directly 2016-04-26 09:23:08 -07:00
Brad Hefta-Gaub
4ab7b660d4 fix a bunch of bugs in qml window placement 2016-04-25 20:19:54 -07:00
samcake
91bed86b32 ANd one more warning 2016-04-25 19:04:02 -07:00
samcake
5cb346330b Merging with master 2016-04-25 18:48:58 -07:00
samcake
8f2435daf0 No more warnings ? 2016-04-25 18:39:37 -07:00
samcake
e8691c2f20 Fixing comments, code style and constnats 2016-04-25 18:15:52 -07:00
samcake
0e13b1623b Adding support for Equirectangular skymaps 2016-04-25 15:55:12 -07:00
Seth Alves
16bf59f8a6 fix a crash in RenderableModelEntityItem::getModel 2016-04-25 10:26:32 -07:00
samcake
dd189747f5 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-04-25 09:41:44 -07:00
Brad Hefta-Gaub
8c7ef31636 Merge pull request #7746 from AndrewMeadows/supress-spurious-logs 
reduce warnings about truncated kinematic timesteps
 2016-04-23 09:34:45 -07:00
Brad Hefta-Gaub
04dab65b59 Merge pull request #7727 from ZappoMan/supportLargeClockSkew 
support for larger than 35 minute clock skew
 2016-04-23 08:42:38 -07:00
samcake
f587398ca3 Adding support for plate carree 2016-04-22 18:00:22 -07:00
Andrew Meadows
d984ce4792 properly update _lastSimulated for kinematic objs 2016-04-22 17:19:00 -07:00
Brad Hefta-Gaub
f1f9c6740d Merge pull request #7745 from jherico/mac_texture_fix 
Fixing texture storage allocation on OSX/GL 4.1
 2016-04-22 17:07:12 -07:00
Bradley Austin Davis
d87c92baee Fixing memory detection on OSX 2016-04-22 16:30:36 -07:00
Bradley Austin Davis
472d3dc45f Still working on mac breakage 2016-04-22 16:25:23 -07:00
Bradley Austin Davis
407e0c0dd7 Fixing texture storage allocation on OSX/GL 4.1 2016-04-22 15:48:18 -07:00
Chris Collins
9bd9de5710 Merge pull request #7636 from samcake/red 
Stereo drawcall amplification
 2016-04-22 15:46:18 -07:00
Brad Hefta-Gaub
79a1e6264e Merge pull request #7714 from hyperlogic/tony/default-anims-are-local 
Avatar animations are now stored locally
 2016-04-22 13:44:30 -07:00
Brad Hefta-Gaub
c962cfbda3 Merge pull request #7712 from zzmp/guard/obj-access 
Guard OBJ at operators
 2016-04-22 13:43:59 -07:00