Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 00:15:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
53895 commits 71 branches 56 tags 1.2 GiB
Commit graph

53895 commits

Author SHA1 Message Date
Zach Fox
9ace7a7488 Merge pull request from andrewd440/21174 
21174 Make the Particle Emitter Easier to Use
 2017-04-26 15:35:29 -07:00
Andrew Lowry
d3a9114676 Uses spaces instead of tabs for Edit.qml and EditTabView.qml. 2017-04-26 18:29:38 -04:00
anshuman64
5bd9b2e631 Merge pull request from ctrlaltdavid/21249 
New avatar record and playback script
 2017-04-26 15:18:30 -07:00
Chris Collins
c28a5b2342 Merge pull request from zzmp/fix/tablet-typo 
fix tablet resolve typo
 2017-04-26 15:02:23 -07:00
Thijs Wenker
26173700b8 Merge pull request from Triplelexx/21287 
21287 - Newly created entities in Edit.js should be grabbable
 2017-04-26 23:16:04 +02:00
Ryan Huffman
8ba56a96df Merge pull request from zzmp/fix/hmd-tutorial 
Condition tutorial on active HMD
 2017-04-26 14:00:02 -07:00
David Rowe
a68ee02e8d Log script start-up 2017-04-27 08:41:29 +12:00
Zach Pomerantz
532284f779 fix tablet resolve typo 2017-04-26 16:28:42 -04:00
Chris Collins
11c21cc871 Merge pull request from jherico/hotfix_back_merge 
Stable - Master hotfix merge back
 2017-04-26 13:25:16 -07:00
Brad Hefta-Gaub
f1bd371fbe Merge pull request from PhilipRosedale/springHold 
New Tutorial and entity scripts
 2017-04-26 13:16:17 -07:00
Triplelexx
e295ab2778 change location of menu item Create Entities As Grabbable 2017-04-26 21:13:39 +01:00
Andrew Meadows
ac6d4969d6 Merge pull request from Atlante45/fix/unload 
Fix entity script unloads
 2017-04-26 11:42:14 -07:00
Brad Davis
0a1f8ead25 Merge remote-tracking branch 'upstream/stable' into hotfix_back_merge 
Conflicts:
	libraries/gpu-gl/src/gpu/gl45/GL45BackendVariableTexture.cpp
 2017-04-26 11:06:33 -07:00
Triplelexx
06b3b84145 changes from CR 2017-04-26 18:50:15 +01:00
Zach Fox
6e6fd608dd Merge pull request from zfox23/fixConnectionLogs 
Fix incorrect logging in makeUserConnection
 2017-04-26 09:13:27 -07:00
Zach Fox
3e24296996 Swap the two lines 2017-04-26 09:10:05 -07:00
David Rowe
4581b9a0df Refresh countdown number upon reopening dialog 2017-04-26 20:13:21 +12:00
Triplelexx
01b11022e3 add menu item to control grabbable setting on newly created entites 2017-04-26 07:26:00 +01:00
Philip Rosedale
8826dbef78 removed old gravity example 2017-04-25 22:37:20 -07:00
Philip Rosedale
c69d064cc3 code review fixes 2017-04-25 22:14:03 -07:00
David Rowe
06f56f024b Increase delay of checking a recording loaded to reduce false positives 2017-04-26 15:55:59 +12:00
Seth Alves
c7ab4994ea Merge pull request from druiz17/tablet-webview-keyboard 
Added tabletwebview keyboard for HMD
 2017-04-25 19:30:49 -07:00
David Rowe
c5f384d8fb Don't fade playback avatar when approaches observer 2017-04-26 14:02:45 +12:00
David Rowe
1b635d8c5e Replace FIXMEs with proper code 2017-04-26 13:29:51 +12:00
David Rowe
4a5f84f4b9 Merge branch 'master' into 21249 
# Conflicts:
#	libraries/audio-client/src/AudioClient.cpp
 2017-04-26 13:24:18 +12:00
Seth Alves
8becca3b98 Merge pull request from ZappoMan/AddUsersToAgent 
add support for ignore radius from agent scripts
 2017-04-25 17:38:55 -07:00
Seth Alves
dc70e96b0f Merge pull request from birarda/bug/input-received-signal 
fix emission of inputReceived in AudioClient
 2017-04-25 17:38:04 -07:00
Clément Brisset
c20a4da96d Merge pull request from Atlante45/nvtt 
Add textures BC compression
 2017-04-25 17:34:26 -07:00
Thijs Wenker
5457b8d214 Merge pull request from PhilipRosedale/halfDuplex 
Half Duplex script
 2017-04-26 01:47:16 +02:00
Atlante45
33f58f99d1 CR 2017-04-25 16:09:31 -07:00
Atlante45
9dbae4b54e CR 2017-04-25 15:56:23 -07:00
Atlante45
56f656f92a Disable compression during runtime 2017-04-25 15:56:23 -07:00
Stephen Birarda
e3ab2615c1 allow NVTT to be built as external on android 2017-04-25 15:56:23 -07:00
Atlante45
1cc86b7203 Fix build error 2017-04-25 15:56:23 -07:00
Atlante45
1820207259 Fix processTextureAlpha 2017-04-25 15:56:23 -07:00
Atlante45
d6ab35ba1a Logging cleanup 2017-04-25 15:56:23 -07:00
Atlante45
b98cd7355e Code cleanup 2017-04-25 15:56:23 -07:00
Atlante45
77d8bf20a7 Fix warnings 2017-04-25 15:56:23 -07:00
Atlante45
fae49668b4 Disable CubeMap and NormalMap compression 2017-04-25 15:56:23 -07:00
Atlante45
145af2b911 Fix ImageReader for images with a wrong extension 2017-04-25 15:56:23 -07:00
Atlante45
62b7855e1f Add pending to stats 2017-04-25 15:56:23 -07:00
Atlante45
fc1b920341 Add ability to disable texture compression 2017-04-25 15:56:23 -07:00
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07:00
Atlante45
63e564c178 Add source hash to KTX metadata 2017-04-25 15:56:23 -07:00
Atlante45
d9a7615cc8 Add compression support for skyboxes 2017-04-25 15:56:23 -07:00
Stephen Birarda
7968045626 update md5 for patched external nvtt 2017-04-25 15:56:23 -07:00
Stephen Birarda
11fa2797b7 force the release DLL path for NVTT on windows 2017-04-25 15:56:23 -07:00
Stephen Birarda
202e933d8b don't build, install, or configure nvtt on windows 2017-04-25 15:56:23 -07:00
Stephen Birarda
06b3b3d5f4 ad missing include dir for NVTT on win 2017-04-25 15:56:23 -07:00
Stephen Birarda
d72e5e5b24 add handling for install_name_tool calls on OS X 2017-04-25 15:56:23 -07:00