Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 16:36:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33467 commits 74 branches 59 tags 1.2 GiB
Commit graph

33467 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
3897716ff5 Simplifying the DrawOpaqueStencil Pixel shader 2015-10-08 17:49:55 -07:00
samcake
d7dd90f87e Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-08 16:47:59 -07:00
samcake
bad5ea7d53 grouping the depth and stencil buffer into a single buffer 2015-10-08 16:47:33 -07:00
James B. Pollack
62728aa507 alignments 2015-10-08 16:16:11 -07:00
Anthony Thibault
5692e3ba2d Merge pull request #6030 from birarda/av-pl-assert 
fix for segmented unordered packet writes in PacketList
 2015-10-08 15:56:56 -07:00
Stephen Birarda
aa2a8edc6f use _segmentStartIndex before changing its value 2015-10-08 15:44:18 -07:00
Stephen Birarda
0d9421a65e constantize the PacketList write error 2015-10-08 15:40:49 -07:00
Stephen Birarda
519df1565a fix comment format in PacketList 2015-10-08 15:38:41 -07:00
Stephen Birarda
dc4f987a2e fix segmented write logic in PacketList 2015-10-08 15:38:41 -07:00
samcake
f105803958 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-08 15:25:32 -07:00
James B. Pollack
d77abc2aba Merge branch 'wall_targets' of https://github.com/imgntn/hifi into wall_targets 2015-10-08 14:08:09 -07:00
James B. Pollack
b1db1db6da Merge remote-tracking branch 'upstream/master' into wall_targets 2015-10-08 14:06:23 -07:00
Stephen Birarda
8ce3ee0d60 have nodes be cleaned up on the NL thread 2015-10-08 13:22:43 -07:00
Ryan Huffman
26c40adecb Merge pull request #6023 from ZappoMan/animationGroupSettings 
Fixes to isEmitting for ParticleEffects
 2015-10-08 12:24:36 -07:00
samcake
eacbcf2881 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-08 12:06:34 -07:00
samcake
dff598ebd1 clening and getting ready for pr 2015-10-08 12:06:09 -07:00
James B. Pollack
a75f2f3c22 Merge pull request #2 from ericrius1/wall_targets 
Aligned targets on wall in toybox
 2015-10-08 12:04:17 -07:00
samcake
01d39bd614 Merge pull request #6025 from sethalves/fix-obj-model-meshes 2015-10-08 11:57:26 -07:00
Clément Brisset
8e2ce379e1 Merge pull request #6024 from ericrius1/entityResetTweaks 
Moved entity reset switch, fixed some style issues
 2015-10-08 11:56:01 -07:00
Brad Hefta-Gaub
f141026990 CR feedback 2015-10-08 11:48:48 -07:00
Brad Hefta-Gaub
a8d1622481 CR feedback 2015-10-08 11:47:54 -07:00
ericrius1
6921e0f022 Aligned targets on wall in toybox 2015-10-08 11:38:02 -07:00
Stephen Birarda
7987595dcd set the bearer poll timeout for wlan scan in Qt 5.5 2015-10-08 11:32:10 -07:00
Seth Alves
3db148f3dc fix obj model meshes 2015-10-08 11:13:52 -07:00
Thijs Wenker
f140617896 Merge branch 'master' of https://github.com/worklist/hifi 2015-10-08 19:59:02 +02:00
James B. Pollack
97d4fb20c2 Merge remote-tracking branch 'upstream/master' 2015-10-08 10:34:21 -07:00
ericrius1
b7f52ea542 Moved entity reset switch, fixed some style issues 2015-10-08 10:11:21 -07:00
Brad Hefta-Gaub
9f0721c08b Merge pull request #6020 from ericrius1/grabFarNonColliding 
Added grab far events for non physical objects
 2015-10-08 09:56:22 -07:00
ericrius1
aac372cc8a Fixed styling errors 2015-10-08 09:53:06 -07:00
Brad Hefta-Gaub
39f2241eac fix coding standard issue 2015-10-08 09:46:43 -07:00
samcake
c7049bad39 Backing up on any changes regarding shading, focus on the rearr view mirror and stencil bug 2015-10-08 09:32:05 -07:00
Brad Hefta-Gaub
e1b69a1704 Merge pull request #6022 from jherico/lisa 
Fix mouse events for entity scripts
 2015-10-07 20:43:41 -07:00
Brad Hefta-Gaub
7c286a41db Merge pull request #6019 from ericrius1/entityReset 
Adding a discreet entity to toybox that, when a user clicks on it, or near grabs it, will reset toybox
 2015-10-07 20:38:07 -07:00
Brad Hefta-Gaub
65473cadcb Merge pull request #6021 from jherico/homer 
Support reload-on-change for local scripts
 2015-10-07 20:34:15 -07:00
Brad Hefta-Gaub
bb10d8a7d5 more work on rationalizing particle properties 2015-10-07 20:08:30 -07:00
Brad Hefta-Gaub
b479dd0a12 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-07 19:55:01 -07:00
Brad Hefta-Gaub
02a24712ca fix isEmitting property for particle effects, cleaned up some particle property editing in edit.js 2015-10-07 19:52:29 -07:00
Brad Davis
50592a87a6 Fix mouse events for entity scripts 2015-10-07 19:44:08 -07:00
Brad Davis
99d1e17ae8 Support reload-on-change for local scripts 2015-10-07 19:18:59 -07:00
samcake
a2ca1c033d FIxing the rear view mirror issue with background and fooling around with Lighting equations 2015-10-07 19:04:03 -07:00
Howard Stearns
bd0d1eaef6 Merge branch 'master' of https://github.com/highfidelity/hifi into align-body-to-head-on-reset 2015-10-07 18:35:52 -07:00
James B. Pollack
7a7b16f0a2 wall targets 2015-10-07 18:16:58 -07:00
ericrius1
efc2dfb68f Added grab far events for non physical objects 2015-10-07 18:06:37 -07:00
ericrius1
3e822dbfc6 Adding far grab event to reset switch 2015-10-07 18:03:17 -07:00
Eric Levin
a6e1fbd50f Merge pull request #6014 from ctrlaltdavid/20699 
Sanitize particle properties, fix crashes
 2015-10-07 17:19:29 -07:00
ericrius1
f230dcd1c0 Fixed headers 2015-10-07 17:07:43 -07:00
ericrius1
3dd74a33d3 new attempt 2015-10-07 16:50:10 -07:00
ericrius1
18155f968b adding logging 2015-10-07 16:29:55 -07:00
ericrius1
032e503be6 change 2015-10-07 16:22:13 -07:00
ericrius1
54d82e6cc6 testing one 2015-10-07 16:10:21 -07:00