Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-06 04:10:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74812 commits 21 branches 0 tags 1.2 GiB
Commit graph

74812 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
46e00cf1b3 Merge branch 'master' of github.com:highfidelity/hifi into MS20187_itemTrash 2018-12-19 15:03:36 -08:00
Wayne Chen
c36b3a4b07 fix 2018-12-19 12:46:41 -08:00
Wayne Chen
50d57e8b60 sending user to previous location on second launch 2018-12-19 12:37:08 -08:00
Ryan Huffman
202326dbac Merge branch 'feat/avatarTools/avatarPackager' of https://github.com/thoys/hifi into feat/avatarTools/avatarPackager 2018-12-19 12:03:30 -08:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3 2018-12-19 11:37:10 -08:00
Adam Smith
828672343a
Merge pull request #14523 from SamGondelman/NOverlays2 
Case 20131: Cleanup some Entity Properties
 2018-12-19 11:33:24 -08:00
Ryan Huffman
c2aca64b11 Add start of opening uploaded avatar in inventory 2018-12-19 11:30:21 -08:00
Thijs Wenker
cb74313de8 create projects / style changes 2018-12-19 19:23:24 +01:00
Zach Fox
7fee0fc1e4 Fix MS20253: Only emit screenChanged once screen has changed 2018-12-19 09:50:52 -08:00
Zach Fox
116edcc224
I have no idea how this happened 2018-12-19 09:36:05 -08:00
sam gateau
9c436bc28c Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-19 09:31:41 -08:00
Jeff Clinton
a7e7a2426e
Merge pull request #14538 from ElderOrb/FB19355 
FB19355 - When I have avatar entities as children of my avatar, the A…
 2018-12-19 09:09:54 -08:00
Jeff Clinton
c80b3dea52
Merge pull request #14611 from wayne-chen/fixScriptsNotBeingSaved-78 
MS20356: Running Scripts list doesn't persist between Interface restarts
 2018-12-19 08:52:40 -08:00
Jeff Clinton
16c7619aa7
Merge pull request #14608 from SamGondelman/zone 
Case 19080: Fix zone with invalid script not loading
 2018-12-19 08:49:33 -08:00
Jeff Clinton
16e3914cd7
Merge pull request #14598 from amantley/ripOutCruft 
Fix for Camera-perspective-is-off-in-first-person-view, master branch
 2018-12-18 17:15:58 -08:00
Zach Fox
f407042f3e
Quick polish fix to prevent UI flashing 2018-12-18 17:11:10 -08:00
Jeff Clinton
f51bdead20
Merge pull request #14606 from wayne-chen/fixFileLoginMenuButton 
MS#20355: HMD persisting extra login windows
 2018-12-18 17:04:46 -08:00
Wayne Chen
017eb9d1a3 adding fix for scripts not being saved 2018-12-18 16:32:44 -08:00
sam gateau
b8d96d98b8 fixing warnings from the build 2018-12-18 16:25:24 -08:00
sam gateau
5b50b0332d more fixes 2018-12-18 15:30:45 -08:00
Antonina Savinova
1977180ecf
Merge pull request #14604 from zfox23/MS20089_interruptRecording 
Implement MS20089: ACs playing avatar recordings now correctly handle playAvatarSound
 2018-12-18 15:14:53 -08:00
sam gateau
265b1591d6 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-18 14:43:12 -08:00
sam gateau
2f18555ee0 removing comments and dead code, rewiring the debug 2018-12-18 14:42:45 -08:00
Zach Fox
f31d685323
Fix spacing 2018-12-18 14:33:41 -08:00
Antonina Savinova
cceacd3d1d
Merge pull request #14593 from SimonWalton-HiFi/remove-backups-on-startup 
Remove out-of-date backups on startup
 2018-12-18 14:16:01 -08:00
Ryan Huffman
720cd90dc7 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-18 13:17:28 -08:00
Ryan Huffman
ad471387f7 Integrate marketplace upload API 2018-12-18 13:08:55 -08:00
SamGondelman
7231116e43 fix zone with invalid script not loading 2018-12-18 13:04:56 -08:00
Wayne Chen
b82ba8c085 do nothing with file>login in login state 2018-12-18 12:51:01 -08:00
Jeff Clinton
889f110357
Merge pull request #13925 from sethalves/fix-polyvox-texture-and-single-setter 
fix a bug that broke Entities.setVoxel().  Fix polyvox textures
 2018-12-18 12:15:07 -08:00
Jeff Clinton
2ff4905ed3
Merge pull request #14599 from wayne-chen/keepMeLoggedInDefault-78 
MS20352: Keep me logged in checkbox as on by default
 2018-12-18 11:57:17 -08:00
Wayne Chen
b5c3d7c3ed
Merge pull request #14596 from wayne-chen/loginForSmallAvatars-master 
MS20332: HMD Login Prompt-- small avatars cannot reach easily
 2018-12-18 10:49:26 -08:00
Zach Fox
fce4c252e7 Merge branch 'master' of github.com:highfidelity/hifi into MS20089_interruptRecording 2018-12-18 10:31:32 -08:00
Zach Fox
2964a05bd3 Keep playing the recording visually 2018-12-18 10:30:20 -08:00
sam gateau
d8e7305f4a Removing hili for now 2018-12-18 09:16:40 -08:00
Sam Gateau
76f204b5aa Exploring the hologram 2018-12-18 00:45:12 -08:00
Sam Gateau
d0d771ce1e Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-17 18:48:07 -08:00
sam gateau
237fb4dc4c Shadows are completely working with settings on both pipeline 2018-12-17 17:34:47 -08:00
Wayne Chen
50902080ce fixing typos 2018-12-17 16:48:02 -08:00
Wayne Chen
816733b55f reverting to master 2018-12-17 16:47:11 -08:00
amantley
42a17980cb fixed mac build conflict, unused variable 2018-12-17 16:21:22 -08:00
Zach Fox
240917e8ae Fix MS20089: Enable interrupting of avatar recordings with sounds 2018-12-17 15:46:08 -08:00
Wayne Chen
302e314787 keep me logged in by default 2018-12-17 15:21:41 -08:00
Adam Smith
14ab53571f
Merge pull request #14564 from sabrina-shanman/hfm_prep 
(case 20274) Create the HFM Preparation Step
 2018-12-17 15:17:19 -08:00
amantley
3e1beb2dca removed white space and stray semi colon 2018-12-17 15:05:51 -08:00
amantley
a81576f311 Merge remote-tracking branch 'upstream/master' into ripOutCruft 
sync
 2018-12-17 14:20:00 -08:00
Wayne Chen
09ff67eab3 Merge branch 'master' of https://github.com/highfidelity/hifi into loginForSmallAvatars-master 2018-12-17 14:03:16 -08:00
Wayne Chen
5d89ed2a81 matching master 2018-12-17 13:46:55 -08:00
Wayne Chen
28fd1380df adding target scale and default avatar to login state 2018-12-17 13:37:28 -08:00
Howard Stearns
719919d3fd
Merge pull request #14587 from SimonWalton-HiFi/dissectors-unobfuscate 
Deobfuscate packets in dissector
 2018-12-17 12:08:56 -08:00