Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 08:47:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18928 commits 25 branches 0 tags 1.1 GiB
Commit graph

1334 commits

Author SHA1 Message Date
ZappoMan
1ac9f2f563 first cut at movable entities script 2014-11-17 14:51:46 -08:00
Chris Collins
9fac84a937 Changed the Alpha on the editmodels overlay 
Changed the Alpha on the editmodels overlay
 2014-11-17 12:58:54 -08:00
ZappoMan
5686ef6e94 Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity 2014-11-16 11:04:36 -08:00
Brad Hefta-Gaub
3ab5753ce0 Merge pull request #3803 from stojce/20170 
CR for Job #20170 - Add checkbox to boolean item in NewEditEntities.js properties panel
 2014-11-16 08:48:59 -08:00
ZappoMan
05fa3c89a7 Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity 2014-11-15 20:38:07 -08:00
Brad Hefta-Gaub
db3755f4a6 Merge pull request #3794 from thoys/20176 
CR for Job #20176 - Ability to clone Overlay in Javascript
 2014-11-15 08:27:36 -08:00
Stojce Slavkovski
cc487d76ca Merge branch 'master' of https://github.com/highfidelity/hifi into 20170 
Conflicts:
	examples/libraries/entityPropertyDialogBox.js
 2014-11-15 09:50:09 +01:00
ZappoMan
a37275e6b1 fix animation frame 2014-11-14 21:17:13 -08:00
Atlante45
4d7c5f2d4f Protect board from pieces 2014-11-14 17:35:20 -08:00
Atlante45
b1d29cf888 user data cleanup 2014-11-14 17:28:05 -08:00
ZappoMan
0cb95fc82a add support for text properties to new html propety tools 2014-11-14 17:20:05 -08:00
ZappoMan
3f18741b15 add new text entity tool to newEditEntities.js 2014-11-14 16:40:56 -08:00
Atlante45
87d472a5a9 2 space indent -> 4 space indent 2014-11-14 16:37:30 -08:00
ZappoMan
9657e7a469 add text entity editing to editModels and entityPropertyDialogBox 2014-11-14 16:28:47 -08:00
Atlante45
94f3f461ce Cleanup script for chess boards 2014-11-14 15:21:34 -08:00
Atlante45
58796df843 scriptEntity url 2014-11-14 15:17:09 -08:00
Atlante45
a6f57cb7e2 Index error 2014-11-14 15:13:54 -08:00
Atlante45
b948ff2dc8 Move dead pieces 2014-11-14 15:13:13 -08:00
Thijs Wenker
1a9f7c6e21 Merge branch 'master' of https://github.com/worklist/hifi into 20176 2014-11-14 23:01:18 +01:00
Atlante45
0227bc742b Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-14 13:30:04 -08:00
Atlante45
cc35b83d31 update pieces id 2014-11-14 12:19:26 -08:00
Atlante45
a1bd5623e1 refactor + solved network issues 2014-11-14 12:04:49 -08:00
Thijs Wenker
fa4555a7a2 Merge branch 'master' of https://github.com/worklist/hifi into 20176 
Conflicts:
	interface/src/ui/overlays/Grid3DOverlay.cpp
	interface/src/ui/overlays/ImageOverlay.cpp
	interface/src/ui/overlays/Line3DOverlay.cpp
	interface/src/ui/overlays/LocalVoxelsOverlay.cpp
	interface/src/ui/overlays/LocalVoxelsOverlay.h
	interface/src/ui/overlays/Overlay.h
	interface/src/ui/overlays/Overlay2D.cpp
	interface/src/ui/overlays/Text3DOverlay.cpp
	interface/src/ui/overlays/TextOverlay.cpp
	interface/src/ui/overlays/TextOverlay.h
 2014-11-14 20:09:27 +01:00
Ryan Huffman
28eebd3fa5 Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tool-properties 2014-11-14 10:53:18 -08:00
David Rowe
20fdd6d811 Disable model overlay properties example 
It causes intermittent crashes in
NetworkGeometry::setTextureWithNameToURL()
 2014-11-14 10:31:30 -08:00
Atlante45
4afcf9b240 Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-14 08:29:22 -08:00
Brad Hefta-Gaub
db2b5fc28d Merge pull request #3791 from ctrlaltdavid/20128 
CR for Job #20128 - Make leapHands.js compensate for avatars without wrist joints
 2014-11-13 20:44:43 -08:00
Brad Hefta-Gaub
27c37f3a4e Merge pull request #3784 from ctrlaltdavid/20157 
CR for Job #20157 - Enable "Get Overlay properties" from javascript
 2014-11-13 20:43:38 -08:00
Ryan Huffman
3658d65028 Remove grid tool from menu 2014-11-13 20:02:19 -08:00
Ryan Huffman
a6f027e33a Fix entity edit grid not hiding when disabling tools 2014-11-13 18:31:32 -08:00
Atlante45
4c35f8e325 Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-13 18:06:30 -08:00
Ryan Huffman
6b2a497810 Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes 2014-11-13 17:48:17 -08:00
Ryan Huffman
55612cc596 Add title to WebWindowClass 2014-11-13 17:46:20 -08:00
Atlante45
ce73f75e7d Merge branch 'entities_userdata' into chessgame 2014-11-13 17:45:55 -08:00
Ryan Huffman
49563dbff7 Add entityProperties tool window 2014-11-13 17:41:51 -08:00
Ryan Huffman
4254d38cdd Update buttons to grid tool 2014-11-13 17:40:21 -08:00
Chris Collins
c55f76d7ef Apply alpha to text from 0 - .9 
Apply alpha to text from 0 - .9
 2014-11-13 17:27:05 -08:00
Thijs Wenker
e964741e30 added OverlayPreloader and made a bunch of clones 2014-11-14 00:01:51 +01:00
Stephen Birarda
cfa2912877 use new SoundCache across scripts 2014-11-13 15:01:45 -08:00
Stephen Birarda
de5881818b update playSound to new sound interface 2014-11-13 14:54:48 -08:00
David Rowe
8076bfea72 Merge branch 'master' into 20157 
Conflicts:
	interface/src/ui/overlays/Text3DOverlay.cpp
 2014-11-13 14:53:57 -08:00
Stephen Birarda
e10d132f75 avoid Qt QTimer thread bug by putting SoundCache on same thread 2014-11-13 14:47:28 -08:00
AndrewMeadows
b797c7b38c Merge pull request #3782 from ctrlaltdavid/20140 
CR for Job #20140 - Add Overlays.getTextWidth
 2014-11-13 13:52:53 -08:00
Thijs Wenker
388332966d Added cloning methods to Grid3DOverlay 
Added example script for cloning overlays (TODO: SpriteBillboard fix cloning of in example)
 2014-11-13 22:22:46 +01:00
Atlante45
a0afcdfe79 Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-13 11:39:15 -08:00
Atlante45
ac34db14aa Send pieces ID 2014-11-13 11:35:14 -08:00
Atlante45
ce0cb9fdc7 Better move / start of auto move dead piece 2014-11-13 11:34:38 -08:00
Philip Rosedale
9cfc95bc6a Merge pull request #3786 from ZappoMan/animationUnification 
Animation unification
 2014-11-13 10:23:36 -08:00
Atlante45
2498fd11a3 Preload sounds / use hash injector options 2014-11-13 10:22:45 -08:00
Atlante45
bc4514649e Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-13 09:35:39 -08:00