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

69413 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
064f4ca204 Remove deleted entities from list without scrolling to top 2018-06-19 16:22:59 +12:00
David Rowe
5de451e8e0 Update entity list upon entity deletion 2018-06-19 14:52:49 +12:00
Andrew Meadows
44c3620b6e remove cruft 2018-06-18 17:45:58 -07:00
Atlante45
4a4c0d132e Make stereo interface async 2018-06-18 17:26:29 -07:00
Atlante45
29ff47c6fb Ensure audio devices are made on the right thread 2018-06-18 16:28:52 -07:00
sabrina-shanman
67c605c10a Do not use ownership tracking in serverless mode in PhysicalEntitySimulation 2018-06-18 16:12:38 -07:00
Wayne Chen
413f08e900 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-06-18 15:45:03 -07:00
humbletim
dc5c5c20df raypick partIndex commit 
include shapeID for accessing proper material index

add raypick shapeID test script
 2018-06-18 18:22:30 -04:00
John Conklin II
9ace80c709
Merge pull request #13407 from AndrewMeadows/0.69.0-colliding-avatars 
RC69: avatars collide again (again)
 2018-06-18 15:21:47 -07:00
John Conklin II
a47038d81f
Merge pull request #13381 from hyperlogic/feature/crashpad-thread-id 
Add main & render thread ids to crashpad annotations
 2018-06-18 15:21:04 -07:00
Sam Gateau
56a1137f7b
Merge pull request #13312 from SamGondelman/overlayPipelines 
Fix layered overlay rendering and highlight
 2018-06-18 14:35:03 -07:00
Sam Gondelman
ad00e1bdca
Merge pull request #13394 from sethalves/fix-osx-etclib-relwithdebinfo 
fix etclib link when building RelWithDebInfo on OSX
 2018-06-18 14:26:47 -07:00
Zach Fox
ad1da3e225 Fix MS16012: Correct the criteria used to determine empty txn history 2018-06-18 14:26:46 -07:00
NissimHadar
6311f63f42 Merge branch 'master' of github.com:highfidelity/hifi into autoTesterUpdate 2018-06-18 14:01:04 -07:00
Andrew Meadows
a18ba36dd2 merge 'master' into 'workload' 2018-06-18 13:40:08 -07:00
Andrew Meadows
085130e3c9 avatars collide again again 2018-06-18 13:17:32 -07:00
Zach Fox
84ed07cdb4
Merge pull request #13405 from zfox23/MS16007_supportPngSnapshots 
Implement MS16007: Add support for PNG snapshots
 2018-06-18 13:10:45 -07:00
Wayne Chen
07e689f086 removing compute/check for u 2018-06-18 13:02:53 -07:00
Sam Gondelman
8817af9b9c
Merge pull request #13330 from Cristo86/android_enterbackground_startup 
Android - Make sure we call Interface enterBackground when opening
 2018-06-18 12:47:43 -07:00
NissimHadar
4897e11a12 Save downloaded byte array (from GitHub) to file with PNG extension. 2018-06-18 12:43:42 -07:00
SamGondelman
0d34689320 spread variables jsdoc 2018-06-18 12:33:36 -07:00
Zach Fox
e83b76781b Be a bit more specific in the docs 2018-06-18 11:47:26 -07:00
Zach Fox
614b512411 Add docs 2018-06-18 11:43:31 -07:00
Howard Stearns
69d1b85d32
Merge pull request #13393 from howard-stearns/fix-concurrency-drill-down 
fix concurrency drillDown
 2018-06-18 11:39:30 -07:00
Elisa Lupin-Jimenez
9c488ff05e
Merge pull request #13331 from gcalero/breakpad_android 
Breakpad integration for android Interface
 2018-06-18 11:32:05 -07:00
Elisa Lupin-Jimenez
c08df9e39f
Merge pull request #13400 from kitely/parse-snapshot-fix 
Don't call parseSnapshotData() in a static manner
 2018-06-18 11:26:29 -07:00
SamGondelman
93fe0c60fa correctly update bounding box based on radius and other properties 2018-06-18 11:26:09 -07:00
Zach Fox
dbf3ade04f Implement MS16007: Add support for PNG snapshots 2018-06-18 11:22:05 -07:00
Wayne Chen
e381022910 checking for NaN in cross products from vec3 positions 2018-06-18 11:21:53 -07:00
David Back
0c644c0504 Merge branch 'master' of https://github.com/highfidelity/hifi into autoLaserFix2 2018-06-18 11:06:56 -07:00
David Back
175e4b7013 also check tabletID 2018-06-18 11:06:33 -07:00
Gabriel Calero
3eecb2f379 Apply code conventions 2018-06-18 14:42:08 -03:00
Andrew Meadows
222756371e set max region radiuses in workload UI 2018-06-18 10:31:41 -07:00
Wayne Chen
ed7f008517 checking edge case of if input vectors are zero 2018-06-18 10:31:11 -07:00
Andrew Meadows
6d422e4678 Merge 'master' into 'workload' 2018-06-18 10:30:13 -07:00
Wayne Chen
4c9c27e62e Merge branch 'master' of https://github.com/wayne-chen/hifi 2018-06-18 10:29:57 -07:00
John Conklin II
87d26a9d86
Merge pull request #13304 from sabrina-shanman/btghostraytest 
Use optimized Bullet raytest function in CharacterGhostObject::rayTest()
 2018-06-18 10:22:17 -07:00
Zach Fox
f307f1d97a Fix MS15545: Fix PAL/GoTo WebView's Back Button 2018-06-18 10:19:00 -07:00
Elisa Lupin-Jimenez
b255cf0ba9
Merge pull request #13389 from AndrewMeadows/misc-001 
crash fixes, removing unnecessary writes, and misc cleanup
 2018-06-18 09:19:22 -07:00
Seth Alves
ac7e817f4b
Merge pull request #13388 from jherico/fix/oculus_touch_and_remote 
Fix touch controller button handling when Oculus remote is paired (MASTER)
 2018-06-18 08:54:16 -07:00
NissimHadar
7aa66e4ab9 Merge branch 'master' of github.com:highfidelity/hifi into autoTesterUpdate 2018-06-18 07:48:10 -07:00
NissimHadar
d59ddc4764 Added selection of branch from combo. 2018-06-18 07:44:04 -07:00
David Rowe
ffd66f4377 Make desktop left and right mouse button actions independent 2018-06-18 20:55:13 +12:00
Oren Hurvitz
d8ea47b78f Don't call parseSnapshotData() in a static manner. 
Shouldn't call non-static methods in a static manner. (Some compilers don't even allow this, although apparently Visual Studio 2017 does.)
 2018-06-17 14:18:25 +03:00
Oren Hurvitz
0cb77362e8 Always roll hifi-log.txt when starting. 
Otherwise the active log file ("hifi-log.txt") contains lines from both previous sessions and the current session, which is confusing.
 2018-06-17 13:44:14 +03:00
vladest
41dad71634 Merge branch 'master' into address_dialog_focus_fix 2018-06-17 12:27:03 +02:00
David Rowe
e8154b5df1 Fix Create app selection updating when entities are deleted 2018-06-17 08:35:45 +12:00
David Rowe
be4b929301 Fix cauterization when reparent entity to a different joint 2018-06-16 16:31:06 +12:00
David Rowe
4dd6ba1d18 Fix Mac crash 2018-06-16 16:29:45 +12:00
SamGondelman
7771661948 fix particle spread properties 2018-06-15 17:35:49 -07:00