Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
84447 commits 29 branches 0 tags 1.1 GiB
Commit graph

84447 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kalila
080d42be39
Update AnimInverseKinematics.cpp 2021-02-25 20:35:02 -05:00
Kalila
45fc0baf19
Merge pull request #1014 from vircadia/digisomni-patch-1 
Add "RELEASE_NAME" to BUILD.md
 2021-02-25 17:31:34 -05:00
Kalila
3d39c96092
Merge pull request #1055 from digisomni/feature/pkg-scripts-env 
Update pkg-scripts.
 2021-02-25 17:10:07 -05:00
Kalila
59743865dc
Merge pull request #1057 from digisomni/fix/installer-release-names 
Add release name to end of installers.
 2021-02-25 17:09:00 -05:00
Kalila
d8946f7f35
Merge pull request #1063 from HifiExperiments/tooltipFix 
Fix tooltips
 2021-02-25 17:08:36 -05:00
HifiExperiments
91dd004043 fix tooltips 2021-02-23 20:57:40 -08:00
Kalila
13e51dfd91
Update make-rpm-server 2021-02-23 23:08:14 -05:00
Kalila L
357aa9a08b Update GenerateInstallers.cmake 
Add release name to end of installers.
 2021-02-22 23:28:27 -05:00
Kalila
0b1db1ab50
Update make-rpm-server 
Fix typo.
 2021-02-22 03:30:33 -05:00
Kalila
ba54dd755c
Merge pull request #1034 from vircadia/v2021.1.0-rc 
merge V2021.1.0 rc into master
 2021-02-22 00:16:36 -05:00
Kalila L
3d26391069 Update pkg-scripts. 2021-02-21 19:41:44 -05:00
Kalila
e64c9ad0ce
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-02-21 16:47:55 -05:00
Kalila
6648a74c2e
Merge pull request #800 from ArcadeFever/fix/build-android-docs 
Updated build instructions for Oculus Quest
 2021-02-20 18:12:52 -05:00
Kalila
c57d3ab8d0
Update BUILD_ANDROID.md 2021-02-20 18:11:59 -05:00
daleglass
4c90dfbb02
Merge pull request #1040 from HifiExperiments/threadingCrashes 
Name a bunch of threads
 2021-02-20 20:18:56 +01:00
Julian Groß
937e0a55db Merge remote-tracking branch 'refs/remotes/HifiExperiments/fixBillboard' 2021-02-20 12:12:59 +01:00
HifiExperiments
eefe809950 CR 2021-02-19 19:31:06 -08:00
HifiExperiments
852edec9e7 entities with billboardMode != none use local rotation so parent rotation doesn't affect them 2021-02-18 22:15:12 -08:00
Kalila
6732628d20
Merge pull request #1030 from AleziaKurdis/CreateApp_FEB2021_Bundle 
Create App FEB2021 bundle
 2021-02-17 16:09:57 -05:00
Alezia Kurdis
b2b38ad23b
Minor adjustments 
Minor adjustments
 2021-02-16 21:49:26 -05:00
HifiExperiments
30c4779eeb name all the threads 2021-02-13 20:17:28 -08:00
Kalila
26894b4325
Merge pull request #1020 from HifiExperiments/alignment 
Text Entity alignment property
 2021-02-13 01:28:41 -05:00
HifiExperiments
515ee40824 third times the charm 2021-02-12 10:38:40 -08:00
Kalila
d628b4f976
Merge pull request #1029 from HifiExperiments/offsetFix 
Fix for offset soft attachments
 2021-02-12 02:44:58 -05:00
HifiExperiments
56fa4698da potential fix for offset soft attachments 2021-02-11 20:07:46 -08:00
HifiExperiments
f46f1b2219 Merge branch 'master' into alignment 2021-02-11 18:07:23 -08:00
HifiExperiments
b296fff197 add text alignment property 2021-02-10 21:45:53 -08:00
Alezia Kurdis
6ffb848596
Added a new column URL 
Added a new column URL (full path & filename)
Searchable only if visible
Requested from Issue #977
 2021-02-10 23:30:18 -05:00
