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

24283 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
d45e935b93 Add show zone overlay option to menu 2015-04-23 09:52:01 -07:00
Ryan Huffman
4a99c21e7b Add zoneOverlayManager.js 2015-04-23 09:36:53 -07:00
Ryan Huffman
e0d4a0b1e1 Add functionality to turn zone picking off 2015-04-23 09:36:41 -07:00
Ryan Huffman
b31f95a002 Fix cube rendering not working with transparency 2015-04-23 09:34:23 -07:00
Ryan Huffman
6612f9cb61 Fix key light properties in proeprties window 2015-04-23 09:33:58 -07:00
Ryan Huffman
ab261f4443 Update zone overlay to only be visible when edit is on 2015-04-23 09:33:33 -07:00
Ryan Huffman
af46ece9af Remove overlays.js include 2015-04-23 09:33:10 -07:00
Ryan Huffman
af93634fcb Merge branch 'master' of github.com:highfidelity/hifi into edit-zones 2015-04-23 09:32:37 -07:00
Ryan Huffman
5654e3abed Add zone overlay manager 2015-04-23 09:32:15 -07:00
Brad Hefta-Gaub
82d3302d1b Merge pull request #4644 from jherico/offscreen 
Working on new-UI implementations of address bar and login
 2015-04-23 07:17:45 -07:00
Brad Davis
eaaada908a Merge pull request #4674 from ZappoMan/ZoneVolume 
implement volume priority for zones
 2015-04-22 20:21:30 -07:00
Brad Davis
de179256d3 Kill all the whitespace 2015-04-22 20:19:19 -07:00
Brad Davis
eab4ad9ea9 More coding standard stuff 2015-04-22 20:16:41 -07:00
Brad Davis
44efcdf82a More coding standard 2015-04-22 20:08:49 -07:00
Brad Hefta-Gaub
67a12d8272 Merge pull request #4665 from ctrlaltdavid/dde-miscellaneous 
DDE miscellaneous
 2015-04-22 19:57:49 -07:00
Brad Davis
732e9723cd Messed up rename 2015-04-22 19:24:43 -07:00
Brad Davis
930ec7a6d8 One more 2015-04-22 19:22:10 -07:00
Brad Davis
c4d2bd2cda More coding standard fixes 2015-04-22 19:18:09 -07:00
Brad Davis
8d8c4babba Coding standard fixes 2015-04-22 19:06:22 -07:00
David Rowe
35e2b87a70 Rename DDE menu items 2015-04-22 13:15:57 -07:00
David Rowe
649d4736cd Merge branch 'master' into dde-miscellaneous 2015-04-22 13:00:40 -07:00
ZappoMan
fb4e334c70 implement volume priority for zones 2015-04-22 12:38:34 -07:00
samcake
68a4a14b43 Merge pull request #4672 from ZappoMan/ZoneEntity2 
Implement Zone Entity
 2015-04-22 11:58:03 -07:00
ZappoMan
ac81e3e847 added example script 2015-04-22 11:27:35 -07:00
ZappoMan
19386d5a5d Merge branch 'master' of https://github.com/highfidelity/hifi into ZoneEntity2 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-04-22 09:35:08 -07:00
Andrew Meadows
65825a4501 Merge pull request #4659 from ericrius1/collision 
Filtering triggering of collisions with contact type of "continue"
 2015-04-22 09:33:40 -07:00
Andrew Meadows
b2c67a7f33 Merge pull request #4639 from sethalves/acceleration-and-owner-in-wire-protocol 
simulation owner in wire protocol
 2015-04-22 09:20:44 -07:00
Seth Alves
cde64893af coding standard 2015-04-21 18:36:06 -07:00
ZappoMan
486ab044a0 use piggyback properties to save on property bit space 2015-04-21 15:16:46 -07:00
ZappoMan
8366dd02a0 remove RenderableZoneEntityItem class since zones don't render like other entities 2015-04-21 15:03:04 -07:00
ZappoMan
4ce451f984 wire up zone rendering again 2015-04-21 14:55:45 -07:00
ZappoMan
98350a47ad Merge branch 'master' of https://github.com/highfidelity/hifi into ZoneEntity2 2015-04-21 14:36:27 -07:00
ZappoMan
e436c95212 first cut at reworking zones 2015-04-21 14:36:13 -07:00
Brad Davis
e68f149aac Fixing bad merge 2015-04-21 13:18:53 -07:00
Ryan Huffman
3dfbd70d41 Add new zone button 2015-04-21 13:16:55 -07:00
Brad Davis
7a33474245 Merge remote-tracking branch 'upstream/master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-21 13:02:38 -07:00
Ryan Huffman
4e2bcc0690 Add zone properties to entity property panel 2015-04-21 12:47:11 -07:00
Brad Hefta-Gaub
578c67e051 Merge pull request #4671 from samcake/orange 
Refine the naming of the "keyLight" of the domain and the upcoming ZoneEntity
 2015-04-21 11:24:52 -07:00
Sam Gateau
f54821f996 more details in the comments 2015-04-21 11:12:01 -07:00
Sam Gateau
48364cb598 refined the names of the key light porperties in Stage 2015-04-21 11:04:14 -07:00
Seth Alves
284215d46a Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-21 09:53:15 -07:00
Seth Alves
34e64e5007 Merge pull request #4650 from birarda/vhacd-external 
add v-hacd as an external project
 2015-04-21 09:44:52 -07:00
Philip Rosedale
a0a22ec94f Merge pull request #4669 from ctrlaltdavid/20506 
CR for Job #20506 - Use audio for mouth when using DDE
 2015-04-20 21:19:46 -07:00
ZappoMan
8ce4cb628a another attempt at zones starting from box 2015-04-20 18:18:01 -07:00
ZappoMan
a9c2a6e048 another attempt at zones starting from box 2015-04-20 18:17:21 -07:00
Seth Alves
64c23b8e8b Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-20 16:56:24 -07:00
Seth Alves
c49e2c1804 cleanups, diff minimization 2015-04-20 16:52:29 -07:00
Seth Alves
4a5631fca6 cleanups, diff minimization 2015-04-20 16:51:28 -07:00
Seth Alves
6107682658 handle ignoring simulation data echoed back to us differently 2015-04-20 16:36:56 -07:00
Brad Hefta-Gaub
098a18b725 Merge pull request #4667 from samcake/orange 
Fix for transform issues for overlay 3d elements on mac and linux
 2015-04-20 16:15:34 -07:00