Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 13:06:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
22455 commits 69 branches 56 tags 1.2 GiB
Commit graph

1951 commits

Author SHA1 Message Date
Brad Hefta-Gaub
8c26be49d7 Merge pull request #4330 from huffman/edit-off-on-domain-change 
Turn editEntities off on domain change
 2015-02-24 20:11:39 -08:00
Brad Hefta-Gaub
9ded2699e2 Merge pull request #4327 from thoys/20364 
CR for Job #20364 - Add toggle to turn off sounds in notifications.js
 2015-02-24 20:06:57 -08:00
Philip Rosedale
573390b429 fix dice for collision shapes, add angular velocity 2015-02-24 11:55:41 -08:00
Philip Rosedale
9d021a1a1e remove unused line 2015-02-24 11:49:12 -08:00
Philip Rosedale
7489b468f3 give angular velocity to the thrown ball 2015-02-24 11:48:35 -08:00
Ryan Huffman
c9818c184a Update editEntities to turn off when switching domains 2015-02-24 10:47:55 -08:00
Thijs Wenker
793116b90c ability to mute all notifications or just certain types 2015-02-23 21:00:26 +01:00
Andrew Meadows
f2fc781523 change shapeType to use strings in billiards.js 2015-02-23 11:42:36 -08:00
Andrew Meadows
456acd8833 merge upstream/master into andrew/bispinor 2015-02-23 11:41:40 -08:00
Andrew Meadows
d5733f3782 Merge pull request #4318 from PhilipRosedale/master 
Billiard balls are now textured models
 2015-02-20 17:59:33 -08:00
Andrew Meadows
27e6f99deb use strings for shapeType for JS Entity properties 2015-02-20 16:54:58 -08:00
Ryan Huffman
cf0b13f869 Update notifications.js audio to be local-only 2015-02-20 14:22:59 -08:00
Brad Hefta-Gaub
5d6d9bb1d4 Merge pull request #4320 from huffman/fix-camera-move-on-mirror 
Fix entity camera tool from taking over in mirror mode
 2015-02-20 10:40:03 -08:00
Brad Hefta-Gaub
32bbc8d551 Merge pull request #4317 from birarda/master 
dynamically grab animation URL as model URL from model
 2015-02-20 10:39:30 -08:00
Ryan Huffman
c665a3873d Fix entity camera tool from taking over in mirror mode 2015-02-20 10:11:55 -08:00
Philip Rosedale
66d1eeb327 Add textured models as balls 2015-02-19 21:11:51 -08:00
Stephen Birarda
51ad631c54 dynamically grab animation URL as model URL from model 2015-02-19 13:14:46 -08:00
David Rowe
a947cda0b2 Update SVG URL to Amazon S3 2015-02-18 13:02:37 -08:00
Clément Brisset
87f4ae2425 Merge pull request #4304 from thoys/20245 
CR for Job #20245 - Implement UI sounds for virtualKeyboard & notifications
 2015-02-18 09:55:34 -08:00
Thijs Wenker
d10f37291b check if sounds are downloaded before play thanks @Atlante45 2015-02-18 18:25:16 +01:00
Clément Brisset
7183400e43 Merge pull request #4305 from ctrlaltdavid/20308 
CR for Job #20308 - Refine progress.js
 2015-02-18 08:10:57 -08:00
Andrew Meadows
1c8f1bbcdd Merge pull request #4299 from talentraspel/20338 
removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMou…
 2015-02-17 17:47:47 -08:00
Thijs Wenker
96b3114a36 style 2015-02-17 23:37:37 +01:00
Thijs Wenker
4d12a6d81c Merge branch 'master' of https://github.com/worklist/hifi into 20245 
Conflicts:
	examples/notifications.js
 2015-02-17 23:30:58 +01:00
Kai Ludwig
4048627de7 2n try: removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script. 2015-02-17 18:50:20 +01:00
Kai Ludwig
fa1bcc43e6 removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script. 2015-02-17 18:40:20 +01:00
Andrew Meadows
5cd1950bed Merge pull request #4297 from huffman/fix-mouse-look-clash 
Fix mouse look clash
 2015-02-17 09:33:50 -08:00
Andrew Meadows
d896f3a811 Merge pull request #4252 from thoys/20224 
CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads
 2015-02-17 09:03:17 -08:00
Ryan Huffman
97e70920ce Move handling of add model buttons to mouseRelease 2015-02-17 08:23:39 -08:00
Ryan Huffman
d1f7a730ad Make add-model button non-selectable 2015-02-17 08:23:11 -08:00
Brad Hefta-Gaub
f6ff0665ca Merge pull request #4286 from huffman/fix-nat-dims 
Fix "reset to natural dimensions" when dimensions not known
 2015-02-13 16:31:34 -08:00
Ryan Huffman
2df850eb8d Fix natural dimensions check 2015-02-13 15:02:16 -08:00
Ryan Huffman
0495833ca6 Disallow entity models to be reset to natural dimensions if unknown 2015-02-13 15:00:37 -08:00
Brad Hefta-Gaub
5c048db5f5 Merge pull request #4284 from sethalves/fix-butterflies 
if butterflies stop moving, they are no longer kinematic, so give them a velocity
 2015-02-13 12:45:08 -08:00
Seth Alves
6ff4f8c2c0 give butterflies an initial velocity so that they are on the kinematics list 2015-02-13 11:52:23 -08:00
Brad Hefta-Gaub
59b2c38eb1 Merge pull request #4277 from huffman/fix-select-box 
Update editEntities to not select new entity when edit tools are off
 2015-02-13 10:50:11 -08:00
Andrew Meadows
d69efa03d8 Merge pull request #4276 from birarda/master 
repairs to memory management for AudioInjectors
 2015-02-13 10:15:07 -08:00
Thijs Wenker
062c2cbcee HUD LookAt positions could be NULL now if whenever they're out of range 
HMD.HUDLookAtPosition2D -> HMD.getHUDLookAtPosition2D()
HMD.HUDLookAtPosition3D -> HMD.getHUDLookAtPosition3D()
 2015-02-12 22:55:44 +01:00
Ryan Huffman
813673b720 Fix grid tool not showing minor grid width 2015-02-12 13:19:09 -08:00
Ryan Huffman
a3d09e6adc Fix edit grid not showing up 2015-02-12 13:18:58 -08:00
Ryan Huffman
51ce8c7100 Update editEntities to not select new entity when edit tools are off 2015-02-12 13:09:37 -08:00
Stephen Birarda
0154ac9734 final script repairs for new AudioInjector API 2015-02-12 11:52:20 -08:00
Stephen Birarda
1120a5f963 use new injector API in inWorldTestTone 2015-02-12 11:50:48 -08:00
Stephen Birarda
eda7d8ffb1 use new injector APIs in movable script 2015-02-12 11:49:01 -08:00
Stephen Birarda
70e085009b use injector restart in airGuitar script 2015-02-12 11:44:14 -08:00
Stephen Birarda
5715642e04 fix for restart API in lobby script 2015-02-12 11:13:30 -08:00
Stephen Birarda
ea52cea5dd more cleanup for AudioInjector mem management 2015-02-12 10:56:40 -08:00
Stephen Birarda
7becf62ba9 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-12 10:28:04 -08:00
Brad Hefta-Gaub
fa5eebd93e Merge pull request #4269 from AndrewMeadows/thermonuclear 
ModelEntityItem gets _shapeType
 2015-02-12 10:06:01 -08:00
Andrew Meadows
5bb504ad55 Merge pull request #4268 from huffman/remove-upload-model 
Remove upload from file from editEntities.js
 2015-02-12 08:57:22 -08:00