Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61323 commits 71 branches 56 tags 1.2 GiB
Commit graph

61323 commits

This branch
This branch
All branches
Author SHA1 Message Date
SamGondelman
7686948daf resolve conflicts and cleanup 2017-10-20 15:23:17 -07:00
Zach Fox
fbd393d918 Add newline to cert ID when updating location 2017-10-20 15:10:24 -07:00
Seth Alves
2b0285adc2 fix action (grab) deadlock 2017-10-20 15:05:21 -07:00
SamGondelman
fb969964f3 generalized scripting interfaces 2017-10-20 14:37:10 -07:00
Brad Hefta-Gaub
87294b8e67 Merge pull request #11638 from ZappoMan/fixWireframe 
fix the rendering of wireframe for model entities with bad model URLs
 2017-10-20 14:29:01 -07:00
Nissim
5d0deaf946 Code review fixes. 2017-10-20 14:27:27 -07:00
Zach Fox
d255b36236 Merge pull request #11639 from zfox23/contextOverlayPositionFix 
Context Overlay (i) Position Fix
 2017-10-20 14:00:45 -07:00
Nissim
00c99d3d02 Corrected wrong else format. 2017-10-20 13:53:53 -07:00
Brad Hefta-Gaub
26ea8bea6a Merge pull request #11612 from highfidelity/pointers 
Fix tablet intersection bug and start of Pointer migration work (WIP)
 2017-10-20 13:53:52 -07:00
Brad Hefta-Gaub
f6af1d1ecf Merge pull request #11387 from vladest/tablet_extended_sounds 
Tablet extended sounds
 2017-10-20 13:49:06 -07:00
Brad Hefta-Gaub
d6ad389dab Merge pull request #11611 from AndrewMeadows/faster-update-renderables 
Faster renderables update
 2017-10-20 13:43:08 -07:00
Nissim
b976dbd224 Merge branch 'master' into hazeZone 2017-10-20 13:33:01 -07:00
Nissim
b0ca1353e4 Implemented Haze mode default. 2017-10-20 13:32:27 -07:00
Zach Fox
7b3a6f9967 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-20 13:28:03 -07:00
Zach Fox
61a12a70c0 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into contextOverlayPositionFix 2017-10-20 13:16:31 -07:00
Howard Stearns
c77fbe1a9d Merge pull request #11637 from zfox23/hackInspectionCert 
Fix Entity Certificate display upon inspection in RC-57
 2017-10-20 13:10:41 -07:00
ZappoMan
27ffb97a07 Merge branch 'master' of https://github.com/highfidelity/hifi into fixWireframe 2017-10-20 12:31:35 -07:00
ZappoMan
ef0ff96a44 fix the rendering of wireframe for model entities with bad model URLs 2017-10-20 11:46:28 -07:00
Zach Fox
c217992866 Order of operations lol 2017-10-20 11:42:03 -07:00
Ryan Huffman
de195dd844 Merge pull request #11585 from huffman/fix/draco-material-ids 
Fix baking bug with single-part FBX + multiple materials
 2017-10-20 11:32:31 -07:00
SamGondelman
24ce09f914 generalized pointer, laserpointermanager -> pointermanager 2017-10-20 11:28:48 -07:00
Zach Fox
ae1b2bd931 'Tis a silly hack 2017-10-20 11:11:23 -07:00
vladest
908d601a43 Code style fixes #1 2017-10-20 20:00:11 +02:00
Zach Fox
c0ab320da6 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-20 10:40:35 -07:00
Zach Fox
9e68e805a0 Get marketplace public key from backend 2017-10-20 10:38:59 -07:00
Seth Alves
9d00606505 Merge pull request #11635 from druiz17/fix-hud-issues 
actually fix toolbar from completely dispersing
 2017-10-20 10:22:34 -07:00
Howard Stearns
352243c01b Merge pull request #11629 from zfox23/wearItButton 
REZ IT -> WEAR IT
 2017-10-20 09:36:09 -07:00
Seth Alves
f8a01dffb0 Merge pull request #11633 from sethalves/pr-11581-for-rc-57 
Pr 11581 for rc 57
 2017-10-20 09:00:08 -07:00
vladest
fa349a694c Code style fixes 2017-10-20 15:12:09 +02:00
vladest
ea6c2e1bb5 Merge branch 'master' into tablet_extended_sounds 2017-10-20 14:46:02 +02:00
Zach Fox
c99e803ab7 Error handling 2017-10-19 17:19:37 -07:00
Nissim
0f519da76e Additional protection for mode. 2017-10-19 17:16:36 -07:00
Stephen Birarda
8976961bfb add build config to draco install dir 2017-10-19 17:04:39 -07:00
SamGondelman
d7745efc8e one global pickmanager 2017-10-19 16:55:24 -07:00
Zach Fox
74180bc4cd Implement static cert verification correctly 2017-10-19 16:39:13 -07:00
Zach Fox
0dc6211a7d Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-19 14:43:33 -07:00
Nissim
d01ecb71df Fixed gcc warning. 2017-10-19 14:41:02 -07:00
Zach Fox
b3acdfa9d8 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into wearItButton 2017-10-19 14:37:47 -07:00
Andrew Meadows
c79bf3bc04 cleanup WANT_DETAILED_PROFILING 2017-10-19 14:31:50 -07:00
Nissim
e314ee432e Fixed gcc warning. 2017-10-19 14:20:47 -07:00
druiz17
f2ad61934b fix toolbar from completely dispearing 2017-10-19 14:02:21 -07:00
Stephen Birarda
23563cca47 Merge pull request #11592 from birarda/bug/ignore-dds-in-fbx 
ignore unbakeable textures in FBXBaker
 2017-10-19 15:51:41 -05:00
Nissim
9af87d46f2 Removed optimize pragma. 2017-10-19 13:51:33 -07:00
SamGondelman
3572f7f5db non-templated pickresult wip 2017-10-19 13:41:16 -07:00
Nissim
61fc45c6bf Merge branch 'master' into hazeZone 2017-10-19 13:39:18 -07:00
Nissim
edd256c600 Fixed crash on invalid HazeMode. 2017-10-19 13:36:32 -07:00
Seth Alves
2c8c5e214c puff querybox if entity is in motion 2017-10-19 13:19:41 -07:00
Seth Alves
e8ca455547 cleanups + call updateQueryAACube when parent changes or action is deleted 2017-10-19 13:19:35 -07:00
Seth Alves
c1e8d5144c remove code which is no longer needed because of custom physics setters 2017-10-19 13:19:25 -07:00
Seth Alves
633f63df54 fix updateQueryAACube return-value 2017-10-19 13:19:19 -07:00