Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 21:59:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
79890 commits 75 branches 59 tags 1.2 GiB
Commit graph

33022 commits

Author SHA1 Message Date
Anna
db49a0b9d6 fixed some typos from merge 2019-07-29 11:55:12 -07:00
Anna
0cc8c1f434 making my changes work on android 2019-07-29 10:43:20 -07:00
Anna
8aef9db4b9 works on android! 2019-07-26 20:09:18 -07:00
Anna
6a6b2f6d27 added tone mapping back 2019-07-26 18:55:08 -07:00
Anna
0d2b2a2aef added tone mapping config 2019-07-26 12:53:18 -07:00
Anna
16595d9412 created tonemapandresample 2019-07-26 11:56:25 -07:00
Ryan Huffman
de233e456e
Merge pull request #15976 from huffman/feat/serverless-tutorial 
DEV-266: Add serverless tutorial
 2019-07-25 13:39:03 -07:00
Howard Stearns
520ba59899
Merge pull request #15980 from SimonWalton-HiFi/audio-injector-shutdown 
BUGZ-985: Guard against AudioInjectorManager takedown in scripted audio injector destructor
 2019-07-25 12:50:07 -07:00
Ryan Huffman
2ec87f4e61 Add serverless tutorial 2019-07-24 16:38:03 -07:00
Simon Walton
53cf915e8d Guard for AudioInjectorManager existance; clear an audio interface pointer 2019-07-24 14:51:41 -07:00
Anna
1b0d8ee603 removed typo 2019-07-24 13:37:33 -07:00
Anna
27586727db make tonemapandresampletask run on android 2019-07-24 11:38:47 -07:00
Shannon Romano
a8842bf521
Merge pull request #15968 from annabrewer/android-crash-fix 
BUGZ-996: Android app crashes on startup
 2019-07-24 09:33:50 -07:00
Shannon Romano
1883e1d482
Merge pull request #15969 from Atlante45/fix/ess-crash 
BUGZ-1015: Don't store unused cpuident data arrays
 2019-07-24 09:05:47 -07:00
Shannon Romano
2942bfaad0
Merge pull request #15939 from SamGondelman/shader 
Condense directional light shaders using slp defines
 2019-07-24 09:01:49 -07:00
Anna
ca24693f39 applying android crash fix for testing purposes 2019-07-23 16:03:20 -07:00
Anna
2051a9953c change bounds checking to check if index is strictly less than 0 2019-07-23 16:00:11 -07:00
Anna
1df43fc83a Merge branch 'master' of github.com:highfidelity/hifi into combine-tone-map-resample 2019-07-23 15:41:01 -07:00
Shannon Romano
849a25f576
Merge pull request #15966 from jherico/fix/bugz-987 
BUGZ-987: fix depth testing of HUD layer 3D objects
 2019-07-23 15:00:54 -07:00
Anna
a6c569dd78 fixed index out of bounds checking when getting cpu, gpu or display in PlatformInstance.cpp 2019-07-23 14:45:12 -07:00
Clement
7f9ad4ac25 Don't store unused cpuident data arrays 2019-07-23 14:23:12 -07:00
Shannon Romano
266230a53c
Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api 
Initial version of Avatar Reaction API
 2019-07-23 13:13:31 -07:00
Brad Davis
449f3d00f9 BUGZ-987: fix depth testing of HUD layer 3D objects 2019-07-23 12:09:12 -07:00
Shannon Romano
4f922e350e
Merge pull request #15913 from ctrlaltdavid/DOC-102 
DOC-102: Overlays JSDoc Update
 2019-07-22 16:24:53 -07:00
Shannon Romano
1594e25c4e
Merge pull request #15950 from ctrlaltdavid/DOC-121 
DOC-121: AvatarBookmarks JSDoc
 2019-07-22 15:43:57 -07:00
Shannon Romano
8e708b29de
Merge pull request #15934 from ctrlaltdavid/DOC-62 
DOC-62: Reticle JSDoc
 2019-07-22 15:32:48 -07:00
David Rowe
0a32386f45 Merge branch 'master' into DOC-102 2019-07-20 09:13:52 +12:00
David Rowe
cf9e563458 Miscellaneous JSDoc fixes noticed in passing 2019-07-19 08:37:10 +12:00
Shannon Romano
ae729dcc87
Merge pull request #15940 from jherico/fix/bugz-753 
BUGZ-753: bad skyboxes on Intel GPUs
 2019-07-17 14:38:04 -07:00
Anthony Thibault
ecae92724e Added reaction api 2019-07-17 14:28:39 -07:00
Roxanne Skelly
4f9d62696c DEV-262 - Improve logging on failure to load resource 2019-07-17 12:58:17 -07:00
Anna
45d1672edd remove testing variables 2019-07-16 15:44:29 -07:00
Anna
58a04c1ccf fix jenkins errors for real this time 2019-07-16 15:44:29 -07:00
Anna
2cd2e35736 fixing jenkins build errors 2019-07-16 15:44:29 -07:00
Anna
8d9760ae0c typo fix 2019-07-16 15:44:29 -07:00
Anna
e129f88723 deleted tone mapping mirrored slf and slp since they auto generate 2019-07-16 15:44:29 -07:00
Anna
b59d967b6c fixed luci, made tone mapping mirrored auto generate, changed color format on forward, bug fixes 2019-07-16 15:44:28 -07:00
Anna
0b51e3c129 progress 2019-07-16 15:43:47 -07:00
Anna
24f022ec3b init commit for this pr, still buggy 2019-07-16 15:41:01 -07:00
Shannon Romano
53a67dcfa9
Merge pull request #15872 from SamGondelman/bias 
DEV-202: Expose shadow bias and max distance to Zone Entity
 2019-07-16 15:22:37 -07:00
Brad Davis
11f47ddeed BUGZ-753: bad skyboxes on intel GPUs 2019-07-16 13:42:39 -07:00
SamGondelman
965feb6f7a condense direction light shaders using slp defines 2019-07-16 11:24:19 -07:00
Anthony Thibault
6425c68836 fix for self assignment warning 2019-07-16 10:48:51 -07:00
Seth Alves
22a913bee2 fix bug that caused comfort-mode to be active at all times in HMD 2019-07-15 21:10:42 -07:00
David Rowe
8be59633f4 Reticle JSDoc 2019-07-16 12:49:54 +12:00
Shannon Romano
020c7a5f44
Merge pull request #15931 from Atlante45/fix/dev-builds 
Fix debug builds not compiling
 2019-07-15 16:28:40 -07:00
Clement
50d9a53883 Fix variable name in assert 2019-07-15 15:03:25 -07:00
Shannon Romano
3f7e5a48bb
Merge pull request #15533 from sethalves/squeeze-vision-while-moving 
Case 21663: comfort mode
 2019-07-15 14:54:31 -07:00
Shannon Romano
d37456ea31
Merge pull request #15927 from SamGondelman/error 
Possible fix for shader compilation error
 2019-07-15 09:00:54 -07:00
Shannon Romano
1bc72a86da
Merge pull request #15911 from amerhifi/bugz-968 
case Bugz-968 adding a null check to the display plugin. Possible that display plug…
 2019-07-15 08:35:29 -07:00