Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 01:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67289 commits 22 branches 28 tags 1.2 GiB
Commit graph

67289 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
6d251c4cd3 Bringing the work and refinment done in workload branch to master branch 2018-05-03 17:46:50 -07:00
samcake
82fac69e7a Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-03 15:58:06 -07:00
samcake
9af7aae45a Merge branch 'one' of github.com:samcake/hifi into one 2018-05-03 15:57:25 -07:00
John Conklin II
7d424edd9b
Merge pull request #13092 from Atlante45/fix/asan-warning 
Fix uninitialized boolean (asan warning)
 2018-05-03 15:46:37 -07:00
MiladNazeri
6efb710222
Merge pull request #13076 from ctrlaltdavid/21856-g 
JSDoc fixes
 2018-05-03 14:06:23 -07:00
Clement
cefb8457ea Fix uninitialized boolean 2018-05-03 11:17:31 -07:00
Ken Cooke
028ea11405
Merge pull request #13080 from kencooke/audio-asan-warnings 
Fix asan warnings
 2018-05-03 10:32:59 -07:00
Howard Stearns
d4a562ee47
Merge pull request #13081 from zfox23/MS14741_fixAppUninstallation 
Fix MS14741, allowing uninstall of apps whose scripts are no longer running
 2018-05-03 10:02:20 -07:00
Ken Cooke
9e7fceccc3
Merge pull request #13087 from kencooke/audio-meter-default 
Fix MS14640: Default audio meter overlay to "on"
 2018-05-03 09:29:30 -07:00
Ken Cooke
2a7e8c6f89 Default audio meter overlay to "on" 2018-05-03 07:15:18 -07:00
David Rowe
e95c38d939 Merge branch 'master' into 21856-g 
# Conflicts:
#	libraries/model-networking/src/model-networking/TextureCache.h
 2018-05-03 21:03:14 +12:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d 
List which contexts each namespace and class is available in
 2018-05-03 01:29:14 -07:00
Seth Alves
b68d9ecd68
Merge pull request #12985 from druiz17/attachments-disappearing 
fixing avatr attachments not being visible when coming out of first person
 2018-05-02 18:50:41 -07:00
Ken Cooke
3e77d946ea Silence warnings of unused functions 2018-05-02 17:48:04 -07:00
Sam Gateau
361fe75dc3
Merge pull request #13078 from jherico/fix/14638 
Make resource swapchains immutable
 2018-05-02 17:21:45 -07:00
Zach Fox
56ba59681a Fix MS14741, allowing uninstall of apps whose scripts are no longer running 2018-05-02 16:12:55 -07:00
Ken Cooke
3071b410bf Remove obsolete 32-bit optimizations 2018-05-02 15:42:53 -07:00
Ken Cooke
5f394fb254 Remove workaround for VS2013 bug 2018-05-02 15:31:40 -07:00
Ken Cooke
e549f7b085 Fix VS2017 performance loss 2018-05-02 14:48:08 -07:00
John Conklin II
f43b9ee7e8
Merge pull request #12960 from hyperlogic/feature/bullet-debug-draw 
Added items to the developer menu for debugging physics
 2018-05-02 14:25:09 -07:00
Sam Gondelman
7d19586b53
Merge pull request #12693 from gcalero/android_goto_splash 
Android goto splash
 2018-05-02 16:12:02 -04:00
Gabriel Calero
4dce62cc2e Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 16:27:41 -03:00
John Conklin II
7a5fce4315
Merge pull request #12991 from luiscuenca/avatarScript 
Avatar Scripts
 2018-05-02 12:23:13 -07:00
luiscuenca
689fbd2da0 added requested changes 2018-05-02 11:09:17 -07:00
Anthony J. Thibault
4fa9af5534 Added items to the developer menu for debugging physics 
Hooked up Bullet's internal debug draw functionality to our client.
Under the Developer > Physics Menu there are five new items:

  * Show Bullet Collision - will draw all collision shapes in wireframe. WARNING: can be slow on large scenes.
  * Show Bullet Bounding Boxes - will draw axis aligned bounding boxes around all physics shapes.
  * Show Bullet Contact Points - will draw all contact points where two or more objects are colliding.
  * Show Bullet Constraints - will render wire frame axes for each constraint connecting bodies together.
  * Show Bullet Constraint Limits - will render the joint limits for each constraint.
 2018-05-02 10:51:00 -07:00
Gabriel Calero
c15ef56d90 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 14:38:10 -03:00
Bradley Austin Davis
64d442b281 Change type used for swap chain count 2018-05-02 10:32:44 -07:00
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
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
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
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
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
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
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
Zach Fox
c42b13134f
Merge pull request #13063 from zfox23/preventImageProviderCrash 
Fix a crash in Image Provider when logging in or reloading all scripts
 2018-05-01 11:55:15 -07:00
John Conklin II
c3e531dda1
Merge pull request #13062 from sethalves/fix-physics-crash-on-exit 
fix physics related crash-on-exit
 2018-05-01 11:04:50 -07:00