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

74087 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
d19cdc62d7
Merge pull request #14135 from ElderOrb/FB18573 
FB18573 - Other avatars' avatar entities may appear to be successfull…
 2018-11-16 10:05:22 -08:00
Simon Walton
5f51ed0210 Keep pending content per remote address 2018-11-16 09:44:21 -08:00
Roxanne Skelly
1b63ffb996
Merge pull request #14414 from howard-stearns/security-setting-post-oculus-store-wording 
security settings post-oculus-store wording
 2018-11-16 09:35:26 -08:00
NissimHadar
6440c13bfe Updated manual. 2018-11-15 18:50:56 -08:00
NissimHadar
7fba4c4673 Deleted unneeded file. 2018-11-15 17:41:01 -08:00
birarda
bb0f046a72 add throttle start and backoff to DS settings 2018-11-15 17:28:34 -08:00
Simon Walton
22c3f5239a Relay upoaded content.zip chunks to temp file 
Entities uploads still build in-memory. Move out chunk
handling to new routine.
 2018-11-15 16:59:52 -08:00
Howard Stearns
8e1785bd90 security settings post-oculus-store wording 2018-11-15 15:59:52 -08:00
Jamil Akram
35ec0b60ab
Merge pull request #14251 from humbletim/fb18302-deprecated-package-model 
FB18302 Remove deprecated Package Model functionality
 2018-11-15 15:52:04 -08:00
Ryan Huffman
556aec9412 Fix hiding of properties in Create 2018-11-15 15:27:30 -08:00
David Back
de7f4a4a4d fix entity list resizing 2018-11-15 15:23:18 -08:00
John Conklin II
1ea2ab338e
Merge pull request #13975 from ElderOrb/FB16697 
Fix multiple issues on 'Calibration' tab of 'Controls' dialog
 2018-11-15 14:54:26 -08:00
r3tk0n
60832b071c Fix logic for cases with rift headset but no touch controllers. 2018-11-15 14:08:38 -08:00
r3tk0n
34224c4f16 Fix XBox One controller detection. 2018-11-15 14:08:21 -08:00
John Conklin II
60c538309a
Merge pull request #14411 from SamGondelman/fading 
Fix for avatar flashing on fade out
 2018-11-15 13:58:43 -08:00
John Conklin II
83660ab8e1
Merge pull request #14128 from Zvork/ao 
Improved Ambient Occlusion
 2018-11-15 13:57:13 -08:00
John Conklin II
8177d5bbcd
Merge pull request #14275 from Atlante45/fix/injector-crash 
Rework audio data memory ownership model to fix injector crashes
 2018-11-15 13:25:42 -08:00
amantley
3bf4a7844d moved the jointrotationoffsets to hfmModel.h from fbx.h 2018-11-15 10:56:17 -08:00
Dante Ruiz
20ad05726e entity server timout 2018-11-15 10:52:40 -08:00
SamGondelman
597ff773e1 fix for avatar flashing 2018-11-15 10:52:22 -08:00
NissimHadar
e6190eb429 Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-15 10:45:05 -08:00
amantley
f9829c270d merged new fbx.h 2018-11-15 10:19:04 -08:00
Brad Hefta-Gaub
20766da624
Merge pull request #14382 from dback2/newPropertySliders 
Entity properties - new draggable numbers
 2018-11-15 10:01:07 -08:00
amantley
c8cd65c3bd added getter for the orginal cluster bind matrix values in AnimSkeleton 2018-11-15 09:58:10 -08:00
Jeff Clinton
c72dd3d690
Merge pull request #14395 from ctrlaltdavid/M19859 
Fix Goto app clicks not working
 2018-11-15 09:56:56 -08:00
Simon Walton
cd00abd216 Add upload progress bar 2018-11-15 09:47:43 -08:00
Olivier Prat
0401858129 Cleaned up do_draw in GLESBackend 2018-11-15 18:34:41 +01:00
Jamil Akram
60b58977cd
Merge pull request #14267 from humbletim/fb17479-fix-handshake-keyrelease 
FB17479 - Fix scripted key release events for handshakes.
 2018-11-15 09:21:32 -08:00
Olivier Prat
ed42c94772 Merge branch 'master' of http://github.com/highfidelity/hifi into ao 2018-11-15 17:55:29 +01:00
NissimHadar
fb0a84e800 CR updates. 2018-11-15 07:54:56 -08:00
NissimHadar
1e17b878e7 CR updates. 2018-11-15 07:32:26 -08:00
humbletim
d0e4c62978 fix merge conflict 2018-11-14 23:50:02 -05:00
humbletim
21030fbe5b Merge remote-tracking branch 'upstream/master' into fb18302-deprecated-package-model 2018-11-14 23:40:04 -05:00
NissimHadar
a74e123229 Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-14 20:20:41 -08:00
amantley
80ebde1036 started cleanup of pr 2018-11-14 17:27:45 -08:00
John Conklin II
ef3acae896
Merge pull request #14407 from jherico/fix/19876 
Case 19876: Fix procedurals using the iGlobalTime input
 2018-11-14 17:18:57 -08:00
amantley
8256c652fc added the hook to put the copy of the mutated bind poses into tthe skeleton 2018-11-14 17:02:25 -08:00
David Back
dfed797682 set more min/max/steps 2018-11-14 15:44:30 -08:00
Atlante45
31033ad685 Update TTS audio API use 2018-11-14 15:42:39 -08:00
Brad Davis
b7c567af08 Fix procedurals using the iGlobalTime input 2018-11-14 15:28:22 -08:00
Dante Ruiz
f17723c216 disable interstitial for master 2018-11-14 14:50:38 -08:00
Clement
7f910a38e3 Update keyboard injector to new interface 2018-11-14 14:46:08 -08:00
Clement
d2a1bb4806 CR 2018-11-14 14:46:08 -08:00
Clement
7192aed131 Rework audio data memory ownership model 2018-11-14 14:45:18 -08:00
David Back
76d2519205
Merge pull request #14400 from dback2/missingTypeFilters 
Add PolyLine/PolyVox to entity list/properties types
 2018-11-14 14:39:26 -08:00
John Conklin II
b08283d9e9
Merge pull request #14401 from sethalves/rc76-revert-pr-14238 
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
 2018-11-14 14:38:34 -08:00
David Back
d8f5e0f708 add min/max/step for some properties, remove duplicate createProperty, improve switch between states 2018-11-14 14:32:17 -08:00
David Rowe
9c5d318341 Fix highlighting 2018-11-15 10:15:30 +13:00
Brad Hefta-Gaub
6ffee02b4f
Merge pull request #14337 from thoys/feat/create/forwardWindowShortcuts 
[CreateApp] make shortcuts work from windows
 2018-11-14 12:56:27 -08:00
David Back
cff4c08e9f Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders 2018-11-14 12:46:41 -08:00