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

25737 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
a5c5cc9b70 First Item really rendering , for the WorldBox, desigining more of the RenderContext and task interface 2015-05-27 01:15:14 -07:00
samcake
b90e04e451 Merge pull request #4965 from ZappoMan/team-teaching 
TEAM TEACHING- Merge from master
 2015-05-26 15:20:03 -07:00
ZappoMan
20ceb72d92 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-26 15:01:26 -07:00
Brad Hefta-Gaub
8a1e07fba7 Merge pull request #4963 from samcake/daft 
TEAM TEACHING BRANCH: First steps running the engine and the scene in the application to successfully render nothing
 2015-05-26 14:39:42 -07:00
Andrew Meadows
16e5710325 Merge pull request #4954 from ZappoMan/entitysmartpointers 
EnitityItem smart pointers
 2015-05-26 14:05:03 -07:00
Sam Gateau
e5755f52e5 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft 2015-05-26 13:57:10 -07:00
samcake
84525aabec Merge pull request #4959 from ZappoMan/team-teaching-entitysmartpointer 
TEAM TEACHING BRANCH - Entity Smart Pointers
 2015-05-26 13:56:47 -07:00
Sam Gateau
ad0b0cfade FIxing one more issue with compilation on ubuntu regarding the template functions specializationand the namespace 2015-05-26 11:40:35 -07:00
samcake
dd9d758da1 Fixing the compilation issue for real 2015-05-26 10:53:23 -07:00
Seth Alves
92c55d69ba Merge pull request #4944 from AndrewMeadows/bispinor 
avatar-avatar collisions work again
 2015-05-26 10:36:54 -07:00
ZappoMan
c4f96b09a2 sam's feedback on shared pointers in master 2015-05-26 09:55:28 -07:00
ZappoMan
c92e7bed87 andrews CR feedback 2015-05-26 09:44:02 -07:00
ZappoMan
5f6978a517 sam's CR feedback, more use of share_ptr<> 2015-05-26 09:41:51 -07:00
ZappoMan
d1520c5502 andrews CR feedback 2015-05-26 09:23:27 -07:00
Sam Gateau
0083ba6f85 trying again 2015-05-25 17:39:31 -07:00
Sam Gateau
ad054a640e Fixing a problem with Mac/ubuntu build maybe 2015-05-25 17:21:03 -07:00
samcake
ffca6a6502 Merge pull request #4935 from sethalves/sam-model-fixes 
fixes Sam made in my branch while trying to get a mesh to render
 2015-05-25 16:39:25 -07:00
Sam Gateau
f0ab6d96f5 merge with upstream team-teaching 2015-05-24 19:45:37 -07:00
Sam Gateau
35b8d45bee Insert a first scene and the engine in the Application and render a first Item 2015-05-24 17:03:43 -07:00
Brad Hefta-Gaub
c141f41cee Merge pull request #4960 from Atlante45/undef_ref 
Fix entityProperties.html undefined ref
 2015-05-24 12:41:11 -07:00
Atlante45
18812ab25f Fix entityProperties.html undefined ref 2015-05-24 19:21:04 +02:00
Brad Hefta-Gaub
8c0bf19536 Merge pull request #4956 from Triplelexx/particle-entityProperties 
expose particle properties for editing
 2015-05-23 12:02:16 -07:00
Brad Hefta-Gaub
4ffe573d0d Merge pull request #4957 from Atlante45/master 
Fix incorrect scale constants
 2015-05-23 11:47:43 -07:00
Atlante45
9e121aa387 Fix incorrect scale constants 2015-05-23 20:13:14 +02:00
Triplelexx
9a29489784 expose particle properties for editing 
I have made these changes to aid with experimenting with particles when
running the edit scripts locally.
 2015-05-23 17:57:25 +01:00
Clément Brisset
ec089ed6e8 Merge pull request #4955 from ZappoMan/team-teaching 
Team teaching - merge from master
 2015-05-23 07:47:57 +02:00
ZappoMan
bcac50b362 verify that entityitem cleanup is happening correctly 2015-05-22 22:39:41 -07:00
ZappoMan
43b1c1bf00 more work on smart pointers 2015-05-22 22:39:41 -07:00
ZappoMan
72ffd01920 more work on smart pointers 2015-05-22 22:39:37 -07:00
ZappoMan
9988f2d1cd EnitityItem smart pointers 2015-05-22 22:38:02 -07:00
ZappoMan
58c7b286ef Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-22 22:21:29 -07:00
Brad Hefta-Gaub
910c8549fc Merge pull request #4951 from huffman/ctx 
Team Teaching - Add gpu::context to RenderArgs and use RenderArgs in more render() methods
 2015-05-22 22:20:45 -07:00
Brad Hefta-Gaub
225021671a Merge pull request #4950 from ericrius1/particleScriptName 
renamed ajt-test to particles.js since ajt-test doesn't tell us anyth…
 2015-05-22 22:17:39 -07:00
Brad Hefta-Gaub
d7b2ca64cd Merge pull request #4949 from sethalves/octree-send-thread-adjustments 
entity-server sends initial planky more reliably
 2015-05-22 22:17:17 -07:00
ZappoMan
76c5bd1ab7 verify that entityitem cleanup is happening correctly 2015-05-22 22:01:25 -07:00
ZappoMan
31021c1dfd more work on smart pointers 2015-05-22 21:46:05 -07:00
ZappoMan
9fa9942861 more work on smart pointers 2015-05-22 21:45:57 -07:00
Brad Hefta-Gaub
b9766aaf70 Merge pull request #4952 from huffman/remove-scale-assert 
Temporarily remove isValidScale assert
 2015-05-22 18:40:15 -07:00
ZappoMan
8b78fc4190 EnitityItem smart pointers 2015-05-22 17:57:50 -07:00
Ryan Huffman
43317bc829 Temporarily remove isValidScale assert 2015-05-22 17:00:39 -07:00
Ryan Huffman
822ae800c5 Update Model::endScene to require RenderArgs 2015-05-22 16:17:01 -07:00
Ryan Huffman
8380eec03b Update Model::renderCore to use RenderArgs 2015-05-22 16:10:43 -07:00
Ryan Huffman
47d9cf42c5 Remove unused lodManager 2015-05-22 16:04:05 -07:00
Ryan Huffman
05f8ba558f Update RenderArgs construction in paintGL 2015-05-22 16:02:24 -07:00
Ryan Huffman
7be646d62e Make gpu::context the first RenderArgs ctor parameter 2015-05-22 16:02:10 -07:00
Ryan Huffman
1d12744781 Remove commented out code 2015-05-22 15:34:19 -07:00
Ryan Huffman
bffcfa2ab8 Add cache sync flag in Context::enqueueBatch 2015-05-22 15:34:05 -07:00
Ryan Huffman
d1a5662ca7 Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
 2015-05-22 15:33:40 -07:00
Eric Levin
71c0aa4913 renamed ajt-test to particles.js since ajt-test doesn't tell us anything about what the script does 2015-05-22 15:33:38 -07:00
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00