Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 21:29:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57590 commits 76 branches 59 tags 1.2 GiB
Commit graph

57590 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
3a31805dff Fix warnings in Qt 59 / VS 2017 build 2017-07-20 11:57:12 -07:00
Atlante45
c0da0cb439 Update sit script in the repo 2017-07-20 11:56:41 -07:00
Brad Hefta-Gaub
cdb7652423 Merge pull request #11007 from MiladNazeri/patch-2 
Update CONTRIBUTING.md
 2017-07-20 11:55:26 -07:00
Seth Alves
38a955b886 Merge pull request #11011 from trentpolack/21434-obj-vertexcolors 
WL21434 - Add vertex color support for OBJ files.
 2017-07-20 10:37:37 -07:00
trent
559e2e0ebb Fixing formatting issues; renamed ::getVec3Vec3 to ::getVertex. 2017-07-20 13:09:17 -04:00
Seth Alves
bd37f8edf5 Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models 2017-07-20 09:03:59 -07:00
Chris Collins
13262afec7 Merge pull request #10972 from highfidelity/RC-48 
Beta Release 48 - Includes up to Developer Release 6863
 2017-07-20 08:57:47 -07:00
trent
ff3e9263ef Stupid tabs. 2017-07-20 11:40:42 -04:00
trent
786535a001 Merge branch 'master' of https://github.com/highfidelity/hifi into 21434-obj-vertexcolors 2017-07-20 11:38:54 -04:00
trent
d71b0802a7 Added vertex color support to OBJReader.h|cpp. 2017-07-20 11:38:42 -04:00
Dante Ruiz
3805228b70 fixed grab the tablet in third person 2017-07-20 16:26:51 +01:00
MiladNazeri
13274fb9a3 Update CONTRIBUTING.md 
Same issue as the readme.md change.
 2017-07-20 10:20:56 -04:00
David Rowe
e2cace2372 Fix laser not turning off when lose controller tracking 2017-07-20 22:29:13 +12:00
David Rowe
da97662ee1 Make hovered handles brighter 2017-07-20 22:23:48 +12:00
David Rowe
1009b67600 Fix unhandled state condition 2017-07-20 21:38:03 +12:00
David Rowe
3b966072a3 Fix grabbing a handle without hovering entity beforehand 2017-07-20 21:30:39 +12:00
David Rowe
571d10fa89 Improve editor state update code 2017-07-20 21:05:21 +12:00
David Rowe
880a711d2b Prevent invalid direct / handle scaling transition while scaling 2017-07-20 18:36:02 +12:00
David Rowe
5551bb70d4 Disable collisions and dynamic behavior while entities are being moved 2017-07-20 18:33:23 +12:00
Ken Cooke
87d9dfd243 Merge pull request #11002 from ctrlaltdavid/21461 
Fix noise reduction checkbox not always working
 2017-07-19 19:22:28 -07:00
David Rowe
091b666d7e Fix noise reduction checkbox not always working 2017-07-20 12:06:19 +12:00
Stephen Birarda
3936ee93f0 use default scripts path in EditTabView to fix load on OS X 2017-07-19 16:34:04 -07:00
Atlante45
70a5916ef3 Fix debug builds startup crash 2017-07-19 16:18:01 -07:00
utkarshgautamnyu
ce5ff23e70 made changes to size of content to dosplay 'choose file' button 2017-07-19 16:15:34 -07:00
Seth Alves
be48268be8 getMeshes handles registration point 2017-07-19 15:02:40 -07:00
Seth Alves
8a732e7d4b Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models 2017-07-19 13:58:07 -07:00
Seth Alves
750b7192af trying to get the resulting model to line up with the originals 2017-07-19 13:58:03 -07:00
Clément Brisset
d76039387a Merge pull request #10992 from Atlante45/fix/heap-use-after-free 
Fix potential data corruption in the FileCache
 2017-07-19 10:44:02 -07:00
Seth Alves
a8698c2fbc EntityScriptingInterface::getMeshes support for Model entities 2017-07-19 08:59:09 -07:00
Andrew Meadows
d48f45f7e6 Merge pull request #10990 from druiz17/bug-help-issue 
fixed another instance of the tablet getting stuck on the help screen
 2017-07-19 08:37:56 -07:00
Andrew Meadows
a069620013 Merge pull request #10970 from Atlante45/feat/ac-shutdown-info 
AC shutdown info + PPID watcher on Unix
 2017-07-19 08:34:45 -07:00
Dante Ruiz
fdfeab77eb made requested changes 2017-07-19 16:28:16 +01:00
David Rowe
c57b51235e Merge branch 'master' into vr-edit-a 
# Conflicts:
#	scripts/system/controllers/handControllerGrab.js
 2017-07-19 18:56:04 +12:00
David Rowe
2bd3f87d73 Tidying 2017-07-19 18:11:45 +12:00
David Rowe
e4123070c4 Add handle scaling of multiple entities 2017-07-19 18:10:39 +12:00
David Rowe
f1fd6264f3 Fix handle scaling entity with non-center registration point 2017-07-19 17:51:36 +12:00
David Rowe
5cb5c71966 Avoid bounding box center calcs 2017-07-19 16:33:05 +12:00
David Rowe
ce6e711f2d Fix old scale handles displaying when switch hands 2017-07-19 12:12:20 +12:00
David Rowe
0f64da23bd Improve debug 2017-07-19 12:09:52 +12:00
Brad Hefta-Gaub
044b8fc19a Merge pull request #10993 from druiz17/bug-rogue-laser 
Do not show lasers when editing in 2D mode.
 2017-07-18 16:53:11 -07:00
Brad Davis
009df176c5 Ensure we continue calling idle when minimized 
Conflicts:
	interface/src/Application.cpp
 2017-07-18 16:14:17 -07:00
Brad Davis
43476afff5 Merge pull request #10995 from AndrewMeadows/fix-debug-build 
fix broken debug build
 2017-07-18 16:00:18 -07:00
Brad Davis
90048cdb4b Merge pull request #10991 from jherico/minimized_deadlock 
Ensure we continue calling idle when minimized
 2017-07-18 15:59:28 -07:00
Andrew Meadows
8dafc30bf9 fix debug build: stub pure virtual function 2017-07-18 15:57:00 -07:00
Dante Ruiz
b3ec306063 better version 2017-07-18 23:48:21 +01:00
Clément Brisset
18be917358 Merge pull request #10574 from humbletim/21180 
CR #21180 Camera control app
 2017-07-18 15:35:32 -07:00
David Kelly
4d4d9421d3 Merge pull request #10983 from davidkelly/dk/marketplaceIDHack 
Get marketplaceID into imported entities
 2017-07-18 15:25:49 -07:00
vladest
4b94d24c29 Change default mouse speeds for avatar 2017-07-18 23:51:19 +02:00
Dante Ruiz
8cbe63f296 removed search laser in edit mode for 2d mode 2017-07-18 22:45:54 +01:00
Brad Davis
02363e06de Ensure input and output device containers are protected by mutex 2017-07-18 14:01:25 -07:00