Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 16:53:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
64946 commits 75 branches 59 tags 1.2 GiB
Commit graph

64946 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Simon Walton
a0a12258bf Merge branch 'master' into moc-fixes 2018-02-22 11:06:53 -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
Seth Alves
c5584432c7 Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-02-22 10:40:18 -08:00
Seth Alves
d436197291 Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-02-22 10:27:37 -08:00
Seth Alves
f17fa684f5 fix import of zones with skyboxes 2018-02-22 10:27:30 -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
Seth Alves
1ce9b56da2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-22 10:16:47 -08:00
Seth Alves
036b3145c5 Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-02-22 10:16:39 -08:00
Seth Alves
7974857cea
Merge pull request #21 from druiz17/serverless-domains 
allow Octree to load compressed gz files
 2018-02-22 10:14:44 -08:00
Dante Ruiz
d394c891c5 allow Octreee to load compressed gz files 2018-02-22 10:10:54 -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
Seth Alves
496b637325 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-22 09:39:34 -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
Seth Alves
c83dcbc626 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-22 07:42:49 -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
Seth Alves
d27cbac3f8 loading directly into a serverless domain works. user will have edit permissions 2018-02-21 18:21:45 -08:00
John Conklin II
37645022f6
Merge pull request #12344 from ctrlaltdavid/21739 
Recording app fixes
 2018-02-21 17:03:54 -08:00
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items 
Remove some deprecated JavaScript API items
 2018-02-21 16:31:16 -08:00
Liv Erickson
aba1cae36d get rid of magic number 2018-02-21 16:19:50 -08:00
tapalisa
1f958c247f
Merge pull request #12391 from 1P-Cusack/FogBugz/Case_4315_colorpreview_final 
[Case 4315] Fixes ColorPicker Color Preview functionality
 2018-02-21 16:09:47 -08:00
SamGondelman
4b1217f1f6 move all entity items to main thread 2018-02-21 15:54:07 -08:00
Liv Erickson
990e848de6 fix typo that was breaking popup dialog 2018-02-21 15:54:00 -08:00
Liv Erickson
68f0c0391a Initial fix - need a little style fixing 2018-02-21 15:44:23 -08:00
Seth Alves
f44749387a cleanups 2018-02-21 15:24:54 -08:00
Seth Alves
e36f39781b remove some debug prints, fix serverless to servered domain transition 2018-02-21 15:06:23 -08:00
David Back
10f99602bb Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMotors 2018-02-21 14:32:24 -08:00
Nissim Hadar
049beba157 Corrected edge case of creating a snapshot with "" as the filename. 2018-02-21 14:15:41 -08:00
Seth Alves
15a3babda9 Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-02-21 13:46:41 -08:00
Seth Alves
e6b305c09c Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-21 13:46:37 -08:00
Seth Alves
07f5399326
Merge pull request #20 from druiz17/serverless-domains 
Fix history and double loading of serverless domain.
 2018-02-21 13:46:25 -08:00