Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 05:35:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70757 commits 76 branches 59 tags 1.2 GiB
Commit graph

70757 commits

This branch
This branch
All branches
Author SHA1 Message Date
sabrina-shanman
5b6916177c Add support for rotation as CollisionRegion parameter and make it the default 2018-08-08 10:47:13 -07:00
sabrina-shanman
22142a84b8 Remove JS documentation on 'loaded' parameter referencing unsupported model collision pick 2018-08-08 10:42:26 -07:00
Stephen Birarda
e686df6fb9
Merge pull request #13720 from Atlante45/feat/test-tool 
Stack tester changes
 2018-08-08 13:40:05 -04:00
sabrina-shanman
6249d1c3aa Initialize btCollisionWorld::ContactResultCallback BEFORE AllContactsCallback variables 2018-08-08 10:32:26 -07:00
Ryan Huffman
6be0c43fca Update generateIrradiance to take a BackendTarget 2018-08-08 10:00:02 -07:00
Ryan Huffman
26e69de81e Add braces around std::array intialization to suppress warning 2018-08-08 10:00:02 -07:00
Ryan Huffman
140b9be1c4 Update BackendTarget to include version 2018-08-08 10:00:02 -07:00
Ryan Huffman
f1e63f489b Update image::processImage to use compress flag for GLES 2018-08-08 10:00:01 -07:00
Ryan Huffman
9ea08f1850 Add ETC2 support to Oven 2018-08-08 10:00:01 -07:00
Anthony J. Thibault
c4c3581285 Fix memory corruption in PerformanceTimer when Stats are active 
PerformanceTimer was neither thread safe nor re-entrant.  Because it was being used increasingly on render and worker threads it has increased the likelihood of heap corruption.
I was able to identify this by enabling full page heap verification using the gflags app.

https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/enable-page-heap
 2018-08-08 09:53:26 -07:00
Andrew Meadows
49a1d0a18a MyAvatar RigidBody ignores backfacing triangles 2018-08-08 09:11:09 -07:00
sabrina-shanman
4ffe164569 Address Mac/Linux build warnings 2018-08-08 08:56:35 -07:00
NissimHadar
65d4a061a2 WIP - working on help. 2018-08-08 08:25:12 -07:00
Olivier Prat
2584ce4c96 Merged with master 2018-08-08 08:42:44 +02:00
NissimHadar
1f4c0ebeb5 WIP - working on Help. 2018-08-07 22:55:45 -07:00
David Rowe
f7c17df6cc Float play area and sensors above the ground 2018-08-08 16:32:08 +12:00
Clément Brisset
e9f23a43f6
Merge pull request #13726 from Atlante45/fix/angle-between 
Fix angleBetween potential NaN return value
 2018-08-07 18:31:57 -07:00
sabrina-shanman
69812d04ae Reduce scope of CollisionPick shapeType to primitive shapes 2018-08-07 17:42:38 -07:00
NissimHadar
76e0e8d3fa WIP - working on Help. 2018-08-07 17:13:34 -07:00
NissimHadar
b8c7971ebe WIP - working on Help. 2018-08-07 17:03:44 -07:00
NissimHadar
cd186aa657 Removed unneeded MD file. 2018-08-07 15:56:49 -07:00
Sam Gondelman
9ec0b05fe4
Merge pull request #13776 from samcake/black 
Fix bug with texel opaque and transparent cut off shader function
 2018-08-07 15:52:18 -07:00
David Rowe
fd977a758b Update teleport destination model 2018-08-08 10:49:34 +12:00
David Rowe
96767c1103 Merge branch 'master' into M17217-b 
# Conflicts:
#	plugins/openvr/src/OpenVrDisplayPlugin.cpp
 2018-08-08 10:43:58 +12:00
Sam Gondelman
da71572d2c
Merge pull request #13775 from SamGondelman/shadows 
Don't bind materials during shadow pass
 2018-08-07 15:43:48 -07:00
SamGondelman
6ff0b9d417 fix debug tools 2018-08-07 15:25:56 -07:00
NissimHadar
4eaa06fbc5
Merge pull request #13725 from NissimHadar/exportToTestRail 
Export test suite to TestRail
 2018-08-07 15:20:47 -07:00
David Rowe
f65b1a26ae Merge remote-tracking branch 'SamGondelman/parabolic2' into M17217-b 2018-08-08 10:06:43 +12:00
r3tk0n
32165dff40 Fixed rotations in MyAvatar::goToFeetLocation() 2018-08-07 14:31:48 -07:00
NissimHadar
cce17eb181 Added tabbed interface. 2018-08-07 14:20:45 -07:00
David Back
3c5c5d8552
Merge pull request #13750 from dback2/editLogSpamFix 
Fix edit log spam with -1 hand
 2018-08-07 13:51:39 -07:00
David Rowe
a7170a5892 Fix typo 2018-08-08 08:49:29 +12:00
amantley
1353406254 more whitespace 2018-08-07 12:56:28 -07:00
amantley
4ad73fd821 removed whitespace 2018-08-07 12:51:23 -07:00
Simon Walton
df9c65e410 Move back RecordingScriptingInterface destruction 2018-08-07 12:08:10 -07:00
David Back
a905a76c70 reload script cache with reload content 2018-08-07 11:53:11 -07:00
Zach Fox
af9dc8acca Turn on only for Annoucements 2018-08-07 11:51:38 -07:00
Zach Fox
4cee6b720a Implement auto-scrolling on Places cards (TODO for Connections) 2018-08-07 11:50:38 -07:00
Dante Ruiz
269afb9a49 remove tablet material entities code remove create 2018-08-07 11:19:22 -07:00
SamGondelman
de10dfb032 don't bind materials during shadow pass 2018-08-07 11:17:18 -07:00
Sam Gateau
07cb0db425 Fix bug with texel opaque and transparent cut off shader function 2018-08-07 11:16:50 -07:00
Stephen Birarda
c7ce8e5ce0 check node data pointers in handleNodeIgnoreRequestPacket 2018-08-07 11:00:24 -07:00
Dante Ruiz
8c5eefcc95 some file and code cleanup 2018-08-07 10:58:45 -07:00
Dante Ruiz
d78c571df6 revert to use overlays instead of entities for tablet highlighting 2018-08-07 10:56:53 -07:00
amantley
a61909446a Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-08-07 10:40:22 -07:00
amantley
84619e7adc cleaned up to match coding standards 2018-08-07 10:40:11 -07:00
Thijs Wenker
9c96a10f6c Fix for angularVelocity zeroing out on duplication or undo 2018-08-07 19:35:49 +02:00
David Back
d88615219c CR changes 2018-08-07 10:19:48 -07:00
David Back
deee73f14d Merge branch 'master' of https://github.com/highfidelity/hifi into serverScriptStatus 2018-08-07 10:05:56 -07:00
David Back
174519e86e fix reselecting same entity in list 2018-08-07 09:56:51 -07:00