Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-15 16:09:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25784 commits 75 branches 59 tags 1.2 GiB
Commit graph

312 commits

Author SHA1 Message Date
ZappoMan
2fba5a0928 more work on simple renderable 2015-05-28 12:19:43 -07:00
ZappoMan
806ee88f1f place burden of adding/removing to/from scene on entity 2015-05-28 09:43:36 -07:00
ZappoMan
3f14a7a262 allow entities to have multiple items 2015-05-27 21:00:20 -07:00
ZappoMan
5ad9efbee4 allow entities to tell us if they support proper scene rendering 2015-05-27 20:42:53 -07:00
ZappoMan
b0cc536f53 debug cleanup 2015-05-27 16:55:02 -07:00
ZappoMan
37a291275d more work on rendering in engine 2015-05-27 16:46:44 -07:00
ZappoMan
a56e0d80b6 more work on renderable entities 2015-05-27 15:30:55 -07:00
ZappoMan
8c9cf480f3 more hacking 2015-05-27 13:23:59 -07:00
ZappoMan
007aed7a0a Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-27 10:51:50 -07:00
ZappoMan
1a7c6eb316 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-27 10:41:01 -07:00
ZappoMan
2516066e1d some hacking 2015-05-27 10:40:07 -07:00
Brad Hefta-Gaub
afb09e81a6 Merge pull request #4962 from howard-stearns/entity-events-in-normal-scripts 
Entity events in normal scripts
 2015-05-27 09:24:50 -07:00
ZappoMan
0799670215 simple entity payload 2015-05-26 16:27:00 -07:00
ZappoMan
25823bedd1 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-26 15:51:46 -07:00
ZappoMan
20ceb72d92 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-26 15:01:26 -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
Howard Stearns
bbdf9f1d9f Remove changingEntityID. 2015-05-26 11:14:23 -07:00
ZappoMan
c4f96b09a2 sam's feedback on shared pointers in master 2015-05-26 09:55:28 -07:00
ZappoMan
5f6978a517 sam's CR feedback, more use of share_ptr<> 2015-05-26 09:41:51 -07:00
Howard Stearns
1b134d60d5 Fix typo that messed up the otherEntity for collisions. 2015-05-25 15:46:55 -07:00
Howard Stearns
4266a99d78 Put the javascript methods on Script, not Entities, and other minimum-diff cleanup. 2015-05-25 11:28:33 -07:00
Howard Stearns
1dd2b7275e Simpler and more uniform version that handles all the standard entity-script events. 2015-05-23 18:11:05 -07:00
Howard Stearns
277f5ef3a4 Working experimental first version. 2015-05-23 13:35:35 -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
9fa9942861 more work on smart pointers 2015-05-22 21:45:57 -07:00
ZappoMan
8b78fc4190 EnitityItem smart pointers 2015-05-22 17:57:50 -07:00
Ryan Huffman
822ae800c5 Update Model::endScene to require RenderArgs 2015-05-22 16:17:01 -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
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
ZappoMan
160898ce96 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-22 14:55:29 -07:00
ZappoMan
d9ed1e061c Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-22 14:54:47 -07:00
ZappoMan
4bdeef7610 checkpoint 2015-05-22 14:54:30 -07:00
David Rowe
a01830f8f8 Fix some double to float conversion warnings in Windows builds 2015-05-22 12:32:02 -07:00
Atlante45
20ff43e29a Don't sync by default 2015-05-22 20:29:25 +02:00
Ryan Huffman
66dc555ba9 Remove context->enqueueBatch from RenderableBoxEntityItem 2015-05-22 09:59:34 -07:00
Ryan Huffman
4a4c9c75fc Add gpu::context to RenderArgs and start using RenderArgs in place of the flags 2015-05-22 09:50:51 -07:00
Clément Brisset
e980859059 Simple Program uses gpu API 2015-05-22 16:14:32 +01:00
ZappoMan
0d9f0f609b first cut at RenderableEnitityItem payload 2015-05-21 16:22:23 -07:00
ZappoMan
c7fb8fab85 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-21 10:36:22 -07:00
ZappoMan
e1c5c5b12e Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-20 18:42:54 -07:00
Seth Alves
782402b4c8 Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 14:53:05 -07:00
Brad Hefta-Gaub
39ab2f43bf Merge pull request #4885 from Atlante45/warings 
Quiet warnings
 2015-05-20 14:45:55 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
f522334c99 sort out script interface changes 2015-05-20 12:30:06 -07:00
Howard Stearns
c5b8dd51d8 Fix https://app.asana.com/0/32622044445063/34195351184789 
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
 2015-05-20 11:07:03 -07:00
Seth Alves
a769cfdaf2 client decides on new entity-ids, keep EntityItemID class 2015-05-20 10:42:19 -07:00
Atlante45
ee4b28b6b9 Other TextRenderer memory leak 2015-05-20 16:56:04 +02:00
Atlante45
9a007ab135 Remove unused method 2015-05-20 16:50:31 +02:00
Atlante45
e5d0851337 Remove unnecessary glPush/Pop 2015-05-20 16:29:43 +02:00