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

69 commits

Author SHA1 Message Date
Brad Hefta-Gaub
020fb25ace CR feedback 2015-09-18 14:24:01 -07:00
Brad Hefta-Gaub
416acb1d4a remove call to _entities.render() in displaySide() 2015-09-18 12:03:58 -07:00
Brad Hefta-Gaub
6edc817bf2 move the best zone logic out of EntityTreeRenderer::render() 2015-09-18 11:35:50 -07:00
Brad Hefta-Gaub
4a34b142d1 remove render element proxies 2015-09-17 22:05:14 -07:00
Brad Hefta-Gaub
2021a15527 fix white space 2015-09-16 16:54:21 -07:00
Brad Hefta-Gaub
7840f122dc add reload all support for entity scripts 2015-09-16 16:46:46 -07:00
Brad Hefta-Gaub
54a45f3173 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub
94b273a029 more work on script engine 2015-09-14 20:59:10 -07:00
Brad Hefta-Gaub
a3c0288eae more work on proper threading of ScriptEngine 2015-09-14 20:26:04 -07:00
Brad Hefta-Gaub
18fbf896f1 first cut at moving entity scripts into ScriptEngine 2015-09-14 15:13:43 -07:00
Seth Alves
9c4fdfd653 merge from upstream 2015-09-08 18:01:07 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Stephen Birarda
0f77ab8611 resolve conflicts on merge with upstream/master 2015-08-18 11:45:55 -07:00
ZappoMan
b7d9dc444b more work on clicking focus 2015-08-17 13:06:32 -07:00
Stephen Birarda
9e7fb9ae16 shuffle Packet headers, use static enum for PacketType 2015-07-23 13:56:47 -07:00
Stephen Birarda
d990420565 repairs to octree packet receiving in interface 2015-07-13 13:10:57 -07:00
Stephen Birarda
264f39fa59 resolve conflicts on merge with upstream/master 2015-07-13 11:25:24 -07:00
Niraj Venkat
706f85e4ce Fixes to comply with coding standard 2015-07-09 17:31:38 -07:00
Niraj Venkat
1dce5f80cc Entities are now added/removed from rendering based on Scene.shouldRenderEntities 2015-07-09 16:17:58 -07:00
Stephen Birarda
74940a2132 replace lingering PacketTypes in old format 2015-07-08 10:18:13 -07:00
Stephen Birarda
0d64e82fe2 replace PacketType declarations with PacketType::Value 2015-07-02 16:38:52 -07:00
David Rowe
1898c6bd55 Merge branch 'master' into 20547 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-06-26 13:05:51 -07:00
Howard Stearns
fdf5860c4f Refactor playSound. 2015-06-18 10:39:58 -07:00
David Rowe
6623d0c552 Add "Reload" button associated with entity editor's script URL field 
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
 2015-06-17 16:11:32 -07:00
Ryan Huffman
37d9394140 Fix entity payloads not being removed on delete 2015-06-05 10:26:09 -07:00
ZappoMan
c6fb22b915 make sure all entities are rendering in pipeline part 1 2015-06-03 17:16:45 -07:00
samcake
98c0cd7d23 Merge pull request #5009 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING - hacking on rendering mesh parts
 2015-06-01 12:24:27 -07:00
Sam Gateau
83c4a52454 Cleaning for PR 2015-05-31 19:34:03 -07:00
Sam Gateau
33d397a440 A fist update solution for the item 2015-05-31 19:10:37 -07:00
ZappoMan
eb19b93433 render models in scene checkpoint 2015-05-28 17:19:30 -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
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
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
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
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
9988f2d1cd EnitityItem smart pointers 2015-05-22 22:38:02 -07:00
ZappoMan
8b78fc4190 EnitityItem smart pointers 2015-05-22 17:57:50 -07:00
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
ZappoMan
4bdeef7610 checkpoint 2015-05-22 14:54:30 -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