Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 05:12:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19021 commits 76 branches 59 tags 1.2 GiB
Commit graph

1366 commits

Author SHA1 Message Date
Philip Rosedale
5101e469dc Merge branch 'master' of https://github.com/worklist/hifi 2014-11-19 23:54:31 -06:00
Clément Brisset
2c6a76ec17 Merge pull request #3830 from huffman/entity-list-window 
Entity list window
 2014-11-19 17:05:48 -08:00
Ryan Huffman
4b5d67d519 Update entityList.js to check for invalid entityIDs 2014-11-19 15:33:32 -08:00
Stephen Birarda
afe4a4e432 don't show reticle if not wearing HMD, reset panel textures 2014-11-19 15:26:18 -08:00
Stephen Birarda
987b75d8f7 switch to next musak when finished 2014-11-19 14:52:57 -08:00
Stephen Birarda
45450c4fe3 handle offset passed in AudioInjectorOptions for mixer injections 2014-11-19 13:42:24 -08:00
Stephen Birarda
81c5f9ba5a inject lobby music at a random starting point 2014-11-19 13:36:27 -08:00
Ryan Huffman
0242e0efcf Fix layout of entity list window 2014-11-19 13:35:08 -08:00
Ryan Huffman
3ff44964b5 Add entity list window 2014-11-19 13:25:38 -08:00
Stephen Birarda
03bfaa4869 handle RAW stereo audio files by using stereo.raw extension 2014-11-19 12:20:12 -08:00
Ryan Huffman
1706faf2da Fix animationIsPlaying not showing correctly in properties tool window 2014-11-19 11:20:47 -08:00
Ryan Huffman
4d56c21442 Add snapping to vertical translation 2014-11-19 10:35:42 -08:00
Philip Rosedale
9afaf8f6d8 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-18 21:58:40 -08:00
Brad Hefta-Gaub
51a2bf8226 Merge pull request #3825 from Atlante45/fix_ac_deadlock 
AC ambiance script / moved AC scripts to new directory
 2014-11-18 17:47:33 -08:00
Atlante45
44190b6fde AC ambiance script / moved AC scripts to new directory 2014-11-18 17:27:37 -08:00
Philip Rosedale
340742ec36 Merge pull request #3821 from ZappoMan/movables 
More work on the movable.js script
 2014-11-18 16:53:09 -08:00
Brad Hefta-Gaub
ee19a2d5a7 Merge pull request #3820 from huffman/grid-updates 
Grid tool updates + fixes
 2014-11-18 14:57:08 -08:00
ZappoMan
c070835681 use move sounds for turning until further research and foley work 2014-11-18 14:41:56 -08:00
ZappoMan
b53124cba7 tweaks to sound behavior 2014-11-18 14:25:12 -08:00
Ryan Huffman
16e3887cbc Set snapToGrid to default to false 2014-11-18 10:28:14 -08:00
Ryan Huffman
a4cc12e448 Add snapToSpacing functionality 2014-11-18 10:28:03 -08:00
Ryan Huffman
10008cb41f Fix snapToGrid checkbox not working 2014-11-18 10:27:26 -08:00
Philip Rosedale
79497586dd Merge branch 'master' of https://github.com/worklist/hifi 2014-11-18 10:15:32 -08:00
Ryan Huffman
c39bd362b7 Fix grid controls not updateable 2014-11-18 09:52:00 -08:00
ZappoMan
8f9ca32a2b added sounds to moving 2014-11-17 22:13:49 -08:00
ZappoMan
bc4e7ab662 add rotate support to movable.js 2014-11-17 20:13:17 -08:00
Philip Rosedale
ce6464eaf0 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-17 17:19:08 -08:00
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
Philip Rosedale
1836b5639e Merge branch 'master' of https://github.com/worklist/hifi 2014-11-17 11:59:27 -08:00
Philip Rosedale
226f9a93c5 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-17 07:49:10 -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
Philip Rosedale
9e5ad96bfe Merge branch 'master' of https://github.com/worklist/hifi 2014-11-14 17:55:25 -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