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
44481 commits 29 branches 0 tags 1.1 GiB
Commit graph

44481 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
ff745a345e remove dupe 2016-07-05 09:44:51 -07:00
James B. Pollack
f4d409f1e1 fix typo 2016-07-05 09:22:19 -07:00
James B. Pollack
9b822f97c0 end of day 2016-07-01 17:26:52 -07:00
James B. Pollack
00ce75ef48 more notes 2016-07-01 15:30:21 -07:00
James B. Pollack
9afc4d0c26 cleanup 2016-07-01 15:19:53 -07:00
James B. Pollack
ffbfc89e99 teleportr 2016-07-01 15:19:37 -07:00
James B. Pollack
4762091aaf add easy mode 2016-07-01 11:12:20 -07:00
James B. Pollack
0c60d87d3b fix some touch mappings 2016-07-01 10:32:37 -07:00
James B. Pollack
b2e407a8e1 fix vive bug 2016-07-01 00:48:29 -07:00
James B. Pollack
104ee63a77 notes 2016-06-30 17:05:16 -07:00
James B. Pollack
82e074de0f working teleporter 2016-06-30 16:05:44 -07:00
James B. Pollack
4b4e38a57c end of day 2016-06-29 18:28:39 -07:00
James B. Pollack
fd062d09dc initial notes and research 2016-06-29 15:59:51 -07:00
samcake
f3c5324e5c Merge pull request #7937 from jherico/gpu_breakup3 
Adding GL 4.5 backend and tests
 2016-06-29 10:13:46 -07:00
Brad Davis
f93a91a97f Abandon seperate vertex formats for now 2016-06-28 19:18:16 -07:00
Brad Davis
542601fd9d Fix invalid GL 4.5 calls 2016-06-28 18:56:25 -07:00
Brad Davis
ab7fed1af8 Switch back to disable GL 4.5 by default, add support for logging when enabled 2016-06-28 18:56:25 -07:00
Brad Davis
a41de3a60d Making GL 4.5 enabled by default, adding logging 2016-06-28 18:55:26 -07:00
Brad Davis
8b56444dde Fix crash in GL45 buffer re-allocation 2016-06-28 18:55:25 -07:00
Brad Davis
b16812aa4d Adding GL 4.5 backend 2016-06-28 18:55:24 -07:00
Brad Hefta-Gaub
ec0ca1d173 Merge pull request #8146 from huffman/fix/launch-version 
Add version to launch user activity
 2016-06-28 17:13:10 -07:00
Brad Davis
34faf45a5d Merge pull request #8154 from jherico/stable-merge 
Stable merge back to master
 2016-06-28 16:22:10 -07:00
Brad Davis
b45ed7f959 Merge remote-tracking branch 'upstream/stable' into stable-merge 2016-06-28 15:09:00 -07:00
Brad Davis
f0d04dcfe0 Merge pull request #8153 from jherico/RC-14-merge 
RC-14 merge back to master
 2016-06-28 14:50:14 -07:00
Brad Davis
18017f7024 Merge remote-tracking branch 'upstream/RC-14' into RC-14-merge 2016-06-28 14:48:05 -07:00
Brad Hefta-Gaub
9e8829aa81 Merge pull request #8148 from zzmp/fix/metadata-hours-migration 
Beta Release 14.1 - fix metadata hours migrations for new users/version bumps
 2016-06-28 13:55:51 -07:00
Howard Stearns
da61100b6d Merge pull request #8150 from highfidelity/vive-ui 
merge vive-ui to master
 2016-06-28 13:31:55 -07:00
Anthony Thibault
abf643579a Merge pull request #8144 from howard-stearns/fix-crashing-hmd-menu-modals 
fix crash when hmd context menu triggers a modal
 2016-06-28 13:14:23 -07:00
Zach Pomerantz
c406538301 properly parse domain metadata hours 2016-06-28 12:40:25 -07:00
Zach Pomerantz
56038a97a6 add domain settings getter for descriptors, validates nested vals 2016-06-28 12:39:00 -07:00
Zach Pomerantz
c62967a57b add secs per hour 2016-06-28 12:38:00 -07:00
Brad Hefta-Gaub
3fca0d655c Merge pull request #8145 from ctrlaltdavid/20978 
reduce users window flicker when restart script
 2016-06-28 10:03:46 -07:00
Ryan Huffman
b36a39b2bc Add version to launch user activity 2016-06-28 09:59:59 -07:00
Andrew Meadows
e4329cc8de Merge pull request #8137 from AlexanderOtavka/add-entity 
Fix bugs with Entities.addEntity
 2016-06-28 09:54:09 -07:00
Andrew Meadows
b7b513a75f Merge pull request #8132 from AlexanderOtavka/eslint 
Add eslintrc file
 2016-06-28 09:51:28 -07:00
Andrew Meadows
58e05b2e90 Merge pull request #8143 from AlexanderOtavka/remove-cam-slots 
namechange Camera::_rotation --> Camera::_orientation
 2016-06-28 09:49:54 -07:00
Brad Davis
8561581ab2 Merge pull request #8121 from SamGondelman/miniMirrorFix 
Mini mirror/multi-monitor bug fixes
 2016-06-27 22:04:39 -07:00
David Rowe
79cfd2e9dc Reduce users window flicker when restart script 2016-06-28 11:40:49 +12:00
Brad Hefta-Gaub
1af455b8b9 Merge pull request #8135 from SamGondelman/fixEditLockHMD 
Prevent entering independent camera mode through edit.js in HMD mode
 2016-06-27 15:50:25 -07:00
Brad Hefta-Gaub
7b4fcca064 Merge pull request #8140 from highfidelity/RC-14 
Beta Release 14 - Includes up to Developer Release 5068
 2016-06-27 14:46:40 -07:00
howard-stearns
68be819ea2 fix crash when hmd context menu triggers a modal 2016-06-27 14:07:13 -07:00
Brad Hefta-Gaub
1bde849ed6 Merge pull request #8142 from ZappoMan/usersJSPatchToRC14 
Users js patch to rc14
 2016-06-27 13:15:47 -07:00
David Rowe
e62cbd8f44 Hide users list when logged out 2016-06-27 13:10:21 -07:00
David Rowe
8f2e95cde2 Fix "show me" and "visible to" in users window not being remembered 2016-06-27 13:10:21 -07:00
David Rowe
6a0c29f993 Fix users window minimized state not being remembered 2016-06-27 13:10:21 -07:00
David Rowe
35769b73a5 Fix missing users.js menu item 2016-06-27 13:10:21 -07:00
David Rowe
5aaf1f3392 Undo hide users.js when logged out 2016-06-27 13:09:34 -07:00
Zander Otavka
235ee4bd46 Refactor Camera scripting interface a little 
get/setRotation has been removed, as it was a duplicate of
get/setOrientation, but undocumented and barely used.  get/setTransform
and get/setPerspective have been changed to methods from slots, since
glm::mat4 is not exposed to the scriping interface so they don't work in
scripting.
 2016-06-27 13:06:12 -07:00
Brad Hefta-Gaub
cecd871c66 Merge pull request #8139 from ctrlaltdavid/20978 
fix users.js display and operation
 2016-06-27 12:56:10 -07:00
Howard Stearns
01ca54cac9 Merge pull request #8136 from jherico/tray_position 
Don't reposition windows prior to selecting the initial display plugin
 2016-06-27 12:31:59 -07:00