Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 17:32:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73887 commits 75 branches 59 tags 1.2 GiB
Commit graph

73887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeff Clinton
3d01949e43
Merge pull request #14305 from AndrewMeadows/zero-vel-neargrab-nondynamic 
Case 19495: zero velocities of non-dynamic entities on nearGrab release
 2018-11-09 10:10:49 -08:00
David Back
30bd5c5e42 Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders 2018-11-09 09:49:14 -08:00
Howard Stearns
9ca8ed9e17
Merge pull request #14236 from roxanneskelly/SetupLogging 
Add logging to the windows installer to track install options and install steps
 2018-11-09 09:35:54 -08:00
David Back
a1e2ca1f74 Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders 2018-11-09 09:27:12 -08:00
NissimHadar
a7acceffa5 Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-09 09:23:36 -08:00
Thijs Wenker
99fcef105f spaceMode / desiredSpaceMode explanation 2018-11-09 17:59:00 +01:00
Jeff Clinton
43f304ea86
Merge pull request #14373 from danteruiz/image-entity-crash 
fix image entity crash
 2018-11-09 08:42:44 -08:00
Sam Gateau
e263776b19 Address the mac bug with ResourceBUffer implemented with TBO 2018-11-09 13:22:27 -03:00
Gabriel Calero
7687eb9948 Revert "Test redirect to steam" 
This reverts commit 729a0b6a59.
 2018-11-09 13:10:22 -03:00
Gabriel Calero
d9f68af634 Code review + minor ui fixes 2018-11-09 12:49:02 -03:00
Gabriel Calero
729a0b6a59 Test redirect to steam 2018-11-09 11:00:40 -03:00
Olivier Prat
4e89e9ed2a Fixed draw / do_draw in GLBackends 2018-11-09 09:58:17 +01:00
Simon Walton
d183968175 Add skipThoseWithBadParents functionality to octree visitor; reviewer suggestions 2018-11-08 18:20:20 -08:00
Brad Hefta-Gaub
2ba5474195
Merge pull request #13059 from marko8904/updateLicense 
Updated the license date
 2018-11-08 18:18:58 -08:00
NissimHadar
8d4d0beebd Cleanup 2018-11-08 17:52:07 -08:00
NissimHadar
dddb08b7fb Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-08 17:50:14 -08:00
David Rowe
de61f0f010 Add missing JSDoc noticed in passing 2018-11-09 14:00:47 +13:00
David Rowe
c9b3fda724 Merge branch 'master' into M19768 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-11-09 13:56:44 +13:00
Thijs Wenker
e483b1342c CR fixes 2018-11-09 01:56:17 +01:00
r3tk0n
d2a1b35f96 Fix desktop case showing Vive controls. 2018-11-08 16:50:11 -08:00
Brad Davis
3e0dc35e54 Removing outdated external build instructions 2018-11-08 16:46:36 -08:00
David Rowe
aca7143449 Fix interstitial music not playing at Interface start-up 2018-11-09 13:41:07 +13:00
Ryan Huffman
3b57e45fdd Remove redundant dimensions in default entity properties 2018-11-08 16:36:55 -08:00
Ryan Huffman
44d0a7254c Update the styling for the Entity Properties window 2018-11-08 16:36:55 -08:00
David Rowe
5c97954e66 Merge branch 'master' into M19404 
# Conflicts:
#	scripts/system/interstitialPage.js
 2018-11-09 13:35:11 +13:00
Thijs Wenker
9005efb639 style fixes 2018-11-09 01:30:05 +01:00
Thijs Wenker
08da8c4190 createApp - world/local switch 2018-11-09 01:28:37 +01:00
Brad Davis
5f6369daf6 Don't wipe explicit vcpkg directories 2018-11-08 15:44:28 -08:00
Dante Ruiz
f5b89ee7aa reverting previous change 2018-11-08 15:43:45 -08:00
Dante Ruiz
5d000495df making requested changes 2018-11-08 15:33:18 -08:00
Dante Ruiz
2a16ba57ac fix image entity crash 2018-11-08 15:24:57 -08:00
NissimHadar
3c5a062ec7 Merge branch 'MAC' of https://github.com/NissimHadar/hifi into MAC 2018-11-08 15:09:51 -08:00
NissimHadar
9b60103f47 Renaming auto-tester ==> nitpick 2018-11-08 15:07:32 -08:00
Gabriel Calero
c1174ad1ef Set dimensions for android devices thinner than 385dp 2018-11-08 20:04:59 -03:00
Brad Davis
3d2e723438 Adding new package guidance 2018-11-08 14:55:29 -08:00
NissimHadar
c0d748b151 Merge branch 'MAC' of github.com:NissimHadar/hifi into MAC 2018-11-08 14:27:33 -08:00
NissimHadar
8aea237ad7 Fixed endless wait 2018-11-08 14:26:27 -08:00
David Rowe
cdae5cd03d Front-load interstitial scripts and resources 2018-11-09 10:53:34 +13:00
John Conklin II
3fabe557c2
Merge pull request #13948 from danteruiz/3d-keyboard 
3D Keyboard.
 2018-11-08 13:35:13 -08:00
r3tk0n
84209c0e53 Finally fix all indentation. 2018-11-08 13:18:25 -08:00
Jason Najera
59bba5b6e6
More attempt to fix indentation. 
Still looked fine in github's editor and N++.
 2018-11-08 13:16:24 -08:00
Jason Najera
b4be7544b9
Attempt to fix spacing 
Weird thing is it still looked fine in GitHub's editor...
 2018-11-08 13:15:19 -08:00
Brad Davis
2691c39d66 PR feedback 2018-11-08 12:47:53 -08:00
Jeff Clinton
d349c1e672
Merge pull request #14336 from huffman/fix/horizontal-vertical-angle-particles 
Fix horizontal and vertical props in entity properties being swapped
 2018-11-08 12:42:48 -08:00
Brad Davis
8c4f0ec774 Vcpkg migration 2018-11-08 12:28:06 -08:00
Brad Davis
8c4237b520 Fix warnings 2018-11-08 12:27:56 -08:00
Brad Davis
caf952c252 Fix duplicated window member 2018-11-08 12:27:55 -08:00
Brad Davis
bbba7d1b1d Updating build notes 2018-11-08 12:27:55 -08:00
Jeff Clinton
cc7ce83f28
Merge pull request #14328 from roxanneskelly/Case19373 
Case 19373 - Lowering volume on another user in PAL mutes them
 2018-11-08 12:07:20 -08:00
Jeff Clinton
ea8dc8ae68
Merge pull request #14334 from danteruiz/interstitial-bug-fixes 
Interstitial bug fixes
 2018-11-08 11:43:38 -08:00