Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-06 02:09:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65151 commits 25 branches 28 tags 1.2 GiB
Commit graph

65151 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
fc9af39745
Merge pull request #12451 from SimonWalton-HiFi/moc-fixes 
Add #include of Forward.h to AudioMixer.h
 2018-02-22 16:09:24 -07:00
Stephen Birarda
7fcac581ae fix regex for archive name, add general error message 2018-02-22 15:08:43 -08:00
Atlante45
7bad82818b Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-02-22 14:45:41 -08:00
Zach Fox
de0eee52d6 cool 2018-02-22 14:45:32 -08:00
Ryan Huffman
13b15ced89
Merge pull request #12470 from birarda/bug/content-settings-fixes 
disable click on restore during a restore or for corrupted
 2018-02-22 14:41:41 -08:00
Ryan Huffman
12e881a5e3
Merge pull request #12471 from birarda/feat/validate-manual-backup-names 
refuse to post manual content archive with invalid name
 2018-02-22 14:29:43 -08:00
Brad Davis
49dea19b26 Fix BGR/RGB bug on GLES 2018-02-22 14:11:05 -08:00
ZappoMan
e9cad947d7 add the deadlock watchdog stats to the stats metaverse checkin data 2018-02-22 14:01:56 -08:00
NissimHadar
bb04f3f533 CR corrections. 2018-02-22 13:57:46 -08:00
Zach Fox
4d2d7fa51f lots of fun initial progress! 2018-02-22 13:56:46 -08:00
NissimHadar
c6580f642a Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-22 13:45:00 -08:00
Alexander Ivash
c15cf33ca1 12518 - Help icon in toolbar does not highlight when help window is open 2018-02-23 00:36:00 +03:00
John Conklin II
43afd257b6
Merge pull request #12361 from highfidelity/RC64 
Beta Release 64 - includes up to Developer Release 7818
 2018-02-22 13:22:47 -08:00
Stephen Birarda
7c5ed86e3e refuse to post manual content archive with invalid name 2018-02-22 11:41:48 -08:00
Stephen Birarda
3c39c92879
Merge pull request #12468 from huffman/fix/reject-invalid-manual-backup-names 
Fix/reject invalid manual backup names
 2018-02-22 12:17:42 -07:00
Simon Walton
a0a12258bf Merge branch 'master' into moc-fixes 2018-02-22 11:06:53 -08:00
Stephen Birarda
99c419c315 disable click on restore during restore or for corrupted 2018-02-22 11:03:31 -08:00
John Conklin II
e1ed0977e8
Merge pull request #12469 from jherico/RC64_stable 
Merge from stable back into RC64
 2018-02-22 10:58:38 -08:00
Zach Fox
3d4e6de6ab Quick bugfix 2018-02-22 10:49:11 -08:00
ZappoMan
af4f51ecfb Merge branch 'master' of https://github.com/highfidelity/hifi into relaxDeadlockWatchdog 2018-02-22 10:23:36 -08:00
Brad Davis
2f34fb2e42 Merge remote-tracking branch 'upstream/stable' into HEAD 2018-02-22 10:20:10 -08:00
Nissim Hadar
a843a53427 Improved JSDoc comments. 2018-02-22 10:17:20 -08:00
Liv
478ec48b63
Merge pull request #12463 from misslivirose/fix/edit-bugs 
Fix two bugs with Create Menu
 2018-02-22 09:43:50 -08:00
Ryan Huffman
6dffffbbc0 Update clang-format ctor initializer list format 2018-02-22 09:30:47 -08:00
Ryan Huffman
017d10de3d Fix DomainContentBackupManager.* headers 2018-02-22 09:29:59 -08:00
Ryan Huffman
bf4fd867a3 Add rejection for invalid manual backup names 2018-02-22 09:29:18 -08:00
Zach Fox
90f05f4db7 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-22 09:23:49 -08:00
Seth Alves
c534e3a6e4
Merge pull request #12356 from ctrlaltdavid/21742 
Handle tablet entities and overlays not being available
 2018-02-22 08:48:13 -08:00
Anthony J. Thibault
86351f19a9 Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions 2018-02-22 08:44:21 -08:00
ZappoMan
aa5542c54b Merge branch 'master' of https://github.com/highfidelity/hifi into relaxDeadlockWatchdog 2018-02-22 08:43:13 -08:00
humbletim
dd90c8c515 fix ubuntu compile warnings 2018-02-22 10:16:34 -05:00
humbletim
010c714abc restore original Entities.getMeshes 2018-02-22 08:51:54 -05:00
humbletim
4d43e54346 use shared buffer_helpers::clone 2018-02-22 08:41:15 -05:00
humbletim
b0f444e179 remove dead code 2018-02-22 08:36:37 -05:00
humbletim
ec4f9fdc11 fix displayName 2018-02-22 08:31:05 -05:00
humbletim
d52dce8e09 restore code for debugging 2018-02-22 08:24:56 -05:00
humbletim
e3c269d582 remove debug string 2018-02-22 08:22:13 -05:00
humbletim
4fd3d9bf7b cleanup; formalize data structures 2018-02-22 08:18:38 -05:00
humbletim
fe9b67344b remove unnecessary UUID check 2018-02-22 07:58:49 -05:00
humbletim
e4a2a589a5 CR fedback and cleanup 2018-02-22 07:56:09 -05:00
humbletim
caab532d80 remove dupe line 2018-02-22 06:00:03 -05:00
humbletim
72fca7e57e Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge 2018-02-22 05:18:05 -05:00
humbletim
be8d79f53f CR fedback and cleanup 2018-02-22 05:15:01 -05:00
Stephen Birarda
07bbb33777
Merge pull request #12467 from Atlante45/feat/backups-integration 
Ignore baked assets in backups
 2018-02-21 21:42:18 -07:00
Atlante45
2fb9c324a5 Ignore baked assets in backups 2018-02-21 18:40:06 -08:00
Clément Brisset
8f7944522f
Merge pull request #12465 from birarda/feat/content-settings 
fix restore of object settings for content or domain settings
 2018-02-21 18:15:09 -08:00
Clément Brisset
e83a933f50
Merge pull request #12461 from birarda/bug/delete-add-rule 
fix badging for changes in tables
 2018-02-21 18:14:21 -08:00
Stephen Birarda
af3970e211
Merge pull request #12466 from Atlante45/feat/backups-integration 
Fix crash on manual upload recovery
 2018-02-21 19:13:56 -07:00
Clément Brisset
bbade00f3d
Merge pull request #12434 from birarda/feat/reload-after-restore 
check for recovery complete always, reload content page on restore
 2018-02-21 18:12:37 -08:00
Stephen Birarda
a036de9687 fix restore of object settings 2018-02-21 18:12:00 -08:00