Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
75710 commits 2 branches 0 tags 1.1 GiB
Commit graph

75710 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
19be752361 Merge remote-tracking branch 'origin/feature/quest_frame_player' into feature/quest 2019-02-06 10:29:07 -08:00
Brad Davis
91e18f569b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-06 10:15:36 -08:00
Bradley Austin Davis
a622f43099
Merge pull request #14861 from danteruiz/unused 
remove initialized variable
 2019-02-06 10:01:34 -08:00
Dante Ruiz
6c9d15d9a9 remove used variable 2019-02-06 09:58:02 -08:00
Bradley Austin Davis
41a07af790
Merge pull request #14859 from danteruiz/fix-quest-controllers 
Make sure that the quest controllers are connected after initialization
 2019-02-06 09:31:46 -08:00
Dante Ruiz
aa645af744 fix quest controllers 2019-02-06 09:19:36 -08:00
John Conklin II
3ee412faf7
Merge pull request #14854 from danteruiz/quest-default 
Case 21037: Allow the script engine to use FileSeclector when loading scriopts
 2019-02-06 07:21:03 -08:00
John Conklin II
ae6672533c
Merge pull request #14788 from jherico/feature/quest_gpu_timers 
Case 20876: Quest: Support gpu timing on systems with disjoint timer extension
 2019-02-05 14:49:40 -08:00
John Conklin II
ec0bdba7fb
Merge pull request #14814 from sethalves/fix-edit-in-releaseGrab 
case 20919: Fix edit in release grab
 2019-02-05 14:48:59 -08:00
Sam Gateau
6b1baed30f
Merge pull request #14844 from highfidelity/feature/questLifeCycle 
case 21032: Feature/quest life cycle
 2019-02-05 14:36:13 -08:00
danteruiz
30bd9774b2 script engine to load platform specific files 2019-02-05 13:11:54 -08:00
Jeff Clinton
35608c35de
Merge pull request #14808 from danteruiz/webengine-fileselector 
Case 20879: Migrate  webEngine referencing  QML into +webengine folder
 2019-02-05 12:57:38 -08:00
amerhifi
1daf2bbed4
renamed to match others 2019-02-05 11:15:57 -08:00
amerhifi
944f4c96ae
New build file for Quest 
new build file specific to the quest device
 2019-02-05 11:14:52 -08:00
Brad Hefta-Gaub
936837c886
Merge pull request #14823 from Atlante45/fix/scripts-load-fail-master 
[master] Fix reload mechanic for entity server scripts
 2019-02-05 09:19:56 -08:00
Jamil Akram
35c0af0bf3
Merge pull request #14818 from wayne-chen/oculusLoginFeature 
MS20925: Oculus login button not appearing
 2019-02-04 17:20:07 -08:00
John Conklin II
46fc19e101
Merge pull request #14840 from danteruiz/tablet-root-color 
Case 20973: Fix SendAsset.qml has wrong color
 2019-02-04 14:27:19 -08:00
Jamil Akram
bab411e001
Merge pull request #14822 from hyperlogic/bug-fix/anim-tests-work-again 
Make Animation Unit Tests Pass Again
 2019-02-04 12:45:12 -08:00
amer cerkic
7a4401276c moving qt shutdown and resetting qtactivity to onstop 2019-02-01 11:38:34 -08:00
Dante Ruiz
f4118213b1 give tablet root color 2019-02-01 10:12:04 -08:00
Jeff Clinton
1239ca086d
Merge pull request #14831 from danteruiz/the-spot 
Case 20942: Goto the spot on first launch (80.0/master)
 2019-01-31 14:15:24 -08:00
Dante Ruiz
778ddad9ac to the spot on first launch 2019-01-31 10:52:48 -08:00
Clement
283dabc622 Fix reload mechanic for entity server scripts 2019-01-30 17:29:28 -08:00
Anthony Thibault
2c40b120ca Make Animation Tests Pass Again 2019-01-30 17:26:52 -08:00
Howard Stearns
75c1bdbf0d
Merge pull request #14812 from SimonWalton-HiFi/avatar-data-packet-overrun 
80.0/master: Fix small miscalculation in space requirements for serialized avatar-data
 2019-01-30 17:00:12 -08:00
Brad Davis
9714271a2a Migrate shutdown hack applied to QtActivity to InterfaceActivity 2019-01-30 16:23:22 -08:00
Bradley Austin Davis
2db5bbd381 Fix mac frame player 2019-01-30 16:23:22 -08:00
Brad Davis
3866c7568c Update dockerfile 2019-01-30 16:23:22 -08:00
Brad Davis
eb0566b94e Fix signing configs 2019-01-30 16:23:22 -08:00
Brad Davis
67cf08e8ae Quest frame player 2019-01-30 16:23:22 -08:00
Brad Davis
b1eb0b0a46 GPU tweaks 2019-01-30 16:23:21 -08:00
Brad Davis
5d1277e1bb GL helpers cleanup 2019-01-30 16:23:21 -08:00
Brad Davis
fed9e27a66 Expose current android app name to source code 2019-01-30 16:23:21 -08:00
Brad Davis
c3c22aa84c EGL and Oculus depedency macros 2019-01-30 16:23:21 -08:00
Brad Davis
8a1a55189a CMake cleanup and modernization 2019-01-30 16:23:14 -08:00
Brad Davis
c46d73128b Merge branch 'feature/quest_frame_player' into feature/quest 2019-01-30 16:16:51 -08:00
Wayne Chen
03789e01da adding fix for oculus store argument check 2019-01-30 15:53:21 -08:00
Brad Davis
04b164fd24 Migrate shutdown hack applied to QtActivity to InterfaceActivity 2019-01-30 15:33:47 -08:00
Seth Alves
30d9fe705e avoid possible crash 2019-01-30 14:56:50 -08:00
Seth Alves
c6f44234f8 avoid possible crash 2019-01-30 14:56:02 -08:00
Seth Alves
f33e5ba5ae cleanup 2019-01-30 14:47:38 -08:00
Bradley Austin Davis
f45166f508 Fix mac frame player 2019-01-30 14:45:31 -08:00
Bradley Austin Davis
c2dca9d0e8 Fix entities cmakelists.txt 2019-01-30 14:45:06 -08:00
Seth Alves
3ab2db96b6 deactivate grab action when grab is released 2019-01-30 14:43:11 -08:00
Seth Alves
0846eb8ec6 attempt to allow position edits in releaseGrab entity-method 2019-01-30 14:43:11 -08:00
John Conklin II
10bb637753
Merge pull request #14810 from SamGondelman/skybox 
Case 20833: Fix procedural skybox depth testing
 2019-01-30 14:16:36 -08:00
Dante Ruiz
93a91cdba2 webengine fileselector 2019-01-30 13:57:49 -08:00
Simon Walton
08b21109c1 Include the new scale float in min remaining size calculation 2019-01-30 13:55:12 -08:00
Brad Davis
c34106e771 Update dockerfile 2019-01-30 13:27:52 -08:00
Brad Davis
07d6e0a116 Fix signing configs 2019-01-30 13:21:38 -08:00