Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 17:34:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
81764 commits 67 branches 56 tags 1.2 GiB
Commit graph

818 commits

Author SHA1 Message Date
Fluffy Jenkins
6563d32395 Fixed something thats for sure 2019-12-20 00:57:38 +00:00
Fluffy Jenkins
95c7998720 Changed code to correct type 2019-12-19 23:34:29 +00:00
Fluffy Jenkins
7d402f4bae Changed so it will fail to load VR straight away instead of trying so much it causes audio failures 2019-12-19 23:19:05 +00:00
Kasen IO
94df2c304b Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 22:08:45 -05:00
Kasen IO
b24cc3658c Update CMakeLists.txt 
re-added oculus plugins to cmakelists.txt
 2019-12-01 22:08:26 -05:00
Kasen IO
0b46c53df1 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 19:59:59 -05:00
Ryan Huffman
37aee77c32 Fix oculus calibration screen crash if touch not on 2019-10-08 12:31:05 -07:00
Seth Alves
af14245d45 provide a way to get at _sensorResetMat from outside class 2019-09-17 09:43:18 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
David Rowe
5624ba6e14 Fix JSDoc for some Controller.Hardware.Vive property names 2019-09-04 21:05:06 +12:00
Kalila R
28b27a1e48 Merge branch 'v0.83.0-rc' into kasen/core 2019-08-03 15:27:23 -04:00
humbletim
058c81aa1a Merge branch 'hifi-master' into kpi-v1-modkit-rc 2019-07-26 01:36:52 -04:00
humbletim
52d2938be3 DeprecatedScriptPlugin => ExampleScriptPlugin 2019-07-26 01:32:09 -04:00
humbletim
6ae75ecafe segregated scripting/ plugins (re: permissions checkbox) 2019-07-26 01:31:42 -04:00
humbletim
c5b2514e0e fix linux build warning; remove unnecessary code 2019-07-23 12:13:49 -04:00
Anthony Thibault
a31c834009 macos include fix. On macos with a case sensitive harddrive this include fails. 
Change it to the more standard form.
 2019-07-16 10:49:37 -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
kasenvr
e9e9607a3b modkit core changes initial commit 
whitespace corrections + warnings
updated cmake plugin
rework with focus on JS API integration example
cleanup edit_filter scope
separate-out edit_filter wantsScope stuff
-plugin metadata
split scriptengines out separately
cleanup __url/__filename sets
additional cleanup
fix typo; consolidate ScriptInitializerMixin inits
add more example API protoypes
cleanup pass; fix entity_server / agent init
fix whitespace
remove technically unnessary plugin filtering
+EDIT_FILTER_SCRIPT; cleanup
reorder public/slot/private
use std::count_if
formatting
better debug output; cleanup
fix msvc compiler warning
cleanup
eradicate QtScript references from API Example
updated header comments
Updated KasenAPIExample
 2019-07-14 21:35:13 -04:00
Seth Alves
9baf4c7078 comfort mode -- squeeze vision to avoid sickness 2019-07-12 09:14:17 -07:00
Anna
787359fdfb fixed ui flipping issue 2019-07-01 10:52:03 -07:00
Anna
59505ab20f fixed color banding on rift 2019-06-26 09:29:06 -07:00
Anna
8c3ddc049c works on desktop, android mobile, rift and quest 2019-06-21 20:08:09 -07:00
Anna
3d36c5714f added comments and cleaned up 2019-06-21 11:34:10 -07:00
Anna
250d18d7df restructured gamma correction so snapshots look correct 2019-06-21 11:11:44 -07:00
Anna
a1a3eccad9 fixed gamma on rift, removed extraneous code from quest, clarified variable names 2019-06-18 19:23:40 -07:00
Anna
1d3867d777 works on quest but not desktop 2019-06-17 18:34:26 -07:00
Revofire
47af406440 merged 0.80.0-kasen into 0.81.0-kasen, 0.81.0-kasen source ready for build. 
various changes, idk, added a whitelist filter to ent script filter
 2019-05-01 22:13:51 -04:00
David Rowe
407ce745d5 Merge branch 'master' into M22075 
# Conflicts:
#	libraries/controllers/src/controllers/Actions.cpp
 2019-04-27 10:51:13 +12:00
SamGondelman
c730e51d1e wip redo stencil work 2019-04-11 13:22:51 -07:00
David Rowe
59533d0f59 Controller JSDoc update 2019-04-10 08:51:14 +12:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins" 2019-04-05 11:59:46 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-04 13:36:25 -07:00
Brad Davis
44fc0d21db Revert "Remove _compositeFramebuffer from display plugins" 
This reverts commit cb311408c6.
 2019-04-03 13:43:39 -07:00
SamGondelman
8d2495ef7a vive coordinates in clip space 2019-03-29 16:24:04 -07:00
SamGondelman
4ed7c09016 grab correct stencil masks from display plugins 2019-03-26 13:42:18 -07:00
Brad Davis
cb311408c6 Remove _compositeFramebuffer from display plugins 2019-03-12 12:20:20 -07:00
danteruiz
1941e53cc3 track oculus controllers while in oculus home 2019-03-05 15:32:18 -08:00
SamGondelman
13ece79476 merge with master 2019-02-13 16:30:22 -08:00
SamGondelman
f7a487a020 move materialcache et al to material-networking library 2019-02-08 10:28:07 -08:00
Brad Davis
d3301803d3 Support custom display / input plugin lists and small tweaks 2019-02-07 15:15:26 -08:00
Jeff Clinton
536a76a791
Merge pull request #14787 from wayne-chen/oculusLoginFeature 
MS20874: Only initialize plugin if started through Oculus Store
 2019-01-29 10:57:03 -08:00
Wayne Chen
0cbaea4e27 callback return upon request if not running 2019-01-28 14:46:50 -08:00
Wayne Chen
28ab4096d0 optimizing ctor/dtor 2019-01-28 14:44:00 -08:00
Wayne Chen
e4c3011a0b only init platform if oculus store is running 2019-01-28 14:37:18 -08:00
Wayne Chen
0f1aebea82 adding init/shutdown for plugin init 2019-01-28 14:35:41 -08:00
Wayne Chen
c06f2f337e adding code for if oculus is running 2019-01-28 14:20:03 -08:00
Wayne Chen
09770920a8 only initialize plugin if oculus store starting 2019-01-28 11:12:12 -08:00
Shannon Romano
f084021fdf
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type 
Added HMD Avatar Alignment Type
 2019-01-25 17:32:41 -08:00
Wayne Chen
1c6521486e fixing compile errors 2019-01-25 13:56:56 -08:00
Wayne Chen
6f49914167 Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature 2019-01-25 12:19:20 -08:00