Alezia Kurdis
55753abf51
CSS for menu reorganization 
CSS for menu reorganization
 2021-02-10 22:29:08 -05:00
Alezia Kurdis
3cbd0be069
CSS for menu reorganization 
CSS for menu reorganization
 2021-02-10 22:28:07 -05:00
Kalila
c869554d46
Merge pull request #1017 from vircadia/fix/pr-988-profiles 
Fix profile errors in QML. (also add FIXME's)
 2021-02-10 21:23:21 -05:00
Kalila L
dfa9b55223 Add back removed lines and add FIXME's. 2021-02-10 16:19:53 -05:00
Kalila L
65bef5d3d4 Fix profile errors in QML. (also add FIXME's) 2021-02-10 06:52:29 -05:00
Kalila
b995d6d4d7
Add "RELEASE_NAME" to BUILD.md 2021-02-10 02:58:48 -05:00
Kalila
fd6973bd0b
Merge pull request #961 from HifiExperiments/billboard 
Implement billboardMode for all Entity types
 2021-02-10 02:41:40 -05:00
HifiExperiments
0645866549
Merge branch 'master' into billboard 2021-02-09 23:28:58 -08:00
Kalila
312dc9fe22
Merge pull request #988 from digisomni/feature/web-entity-user-agent 
Feature/web entity user agent
 2021-02-10 02:12:29 -05:00
HifiExperiments
ae26416c59
Merge branch 'master' into billboard 2021-02-09 22:57:10 -08:00
HifiExperiments
f1d6a4e3d4
Merge branch 'master' into feature/web-entity-user-agent 2021-02-09 22:47:46 -08:00
Kalila
b826743212
Merge pull request #951 from HifiExperiments/pivot 
Model Entities: useOriginalPivot Property
 2021-02-10 00:42:51 -05:00
Kalila
d249d0df83
Update README.md 2021-02-09 16:43:22 -05:00
Kalila
84da0771e0
Merge pull request #1009 from digisomni/fix/auto-networking-wizard 
Various Domain Server Wizard Fixes
 2021-02-09 16:40:45 -05:00
Kalila L
c80283ae8f Also fix two other issues. 2021-02-09 02:02:06 -05:00
Kalila L
c3c9b638e1 When creating a domain ID, set networking to full (wizard) 2021-02-09 01:50:38 -05:00
Alezia Kurdis
174ddb5957
Menu Bar reorganization 
Menu Bar reorganization
-Add a new "Transform" menu
-Reorder the 4 menus: Edit - Select - Transform - Tools
-Redistribute the menu items
 2021-02-07 22:34:05 -05:00
Alezia Kurdis
8aa6bf727a
Menu Bar reorganization 
Menu Bar reorganization
-Add a new "Transform" menu
-Reorder the 4 menus: Edit - Select - Transform - Tools
-Redistribute the menu items
 2021-02-07 22:33:14 -05:00
Alezia Kurdis
c6fd9dcb6c
Merge pull request #4 from vircadia/master 
Upgrade from Vircadia Master
 2021-02-07 22:03:29 -05:00
HifiExperiments
766b91f1a3 add note about only supporting 0,0,0 pivot 2021-02-05 20:46:14 -08:00
Kalila
69e5d1261b
Merge pull request #996 from digisomni/fix/vircadia-branding-alpha 
Update About Dialog and remove Vircadia "Alpha" references
 2021-02-04 17:18:39 -05:00
Kalila
62b70fda4e
Merge pull request #932 from AleziaKurdis/CreateApp_DEC2020_RotateAsNextClickedSurface 
Create Application: Snap To Next Clicked Surface
 2021-02-04 17:15:32 -05:00