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

2279 commits

Author SHA1 Message Date
David Rowe
54c0aeaa03 Work around entities not always getting velocity set at creation 2015-04-09 18:57:58 -07:00
David Rowe
10ac6bc9ca Don't render overlay unless debug 2015-04-09 18:17:45 -07:00
David Rowe
54980f46a9 Set raindrops falling 2015-04-09 17:29:14 -07:00
David Rowe
66ea84977a Create raindrops at specified rate 2015-04-09 16:18:10 -07:00
David Rowe
00f42c1e6c Move to acScripts 2015-04-09 15:52:59 -07:00
David Rowe
e4e372b2a3 Create a raindrop with a lifetime 2015-04-09 15:51:19 -07:00
David Rowe
55b92f7d1e Circle of origin for rain 2015-04-09 15:18:31 -07:00
Thijs Wenker
cf403a7ad8 Merge branch 'master' of https://github.com/worklist/hifi into 20367 2015-04-09 23:47:20 +02:00
Thijs Wenker
0cb5ee5bd1 - Scripts JS object renamed to ScriptDiscoveryService. 
- Renamed Example script file for the ScriptDiscoveryService.
- Moved ScriptDiscoveryService functions to the RunningScriptWidget
 2015-04-09 23:46:49 +02:00
Clément Brisset
fea7a58774 Merge pull request #4605 from ericrius1/light 
Updated lightcontroller.js logic to find the nearest light when user cli...
 2015-04-09 22:49:22 +02:00
David Rowe
d6c15549e4 Tweak users display to work better with variety of backgrounds 2015-04-09 13:03:12 -07:00
Eric Levin
396325629e added back original light controller script 2015-04-09 10:43:34 -07:00
Eric Levin
c0e7cd1f6a deleted unnecessary line with typo 2015-04-09 09:50:12 -07:00
Seth Alves
73a1265624 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-09 09:21:06 -07:00
Philip Rosedale
f51cafa066 Merge pull request #4616 from huffman/marketplace-always-visible 
Marketplace always visible
 2015-04-08 20:51:51 -07:00
Seth Alves
2448051c75 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-08 15:39:40 -07:00
Seth Alves
1dd01cde00 expand svo to hold acceleration and id of current simulator node 2015-04-08 15:39:34 -07:00
Ryan Huffman
a0e324f9f5 Add error for when importing on a domain without permissions 2015-04-08 13:58:14 -07:00
Ryan Huffman
b6af9fde9e Make marketplace button always visible 2015-04-08 13:57:41 -07:00
Philip Rosedale
5e681ee56b Merge pull request #4615 from huffman/align-checkboxes 
Align checkboxes
 2015-04-08 13:39:25 -07:00
Ryan Huffman
e3dea8ccc8 Remove margin in entityProperties 2015-04-08 13:24:03 -07:00
Ryan Huffman
92b91c9a38 Fix checkboxes not aligning with label 2015-04-08 13:23:48 -07:00
Ryan Huffman
e2a7072270 Update new entity positioning to be in front of camera 2015-04-08 12:50:02 -07:00
Ryan Huffman
83918c53b9 Update entityProperties properties to take up less space 2015-04-08 10:18:29 -07:00
Ryan Huffman
dc503ac068 Update entityProperties checkboxes to be inlined 2015-04-08 10:18:04 -07:00
Eric Levin
b8719f6e5f made new alternative light script 2015-04-08 09:21:24 -07:00
Eric Levin
6de4cec836 made randomly chosen sound persistent between sessions by storing sound index in user data. Now using previous rotation and position to compute offset position 2015-04-08 09:20:29 -07:00
Eric Levin
a16f6c2ce4 remove unnecessary print statement 2015-04-07 19:35:41 -07:00
Eric Levin
9c220b3e9b light container now assigned 1 of 3 random light switch sounds. Also light now changes position based on container's change in position AND rotation. 2015-04-07 19:25:37 -07:00
David Rowe
7acc413c66 Change visibility radio buttons to pop-up menu 2015-04-07 10:43:50 -07:00
Eric Levin
7d2fa8d7ce Updated lightcontroller.js logic to find the nearest light when user clicks on light switch entity- this will allow lights to work even when a user has disabled other users from spawning items in his domain 2015-04-07 10:20:19 -07:00
David Rowe
a844b73fcc Move widget parameters into propeties 2015-04-07 09:27:53 -07:00
Thijs Wenker
af34add63c added example for the new Scripts functions: 
example\misc\scriptsExample.js
 2015-04-07 17:39:50 +02: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
Ryan Huffman
79305141d1 Fix edit.js not selecting all when tabbing between properties 2015-03-31 10:51:07 -07:00
Philip Rosedale
0c9e6ad3c0 Merge pull request #4543 from stojce/20397 
CR for Job #20397 - Create a test script that builds and places a bunch of houses for load testing
 2015-03-31 08:13:54 -07:00
David Rowe
495b62b356 Add minimized state 2015-03-30 20:46:39 -07:00
David Rowe
622f10bd25 Add minimize button 2015-03-30 20:46:38 -07:00
Philip Rosedale
5cd031739b Merge pull request #4536 from PhilipRosedale/master 
Fix error with angular speed
 2015-03-30 17:07:22 -07:00
Philip Rosedale
63c1bdd0a8 Fix error with angular speed 2015-03-30 17:03:09 -07:00
Stephen Birarda
9f0e146782 Merge pull request #4530 from birarda/master 
fix for marketplace URL on right click
 2015-03-30 15:15:01 -07:00
Stephen Birarda
909c4ad919 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-30 15:10:53 -07:00
Stephen Birarda
75da852b39 fix for marketplace url on right click 2015-03-30 15:10:16 -07:00
Stojce Slavkovski
72f1f5ba62 stop makeHouses.js gracefully 
remove exit cleanup
 2015-03-30 22:08:26 +02:00
Stojce Slavkovski
eb46a4b647 Merge branch 'master' of https://github.com/highfidelity/hifi into 20397 2015-03-30 21:23:23 +02:00
Philip Rosedale
685de8cc7f Merge pull request #4522 from huffman/rename-attribution 
Rename attribution to marketplaceID
 2015-03-30 10:57:28 -07:00
David Rowe
cbf2012bf5 Add menu items that set visibility 
And synchronize visibility settings between Interface and users.js.
 2015-03-29 18:35:56 -07:00
David Rowe
be69c0b58f Add add/remove friends menu item 
This must display the dialog whether or not users.js is running. Both
C++ and JavaScript need to open or restore the same dialog, hence a new
dialog rather than using WebWindow with its JavaScript baggage.
 2015-03-28 13:05:23 -07:00
Stojce Slavkovski
463625f101 revert cleanup 2015-03-28 00:53:57 +01:00
Stojce Slavkovski
42a1079322 limit 20 per sec. / don't delete on script stop 2015-03-28 00:27:57 +01:00
David Rowe
418ff5929e Make friends add/remove button open WebWindow dialog 2015-03-27 15:38:20 -07:00
David Rowe
4e6dcf0d8e Add friends add/remove button 2015-03-27 15:38:20 -07:00
Ryan Huffman
ed62356f65 Remove attribution field from edit properties window 2015-03-27 13:36:56 -07:00