Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 11:26:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
67408 commits 76 branches 59 tags 1.2 GiB
Commit graph

67408 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bradley Austin Davis
80f87f7a62 Make resource swapchains immutable, fix for 14638 2018-05-02 10:32:34 -07:00
John Conklin II
83d370f1af
Merge pull request #12872 from huffman/fix/vertex-colors-fbx 
Fix FBX vertex colors not being read correctly
 2018-05-02 10:22:01 -07:00
John Conklin II
49dbc73cd5
Merge pull request #13073 from ctrlaltdavid/21861 
Fix entity not highlighted in list after creating or undoing delete
 2018-05-02 10:19:09 -07:00
Ryan Huffman
b29984ab2c Remove max log age for rolling interface log 2018-05-02 10:01:15 -07:00
Ken Cooke
05c534991e Fix ASAN warnings 2018-05-02 09:39:42 -07:00
Sam Gateau
22e5465767
Merge pull request #13013 from AndrewMeadows/avoid-update-flood 
fix bug: interface sends too many updates on settle
 2018-05-02 08:52:58 -07:00
NissimHadar
3edfdae6b2 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-02 08:35:59 -07:00
Ken Cooke
a4105f1081
Merge pull request #13052 from kitely/fix-gcc-warnings 
Eliminated warnings in gcc
 2018-05-02 06:43:32 -07:00
Oren Hurvitz
26ffb3213c Changed "[[gnu::fallthrough]]" to "// FALLTHRU" 2018-05-02 07:06:47 +01:00
David Rowe
3febdcb141 Miscellaneous JSDoc tidying 2018-05-02 16:15:35 +12:00
David Rowe
48632be3c2 Fix up cache APIs' JSDoc 2018-05-02 16:12:48 +12:00
David Rowe
f27e363b68 Remove entity from list when it deletes; handle multiple deletions 2018-05-02 15:23:13 +12:00
David Rowe
5a064d3499 Remove selection handles and list highlight when entity deletes 2018-05-02 14:13:15 +12:00
Clement
83a438eb22 Set avatar view packets on their own timer 2018-05-01 18:10:55 -07:00
Clement
2ad948c462 Bump ViewFrustum packet version 2018-05-01 18:03:21 -07:00
Clement
a283d28686 Send number of frustums in packet 2018-05-01 18:03:21 -07:00
Clement
ddde0228ba Fix AC not sending Avatar Mixer a frustum 2018-05-01 18:03:21 -07:00
Clement
538f24162f Define ViewFrustums type alias 2018-05-01 18:03:21 -07:00
Clement
1b2b70b769 Send both frustums to Avatar Mixer 2018-05-01 18:03:21 -07:00
Clement
21213e81f4 Multiview support for priority queue 2018-05-01 18:03:21 -07:00
Clement
d47ddbd6e4 CR 2018-05-01 18:02:29 -07:00
Clement
30d14dcd45 Push packet version 2018-05-01 18:02:29 -07:00
Atlante45
0820ef3c95 Account for secondary view when deciding to query 2018-05-01 18:02:29 -07:00
Clement
4c90763236 Correctly update secondary camera frustum 2018-05-01 18:02:29 -07:00
Clement
fea49744ed Add comment for future work 2018-05-01 18:02:29 -07:00
Clement
69a7f2d4aa Fix entity server crash 2018-05-01 18:02:29 -07:00
Atlante45
7a710093ac Fix build error 2018-05-01 18:02:29 -07:00
Clement
3862a02cee DRY traversal scan callbacks 2018-05-01 18:02:29 -07:00
Clement
7f67547fae Update HeadlessViewer to not always send a frustum 2018-05-01 18:02:29 -07:00
Clement
98cf48694e Expose secondary camera to game logic 2018-05-01 18:02:29 -07:00
Clement
49fad3d868 EntityServer traversal aware of all ViewFrustums 2018-05-01 18:02:29 -07:00
NissimHadar
93afbcdc08 First success with running from command line. 2018-05-01 17:59:07 -07:00
David Rowe
1b99946c5f Fix entity not highlighted in list after creating or undoing delete 2018-05-02 12:38:29 +12:00
Stephen Birarda
12f7dd93dc
Merge pull request #13068 from birarda/67-to-master 
merge RC67 back to master
 2018-05-01 17:24:46 -07:00
Stephen Birarda
0838381e4c
Merge pull request #13070 from SimonWalton-HiFi/getdomainlocalid-assert 
Prevent call of getDomainLocalID() by domain server itself more robustly
 2018-05-01 15:45:37 -07:00
NissimHadar
a3e4fa8429 Corrected download of images. 2018-05-01 15:27:29 -07:00
Simon Walton
bbcb07d9ab Brute force it with isDomainServer() 2018-05-01 15:07:44 -07:00
Simon Walton
0627099667 In packetSourceAndHashMatchAndTrackBandwidth() check LocalID after check for DS source 
Makes check more robust in case domain server itself reaches this point,
since LimitedNodeList::getDomainLocalID() debug-asserts.
 2018-05-01 14:33:48 -07:00
David Rowe
0653f49efe Remove deprecated location.domainId from API 
location.domainID is available, instead.
 2018-05-02 09:31:24 +12:00
NissimHadar
b722c80b3f WIP 2018-05-01 14:25:33 -07:00
Stephen Birarda
f5441c05b3 Merge branch 'master' of github.com:highfidelity/hifi into 67-to-master 2018-05-01 14:18:24 -07:00
Stephen Birarda
cad63ad107 Revert "Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"" 
This reverts commit acb21cc96a.
 2018-05-01 14:15:12 -07:00
Ryan Huffman
12d4cf12cf Bump model and texture baking versions in AssetServer 2018-05-01 14:11:50 -07:00
Ryan Huffman
24ac342c6b Add support for client texture selection 2018-05-01 14:11:31 -07:00
NissimHadar
e9d28cf275 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-01 13:26:58 -07:00
John Conklin II
382802375d
Merge pull request #13057 from misslivirose/fix/edit-create-grabbable 
Remove 'Create Items as Grabbable' Menu item in cleanup for edit
 2018-05-01 13:15:27 -07:00
David Rowe
1aa28b7f54 Merge remote-tracking branch 'upstream/master' into 21856-d 
# Conflicts:
#	interface/src/LODManager.h
 2018-05-02 07:50:55 +12:00
John Conklin II
a5753c6d94
Merge pull request #13064 from birarda/66-2-to-67 
merge changes in 66.2 to 67
 2018-05-01 12:50:01 -07:00
John Conklin II
250aa3ab43
Merge pull request #13027 from jherico/fix/web_crash2 
Some fixes for QML surfaces
 2018-05-01 12:39:46 -07:00
MiladNazeri
3bb09024ec
Merge pull request #13058 from ctrlaltdavid/21856-e 
Fix LODManager JSDoc
 2018-05-01 12:25:37 -07:00