Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 02:26:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
26261 commits 76 branches 59 tags 1.2 GiB
Commit graph

26261 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
27d932bed4 Merge branch 'team-teaching' into entities 2015-05-29 18:07:43 +02:00
Brad Davis
8bad80324f Merge branch 'master' into plugins_pt3 2015-05-29 09:05:01 -07:00
Ryan Huffman
2222468e89 Remove Overlays::renderWorld 2015-05-29 08:53:40 -07:00
Atlante45
ab13bc41a4 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-05-29 17:53:17 +02:00
Ryan Huffman
b2c503af0e Add NO_DEPTH_SORT ItemKey flag 2015-05-29 08:52:37 -07:00
Ryan Huffman
874f722504 Remove unused Avatar::Pointer typedef 2015-05-29 08:51:37 -07:00
Ryan Huffman
1089490658 Move overlay rendering to Scene 2015-05-29 08:51:25 -07:00
Atlante45
ad2d4d5e85 PolyVox entities render in Batch 2015-05-29 17:44:41 +02:00
ZappoMan
78c701a89d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-29 08:40:46 -07:00
Brad Hefta-Gaub
0380be7550 Merge pull request #4997 from Atlante45/text-renderer 
TEAM TEACHING - Web entities render in batch
 2015-05-29 08:38:02 -07:00
Atlante45
0384b74479 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-29 17:37:53 +02:00
Brad Hefta-Gaub
fdded9e0bd Merge pull request #4998 from Atlante45/entities 
TEAM TEACHING - Update setDimension/Reactivate isValidScale asserts
 2015-05-29 08:35:10 -07:00
Atlante45
75788a3c51 Reactivate Transform asserts 2015-05-29 17:05:56 +02:00
Atlante45
f07f9ac0c5 Expand setDimensions check to negative values 2015-05-29 17:04:39 +02:00
Atlante45
212007aa6f Cleanup simple fragmen shaders 2015-05-29 16:53:53 +02:00
Atlante45
1d336b76de Web entities render in Batch 2015-05-29 16:51:48 +02:00
Atlante45
0770f88606 Add glTexParamteri to GLBackend/Batch 2015-05-29 16:50:11 +02:00
Atlante45
51570aac68 Add simple textured pipeline 2015-05-29 16:49:31 +02:00
Atlante45
34072c55e3 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer 2015-05-29 16:16:06 +02:00
Seth Alves
0cf9afd8ec attempt to save _created as an iso date in utc 2015-05-28 21:21:57 -07:00
Sam Gateau
dd9cafcd09 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-28 18:14:41 -07:00
Sam Gateau
3f8bdc14c4 reinserting culling, lod and depth sort to the rendering 2015-05-28 18:01:31 -07:00
ZappoMan
eb19b93433 render models in scene checkpoint 2015-05-28 17:19:30 -07:00
Stephen Birarda
5749fefcd5 have show DS connect refresh existing dialog 2015-05-28 17:07:57 -07:00
Stephen Birarda
7f86ca3f10 refresh the network dialog if it is already up 2015-05-28 17:07:20 -07:00
Stephen Birarda
cb7b23f346 install DS message handler in DomainServer 2015-05-28 17:04:15 -07:00
Stephen Birarda
046828ee5d make the LNL the parent of any Nodes it adds 2015-05-28 16:58:58 -07:00
Stephen Birarda
29d3ca85d9 cleanup debug logs for DS/node ping punch 2015-05-28 16:53:13 -07:00
Stephen Birarda
265e0f3da6 remove NetworkPeer dtor debug, fix ICE socket 2015-05-28 16:44:34 -07:00
Andrew Meadows
ac0609ea92 also render bbox when debugging simulator owner 2015-05-28 16:29:43 -07:00
Stephen Birarda
493a9da43e make sure DS log handler is cleaned up 2015-05-28 16:23:14 -07:00
Seth Alves
6b8b930839 Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property 2015-05-28 16:16:13 -07:00
Eric Levin
3627f03c0d drawing lines relative to position 2015-05-28 16:00:24 -07:00
Eric Levin
533148f26d line being sent as array 2015-05-28 15:48:31 -07:00
Stephen Birarda
9d2e1773a0 fix memory issues for immediate ice pings 2015-05-28 15:31:21 -07:00
Leonardo Murillo
f8cd670463 Merge pull request #4993 from sethalves/fix-polyvox-in-assignment 
libraries/entities doesn't need polyvox, only libraries/entities-rend…
 2015-05-28 15:52:47 -06:00
Stephen Birarda
da0c9fbc31 fix send of existing peer to querier 2015-05-28 14:37:16 -07:00
Eric Levin
4d4a90e9ce removed render debugging 2015-05-28 14:30:34 -07:00
Seth Alves
94edb72b47 oops 2015-05-28 14:30:06 -07:00
Seth Alves
131827a82b libraries/entities doesn't need polyvox, only libraries/entities-renderer 2015-05-28 14:27:49 -07:00
Stephen Birarda
e096cbe040 have ice-server immediately send peer to DS 2015-05-28 14:25:18 -07:00
Andrew Meadows
7be16da1a8 compute correct time-of-flight for extrapolation 2015-05-28 14:24:39 -07:00
Eric Levin
2d66696675 line working from array of points 2015-05-28 14:18:57 -07:00
Howard Stearns
e7a48af56d Merge branch 'master' of https://github.com/highfidelity/hifi into preload-collision-sounds 2015-05-28 14:15:51 -07:00
Howard Stearns
6b3c51c5b7 Merge pull request #4990 from AndrewMeadows/isentropic 
fix crash when creating a box with edit.js
 2015-05-28 14:14:45 -07:00
Stephen Birarda
531ef1fa1c change ice-server heartbeat behaviour 2015-05-28 14:05:43 -07:00
Howard Stearns
243ffbc74b Merge branch 'master' of https://github.com/highfidelity/hifi into preload-collision-sounds 2015-05-28 13:53:59 -07:00
Brad Hefta-Gaub
1c3398f27e Merge pull request #4991 from ZappoMan/team-teaching 
TEAM TEACHING - merge from master
 2015-05-28 13:52:18 -07:00
Howard Stearns
0f30ec2ccc Undo the merge with the broken master checking. What could go wrong? 2015-05-28 13:48:27 -07:00
samcake
191fedb598 Merge pull request #4989 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING - first cut at allowing entities to add/remove their own Scene Items
 2015-05-28 13:39:22 -07:00