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

64648 commits

This branch
This branch
All branches
Author SHA1 Message Date
SamGondelman
6fe2d46d7c merge 2018-02-26 12:40:14 -08:00
humbletim
3dbe5d79bb fix windows punctilious warnings 2018-02-26 06:01:16 -05:00
humbletim
54dc0240b0 remove bufferviewscripting refs; fix compiler warnings 2018-02-26 05:26:35 -05:00
humbletim
f824edd04e * remove Model_temporary_hack 
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
 2018-02-26 04:58:22 -05:00
SamGondelman
b56f755034 material reflection 2018-02-23 17:58:46 -08:00
SamGondelman
c1d9726e35 Merge remote-tracking branch 'humbletim/Leopoly_Phase1_010_graphics-scripting' into scriptableMaterials 2018-02-23 10:56:46 -08:00
humbletim
7c571cd431 cleanup / addition error message detail 2018-02-23 10:31:57 -05:00
humbletim
058e4d1926 CR feedback; whitespace / remove unnecessary diffs 2018-02-23 09:12:33 -05:00
humbletim
f8fe06213d CR feedback; whitespace / remove unnecessary diffs 2018-02-23 09:11:23 -05:00
humbletim
ebdb5b3c17 CR feedback; remove unrollVertices; update getFace; guard more debug logging 2018-02-23 08:57:48 -05:00
humbletim
6ea4b660b7 CR feedback; remove ok bool pointer and all metadata; cleanup 2018-02-23 07:47:39 -05:00
humbletim
0dd3672162 CR feedback / cleanup 2018-02-22 21:20:56 -05:00
humbletim
d1c4bde677 revert OBJWriter.cpp 2018-02-22 20:53:27 -05:00
SamGondelman
a9b08e97f4 merge 2018-02-22 13:52:43 -08:00
humbletim
dd90c8c515 fix ubuntu compile warnings 2018-02-22 10:16:34 -05:00
humbletim
010c714abc restore original Entities.getMeshes 2018-02-22 08:51:54 -05:00
humbletim
4d43e54346 use shared buffer_helpers::clone 2018-02-22 08:41:15 -05:00
humbletim
b0f444e179 remove dead code 2018-02-22 08:36:37 -05:00
humbletim
ec4f9fdc11 fix displayName 2018-02-22 08:31:05 -05:00
humbletim
d52dce8e09 restore code for debugging 2018-02-22 08:24:56 -05:00
humbletim
e3c269d582 remove debug string 2018-02-22 08:22:13 -05:00
humbletim
4fd3d9bf7b cleanup; formalize data structures 2018-02-22 08:18:38 -05:00
humbletim
fe9b67344b remove unnecessary UUID check 2018-02-22 07:58:49 -05:00
humbletim
e4a2a589a5 CR fedback and cleanup 2018-02-22 07:56:09 -05:00
humbletim
caab532d80 remove dupe line 2018-02-22 06:00:03 -05:00
humbletim
72fca7e57e Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge 2018-02-22 05:18:05 -05:00
humbletim
be8d79f53f CR fedback and cleanup 2018-02-22 05:15:01 -05:00
SamGondelman
8f2a23dac7 merge and a little cleanup 2018-02-20 15:48:18 -08:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
SamGondelman
4f0f6709c1 fix build errors 2018-02-20 13:56:06 -08:00
Ryan Huffman
acda90577a
Merge pull request #11997 from ZappoMan/oldPropsFilters 
giving more info to entity edit filters to allow more flexibility
 2018-02-20 12:57:44 -08:00
John Conklin II
6148c407a5
Merge pull request #12422 from misslivirose/fix-overlay-lines 
Show outline for zones when rotating
 2018-02-20 09:30:22 -08:00
John Conklin II
aa67a98d02
Merge pull request #12426 from ElderOrb/FB11508 
fix for toolbar slowly drifting on switching between HMD/Desktop modes
 2018-02-20 09:30:01 -08:00
humbletim
5791ca4c51 interim checkin 2018-02-20 12:22:04 -05:00
ZappoMan
76d611d563 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-19 19:15:33 -08:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals 
Material Entities
 2018-02-19 10:58:02 -08:00
Brad Hefta-Gaub
0ef2794c35
Merge pull request #12395 from druiz17/fix-qml-tablet-apps 
Prevent adding the same tablet url to the tabletApps list
 2018-02-18 19:10:24 -08:00
Brad Hefta-Gaub
a4783ded15
Merge pull request #12414 from hyperlogic/bug-fix/scramlbed-avaatrs 
Bug fix for Scrambled Avatars
 2018-02-18 19:06:53 -08:00
Brad Hefta-Gaub
d0b0fcba9a
Merge pull request #12436 from cain-kilgore/patch-1 
Fixed extra " in backup_instructions.html
 2018-02-18 19:06:24 -08:00
Cain Kilgore
47ed45b5e9
Fixed extra " in backup_instructions.html 2018-02-17 18:14:44 +00:00
Stephen Birarda
311b9388d6
Merge pull request #12424 from birarda/bug/settings-response-filter 
fix overwrite of general description object with filtered
 2018-02-16 10:57:58 -07:00
John Conklin II
24a3eb6e80
Merge pull request #12419 from druiz17/fix-edit-avatar-entities 
Don't update avatar entities of the avatars ID is AVATAR_SELF_ID
 2018-02-16 09:48:19 -08:00
Alexander Ivash
2eb8ebcdbc FB11508 - toolbar slowly sides downward 2018-02-16 20:22:16 +03:00
MiladNazeri
331b253ba0
Merge pull request #12386 from cain-kilgore/21668 
WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null
 2018-02-16 06:57:03 -08:00
Stephen Birarda
81662b5edc don't overwrite general description object with filtered one 2018-02-15 19:14:14 -08:00
SamGondelman
2d0b85af72 workaround bug 2018-02-15 17:28:59 -08:00
Liv Erickson
175532c444 show outline for zones when rotating 2018-02-15 15:51:54 -08:00
Sam Gateau
f809862870
Merge pull request #12412 from samcake/blue 
Introduce task abort feature for early exit of task branch
 2018-02-15 15:50:43 -08:00
SamGondelman
b189433855 merge 2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00