Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 11:53:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18035 commits 71 branches 56 tags 1.2 GiB
Commit graph

18035 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
d7fca1fd27 FIxing the merge 2014-10-23 14:39:22 -07:00
Stephen Birarda
829774dae4 Merge pull request #3653 from murillodigital/master 
No need for https when downloading assets
 2014-10-23 13:25:34 -07:00
AndrewMeadows
38c1132725 Merge pull request #3649 from Atlante45/reverb_fixed 
bump audio version number
 2014-10-23 13:08:05 -07:00
Leonardo Murillo
a4965e7f60 No need for https when downloading assets 2014-10-23 13:59:08 -06:00
Stephen Birarda
397bda586e Merge pull request #3650 from birarda/domain-tunnel 
fix for delete of last row in array table
 2014-10-23 11:55:07 -07:00
Stephen Birarda
9364c3b342 fix for delete of last row in array table 2014-10-23 11:54:30 -07:00
Atlante45
06d528fce5 bump audio version number 2014-10-23 09:28:48 -07:00
Philip Rosedale
da75073357 Merge pull request #3648 from RyanDowne/master 
changed gravity setting on hair
 2014-10-23 08:43:40 -07:00
Ryan
9495c2c87a Merge remote-tracking branch 'hifi/master' 2014-10-23 08:01:43 -07:00
Philip Rosedale
6ce1049c32 Merge pull request #3647 from Atlante45/reverb_fixed 
Reverb fixed
 2014-10-23 07:47:26 -07:00
Atlante45
2ec5ddbfbc Merge branch 'revert-3646-revert-3636-reverb' of https://github.com/highfidelity/hifi into test 2014-10-22 23:43:38 -07:00
Clément Brisset
9debef6128 Revert "Revert "Reverb"" 2014-10-22 23:40:50 -07:00
Atlante45
9c45055aeb Fixed for no/multiple reverb zones 2014-10-22 23:32:07 -07:00
Clément Brisset
1e8fbf2012 Merge pull request #3646 from highfidelity/revert-3636-reverb 
Revert "Reverb"
 2014-10-22 23:06:43 -07:00
Clément Brisset
b1b7114e66 Revert "Reverb" 2014-10-22 22:46:37 -07:00
Philip Rosedale
3ba3354e11 Merge pull request #3636 from Atlante45/reverb 
Reverb
 2014-10-22 21:51:57 -07:00
Philip Rosedale
a97b6f1422 Merge pull request #3639 from ey6es/metavoxels 
Fix for streaming crash.
 2014-10-22 18:14:17 -07:00
Andrzej Kapolka
9af1516c79 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-22 17:45:20 -07:00
Andrzej Kapolka
271c01ad03 Fix for digging into converted heightfields. 2014-10-22 17:44:56 -07:00
Philip Rosedale
246ff1614f Merge pull request #3645 from birarda/avatar-by-name 
fix for AvatarHashMap crash when erasing avatars
 2014-10-22 17:43:44 -07:00
Clément Brisset
0525c562b0 Merge pull request #3643 from ctrlaltdavid/rift-calibration-countdown 
Rift calibration countdown
 2014-10-22 17:42:35 -07:00
Clément Brisset
bf9d467328 Merge pull request #3638 from huffman/entity-tools-updates 
Entity tool fixes
 2014-10-22 17:40:21 -07:00
Stephen Birarda
8e67c5f534 don't erase from the AvatarHashMap on the wrong thread 2014-10-22 17:35:28 -07:00
David Rowe
0e3495986d Add countdown to HMD calibration billboard 2014-10-22 16:58:10 -07:00
Atlante45
93a0eb18bd Added readme 2014-10-22 16:50:02 -07:00
David Rowe
38d50a76eb Add IsFacingAvatar getter and setter to Text3DOverlay 2014-10-22 16:47:40 -07:00
Ryan
883bb5aa68 Merge remote-tracking branch 'hifi/master' 2014-10-22 16:44:37 -07:00
Atlante45
8ccbfcf695 code cleanup 2014-10-22 16:41:41 -07:00
Philip Rosedale
4c060dd6a7 Merge pull request #3641 from birarda/avatar-by-name 
return an avatar to script by their display name
 2014-10-22 16:41:19 -07:00
Philip Rosedale
d3fa3fbbac Merge pull request #3640 from PhilipRosedale/master 
can warp at any yaw angle
 2014-10-22 15:43:12 -07:00
Stephen Birarda
7b0f1477a1 expose AvatarList to Interface SE, add avatarWithDisplayName method 2014-10-22 15:28:04 -07:00
Atlante45
a48811777e Script engine audio dependency 2014-10-22 15:26:16 -07:00
Ryan Huffman
ac8d947cb1 Update ScriptUndoCommand to run on ScriptEngine thread 2014-10-22 15:18:49 -07:00
Philip Rosedale
70f72f9404 can warp at any yaw angle 2014-10-22 15:09:43 -07:00
Ryan Huffman
14555c4534 Add UndoStackScriptingInterface and support when editing entities 2014-10-22 14:54:04 -07:00
Andrzej Kapolka
345a9f02f7 Upload fix. 2014-10-22 14:30:20 -07:00
Atlante45
86c965a922 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-22 14:20:22 -07:00
Sam Gateau
d13283192f Fix the bug happening on mac due to order in which parmaeters are evaluated for all of the gl calls, now fixed with an order independant code 2014-10-22 14:07:15 -07:00
Atlante45
bd4e8a172d typo 2014-10-22 13:40:58 -07:00
Atlante45
fc9010dd6b missing endif 2014-10-22 13:38:49 -07:00
Atlante45
ad2eb08964 Correctly link in cmake 2014-10-22 13:11:45 -07:00
Andrzej Kapolka
e69bc22222 Fix for streaming crash. 2014-10-22 12:56:55 -07:00
Atlante45
ccc8e0d876 Statically link gverb 2014-10-22 12:56:44 -07:00
Atlante45
e496304f7e Changed include dir 2014-10-22 11:36:23 -07:00
Atlante45
1739cf019d Gverb library CMakeLists 2014-10-22 11:35:51 -07:00
Ryan Huffman
0bda7699a6 Disable properties menu with multi-selection 2014-10-22 10:38:24 -07:00
Ryan Huffman
5b9806dc0d Fix deletion with multi-selection 2014-10-22 10:37:17 -07:00
Ryan Huffman
078d14ae58 Fix rotation overlay size with multi-selection 2014-10-22 10:36:58 -07:00
Ryan Huffman
52dacaab02 Update entity editing to force SPACE_LOCAL for single-selection 2014-10-22 10:36:44 -07:00
Ryan
2894a04027 Merge remote-tracking branch 'hifi/master' 2014-10-22 10:35:33 -07:00