Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
23931 commits 2 branches 0 tags 1.1 GiB
Commit graph

2198 commits

Author SHA1 Message Date
David Rowe
7acc413c66 Change visibility radio buttons to pop-up menu 2015-04-07 10:43:50 -07:00
David Rowe
a844b73fcc Move widget parameters into propeties 2015-04-07 09:27:53 -07:00
David Rowe
187ca2a403 Widgetize pop-up menu 2015-04-07 00:38:07 -07:00
David Rowe
0cbe4d3673 Apply users filter per control value 2015-04-06 22:09:03 -07:00
David Rowe
798d6437b1 Add pop-up menu of "show me" values 2015-04-06 21:54:15 -07:00
David Rowe
6cd512762d Add "Show me" prompt, value, and button to users online window 2015-04-06 20:51:17 -07:00
David Rowe
5a86f21506 Remove "2D" from identifiers 2015-04-06 18:39:30 -07:00
Clément Brisset
efbd74f539 Merge pull request #4597 from huffman/light-overlays 
Light overlays
 2015-04-06 16:02:44 +02:00
Ryan Huffman
f311cc5f07 Add light overlays 2015-04-03 16:27:42 -07:00
Ryan Huffman
748534cb9a Fix spotlight checkbox on entity properties 2015-04-03 16:25:28 -07:00
Atlante45
0434b1fd28 Remove unload callback 2015-04-03 16:09:23 +02:00
Brad Davis
605cf19f6f Merge pull request #4565 from ctrlaltdavid/20422 
CR for #20422 - Add the ability to manage friends via Interface
 2015-04-02 14:10:40 -07:00
Clément Brisset
01dc1b058c Merge pull request #4580 from birarda/master 
use non-persistent settings to avoid lobby crash confusion
 2015-04-02 17:37:24 +02:00
Stephen Birarda
69f0c50a3c fix cleanup order to ensure environment is re-rendered 2015-04-01 17:50:12 -07:00
Stephen Birarda
862f26a095 put the friendly lobby back in default scripts 2015-04-01 17:41:17 -07:00
Stephen Birarda
40f7e683da don't attach iron man helmet while in lobby 2015-04-01 17:38:32 -07:00
Stephen Birarda
b27a86fb25 always render yourself, handle change of render values elsewhere 2015-04-01 17:36:43 -07:00
Stephen Birarda
03292fd869 allow developerMenuItems to handle new render options 2015-04-01 17:26:56 -07:00
Stephen Birarda
560f53b842 use new API to toggle environment from lobby 2015-04-01 17:08:15 -07:00
Ryan Huffman
775bbdaebb Remove unnecessary css 2015-04-01 16:04:52 -07:00
Ryan Huffman
0f518b6dbd Update styling of property spinners in edit.js 2015-04-01 16:02:21 -07:00
David Rowe
96e888864a Merge branch 'master' into 20422 2015-04-01 14:56:48 -07:00
Brad Hefta-Gaub
e6b770ea19 Merge pull request #4576 from birarda/master 
pull lobby from default scripts to avoid permanent iron man
 2015-04-01 14:23:46 -07:00
Stephen Birarda
d6f43287dc pull the lobby from default scripts to avoid permanent iron man 2015-04-01 14:21:43 -07:00
Philip Rosedale
b5f79c7e6e Merge pull request #4571 from huffman/select-all-edit 
Add select all on focus behavior to entity properties window
 2015-04-01 14:06:00 -07:00
Ryan Huffman
f0dd20b21e Merge pull request #4570 from samcake/orange 
Clean up the sunLightExample.js and create the cookies.js
 2015-04-01 13:55:03 -07:00
Philip Rosedale
cd40b82e7d Merge pull request #4568 from huffman/line-height-update 
Update edit.js lineHeight to be more usable
 2015-04-01 13:44:57 -07:00
Philip Rosedale
4ec1d304e0 Merge pull request #4567 from thoys/20423 
CR for Job #20423 - Take gun.js to the next level.
 2015-04-01 13:43:52 -07:00
Sam Gateau
9918357724 fix var declaration issues 2015-04-01 13:37:41 -07:00
Brad Hefta-Gaub
1de1527414 Merge pull request #4569 from ctrlaltdavid/20431 
CR for Job #20431 - Remove XMLHttpRequest file reading and model uploading
 2015-04-01 13:00:16 -07:00
Ryan Huffman
c835fb63c3 Add select all on focus behavior to entity properties window 2015-04-01 12:52:46 -07:00
Sam Gateau
695a5bcfd7 Adding the cookies sciprt that provide a simple ui useful for debug and example, complete the interface on the scene script interface to provide the getters 2015-04-01 12:23:31 -07:00
Sam Gateau
3b92910a91 Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters 2015-04-01 12:22:35 -07:00
Ryan Huffman
eb7d940ed9 Update edit.js lineHeight property handling 2015-04-01 11:36:05 -07:00
Thijs Wenker
f3ff48ab60 Merge branch 'master' of https://github.com/worklist/hifi into 20423 2015-04-01 19:14:14 +02:00
Thijs Wenker
bd8ea7bfc0 Merge branch 'master' of github.com:PhilipRosedale/hifi into 20423 
Conflicts:
	examples/controllers/hydra/gun.js
 2015-04-01 19:13:46 +02:00
Stephen Birarda
a1f1f7603d Merge pull request #4564 from PhilipRosedale/master 
Buttons at bottom in dice, gun so not to conflict with edit.js
 2015-04-01 09:06:34 -07:00
Thijs Wenker
f22c739642 updated gunscript 2015-04-01 16:26:55 +02:00
Philip Rosedale
9642bd199d Buttons at bottom 2015-03-31 22:12:06 -07:00
Philip Rosedale
8114fdd1e2 move button locations, names some constants in avatar controller 2015-03-31 21:51:50 -07:00
David Rowe
e06f28b7c5 Merge branch 'master' into 20422 
Conflicts:
	examples/users.js
	interface/src/Application.cpp
 2015-03-31 21:01:54 -07:00
Eric Levin
fd3fc0acdd added unload function to lightController.js so light is deleted when it's parent entity is 2015-03-31 19:08:30 -07:00
Seth Alves
04901e99fc fix error message 2015-03-31 18:41:29 -07:00
Seth Alves
4e83301c65 add a bool value to Node which indicates if it is allowed to rez new entities 2015-03-31 18:27:46 -07:00
David Rowe
edaa4cdc65 Remove local file reading from scripts 2015-03-31 16:57:15 -07:00
Philip Rosedale
9635c6d248 Merge branch 'master' of https://github.com/worklist/hifi 2015-03-31 16:29:55 -07:00
Philip Rosedale
b7f0be761c gun buildings fall on creation, dice stops correctly 2015-03-31 16:27:09 -07:00
Brad Hefta-Gaub
867c8078bd Merge pull request #4553 from PhilipRosedale/master 
Blocks fall when made, better edge colors
 2015-03-31 15:53:44 -07:00
Philip Rosedale
f4695643e3 Blocks fall when made, better edge colors 2015-03-31 14:13:19 -07:00
Brad Hefta-Gaub
434349d947 Merge pull request #4541 from ctrlaltdavid/20428 
CR for Job #20428 - Add the ability to minimize/maximize users.js
 2015-03-31 13:09:46 -07:00