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

26289 commits

This branch
This branch
All branches
Author SHA1 Message Date
Clément Brisset
6ebc3d8f8c Merge pull request #5047 from ZappoMan/team-teaching-optimize-offset 
TEAM TEACHING - optimize part offset calculation
 2015-06-04 21:11:07 +02:00
ZappoMan
3593afea3b optimize part offset calculation 2015-06-04 11:37:02 -07:00
Brad Hefta-Gaub
2dd2e30707 Merge pull request #5046 from ZappoMan/team-teaching 
TEAM TEACHING - merge from master
 2015-06-04 09:40:00 -07:00
ZappoMan
d2deef97cc Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-04 09:24:37 -07:00
Brad Hefta-Gaub
50f44c801a Merge pull request #5045 from Atlante45/fix_world_box 
Team Teaching - Temporary fix for models index offset
 2015-06-04 09:16:31 -07:00
Clément Brisset
7ffe7b31a6 Merge pull request #5041 from ZappoMan/team-teaching-all-entities 
TEAM TEACHING - overlays and entities, fix to shrunken avatars
 2015-06-04 18:00:44 +02:00
Atlante45
31d257db09 Temporary fix for models index offset 2015-06-04 17:58:44 +02:00
ZappoMan
c4756f4816 remove dead code 2015-06-04 08:49:26 -07:00
ZappoMan
4b389793ad CR feedback 2015-06-04 08:42:10 -07:00
Brad Hefta-Gaub
b62aa21c6e Merge pull request #5042 from Atlante45/line 
Team teaching - Line entities render to batch
 2015-06-04 08:40:07 -07:00
Brad Hefta-Gaub
a534753847 Merge pull request #5043 from Atlante45/fix_world_box 
Team Teaching - Fix world box
 2015-06-04 07:54:14 -07:00
Atlante45
54b0a03fae Fix wrong enum used 2015-06-04 13:56:21 +02:00
Atlante45
6dc3bf9285 Fix world box messing up everything 2015-06-04 13:48:39 +02:00
Atlante45
ab9cfac672 Restore line width 2015-06-04 11:35:41 +02:00
Atlante45
78e9c5870b Line updateGeometry in render 2015-06-04 10:56:48 +02:00
Atlante45
504be28143 Remove unused variables 2015-06-04 10:55:51 +02:00
Atlante45
166eff7df1 Fix line entity rendering 2015-06-04 10:54:57 +02:00
Atlante45
e421485908 Add glLineWidth to Batch/GLBackend 2015-06-04 10:54:13 +02:00
ZappoMan
54c4cb829a fixed the shrunken avatar part bug 2015-06-03 21:49:48 -07:00
ZappoMan
f1f48afd61 more hacking on overlay build busters 2015-06-03 21:17:10 -07:00
ZappoMan
8ec2b55ad8 more hacking on overlay build busters 2015-06-03 21:06:08 -07:00
ZappoMan
b5b37ce2f5 more hacking on overlay build busters 2015-06-03 20:53:56 -07:00
ZappoMan
4438263014 more hacking on overlay build busters 2015-06-03 20:46:59 -07:00
ZappoMan
042384c5e2 light rendering as payload 2015-06-03 20:46:47 -07:00
ZappoMan
6eb9091a01 fix build buster 2015-06-03 20:30:01 -07:00
ZappoMan
bb623eaaed fix build buster 2015-06-03 19:53:21 -07:00
ZappoMan
49fa407cd5 fix build buster 2015-06-03 17:57:23 -07:00
Brad Davis
a12fd5c3d0 Merge pull request #5023 from AndrewMeadows/bispinor 
fix crash in ~OffscreenGlCanvas on linux shutdown
 2015-06-03 17:21:39 -07:00
ZappoMan
c6fb22b915 make sure all entities are rendering in pipeline part 1 2015-06-03 17:16:45 -07:00
ZappoMan
7fde574a2a make model overlays acutally use sub mesh payload items 2015-06-03 16:33:58 -07:00
Stephen Birarda
cf67d22ec7 Merge pull request #5036 from venkatn93/master 
Fixed snapshot bug. Snapshots now save and load ok
 2015-06-03 18:57:29 -04:00
Niraj Venkat
29a15453ac Visual studio tab issues fixed 2015-06-03 15:35:04 -07:00
Niraj Venkat
4db110a6e1 Final fixes. Snapshot should be good now 2015-06-03 15:09:45 -07:00
Niraj Venkat
92248d23e7 more indentation changes 2015-06-03 14:59:07 -07:00
Niraj Venkat
694272ffaa "fixed" formatting issues and code cleanup 2015-06-03 14:48:25 -07:00
Niraj Venkat
57004c61c7 Fixed snapshot bug. Snapshots now save and load ok 2015-06-03 14:29:39 -07:00
Brad Hefta-Gaub
f70ff2291b Merge pull request #5035 from ZappoMan/team-teaching 
Team teaching - merge from master
 2015-06-03 13:09:34 -07:00
ZappoMan
6ba8d7e46b Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-03 13:00:30 -07:00
Brad Hefta-Gaub
136336b652 Merge pull request #5031 from huffman/world-box-batch 
Team teaching - render world box using batches
 2015-06-03 12:43:52 -07:00
Ryan Huffman
d6878c20b5 Merge branch 'team-teaching' of github.com:highfidelity/hifi into world-box-batch 2015-06-03 12:03:44 -07:00
Ryan Huffman
27707c8933 Merge pull request #5034 from samcake/daft 
TEAM-TEACHING: Adding a debug tool
 2015-06-03 11:49:56 -07:00
Sam Gateau
730d455095 adding a debug tool 2015-06-03 11:35:37 -07:00
Sam Gateau
b339aa683a adding caps for opaque and transparent draw jobs and the ui in js so we can debug the rendered items 2015-06-03 11:25:45 -07:00
Clément Brisset
f553243bb8 Merge pull request #5032 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING - merge from master
 2015-06-03 19:47:40 +02:00
ZappoMan
7c40b666e8 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-03 09:52:40 -07:00
Ryan Huffman
8864a1f298 Merge branch 'team-teaching' of github.com:highfidelity/hifi into world-box-batch 2015-06-03 09:38:17 -07:00
Andrew Meadows
b0fdb0413c Merge pull request #5024 from ctrlaltdavid/20561 
CR for #20561 - Fix address bar dialog text
 2015-06-03 09:33:29 -07:00
Brad Hefta-Gaub
8b120ea8cd Merge pull request #5029 from huffman/avatar-batches 
Team Teaching - Avatar batches
 2015-06-03 09:06:10 -07:00
Ryan Huffman
b8f3c42712 Update renderWorldBox to use batches 2015-06-03 09:03:04 -07:00
samcake
d4fddad176 Merge pull request #5030 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING - rendering avatar models as payload parts
 2015-06-03 00:27:09 -07:00