Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:33:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19023 commits 71 branches 56 tags 1.2 GiB
Commit graph

19023 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
47f86fac68 have QAudioOutput cleaned up with injector thread 2014-11-20 13:48:29 -08:00
Stephen Birarda
0a6ffe3dbd Merge pull request #3841 from birarda/master 
fix oculus mode check for lobby
 2014-11-20 10:55:57 -08:00
Stephen Birarda
81b46d6c2c fix oculus mode check for lobby 2014-11-20 10:55:40 -08:00
Stephen Birarda
7d982abbcc Merge pull request #3838 from ZappoMan/removeVoxelEdit 
remove voxel edit
 2014-11-20 10:45:27 -08:00
Brad Hefta-Gaub
168487e0a7 Merge pull request #3840 from huffman/entity-snap-on-create 
Entity snap on create (+ remove getEntityItemID)
 2014-11-20 09:58:54 -08:00
Brad Hefta-Gaub
32f60c4255 Merge pull request #3839 from birarda/master 
trim whitespace for place name lookup, potential lobby crash fix
 2014-11-20 09:57:39 -08:00
ZappoMan
13b9bc6f5b Merge branch 'master' of https://github.com/highfidelity/hifi into removeVoxelEdit 
Conflicts:
	voxel-edit/src/SceneUtils.cpp
 2014-11-20 09:53:07 -08:00
Brad Hefta-Gaub
ec23200e7c Merge pull request #3837 from Atlante45/death_to_dot_f 
Death to the '.f's
 2014-11-20 09:51:56 -08:00
ZappoMan
3d082160ec fix build buster 2014-11-20 09:42:11 -08:00
Ryan Huffman
6a68281308 Remove EntityScriptingInterface::getEntityItemID 2014-11-20 09:39:41 -08:00
Stephen Birarda
f3b5102969 remove texture replace fix to avoid a crash 2014-11-20 09:38:41 -08:00
Stephen Birarda
1aa98dfc4c trim whitespace for place name lookup 2014-11-20 09:24:43 -08:00
Ryan Huffman
6f0d5faa5b Update tools to snap to grid on creation 2014-11-20 09:20:22 -08:00
ZappoMan
08ca861b6f remove voxel edit 2014-11-19 17:30:26 -08:00
Atlante45
4d5451fafe Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/SkeletonModel.cpp
 2014-11-19 17:28:24 -08: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
Brad Hefta-Gaub
c91f846fb5 Merge pull request #3836 from birarda/master 
have AssignmentClientMonitor catch SIGTERM and cleanup
 2014-11-19 17:00:33 -08:00
Brad Hefta-Gaub
925e2fab66 Merge pull request #3835 from birarda/lobby 
lobby changes, Sound and AudioInjectorOptions stereo tweaks
 2014-11-19 16:59:54 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Stephen Birarda
63be5ae9bf Merge pull request #3834 from ZappoMan/fixMissingRegistrationPointBug 
fix a major bug in updateEntity() caused by the new properties not containing "registrationPoint"
 2014-11-19 16:42:16 -08:00
Brad Hefta-Gaub
270939dee4 Merge pull request #3833 from AndrewMeadows/thermonuclear 
flag EntityItem when changed by update
 2014-11-19 16:40:40 -08:00
Stephen Birarda
dac980d433 have AssignmentClientMonitor catch SIGTERM and cleanup 2014-11-19 16:40:19 -08:00
Brad Hefta-Gaub
75304fd419 Merge pull request #3832 from Atlante45/fix_left_right_jumping 
Fix left/right audio jumping
 2014-11-19 16:40:04 -08:00
Brad Hefta-Gaub
3a8e89f754 Merge pull request #3831 from ey6es/master 
Clear the saccade when Faceshift is active.
 2014-11-19 16:39:18 -08:00
Brad Hefta-Gaub
7dd88eca08 Merge pull request #3829 from samcake/temp1 
refining the avatar display name rendering with different behavior if in...
 2014-11-19 16:39:04 -08:00
Brad Hefta-Gaub
0b7c3d3356 Merge pull request #3828 from AndrewMeadows/bispinor 
don't slide feet during idle animations
 2014-11-19 16:38:34 -08:00
ZappoMan
2a08a6d48e fix a bug in updateEntity() caused by the new properties not containing registrationPoint 2014-11-19 16:07:07 -08:00
Andrew Meadows
11e7339e9e add UPDATE_COLLISION_GROUP and UPDATE_MOTION_TYPE 2014-11-19 15:52:57 -08:00
Ryan Huffman
4b5d67d519 Update entityList.js to check for invalid entityIDs 2014-11-19 15:33:32 -08:00
Ryan Huffman
a18a83d45c Update getEntityItemID() to check for id existence 2014-11-19 15:31:41 -08:00
Stephen Birarda
afe4a4e432 don't show reticle if not wearing HMD, reset panel textures 2014-11-19 15:26:18 -08:00
Andrew Meadows
97d1dc4200 use updateFoo() where entity properties need relay 
clear EntityItem updateFlags when processed
 2014-11-19 15:12:22 -08:00
Stephen Birarda
987b75d8f7 switch to next musak when finished 2014-11-19 14:52:57 -08:00
Atlante45
0a9a6f1ef8 Fix parsing of silent packets properties 2014-11-19 14:32:50 -08:00
Atlante45
b5abf44aa3 Comment packt type number every 5 2014-11-19 14:31:49 -08:00
Andrew Meadows
a183248f38 add updateFoo() methods that accumulate flags 
about properties that have changed
 2014-11-19 14:12:26 -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
Andrzej Kapolka
e943a6167c Clear the saccade when Faceshift is active. 2014-11-19 13:27:13 -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
dev
fc54ad93b8 refining the avatar display name rendering with different behavior if in HMD mode or not 2014-11-19 11:46:59 -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
Brad Hefta-Gaub
c2adc6256e Merge pull request #3827 from huffman/fix-tool-window 
Initialize ToolWindow _selfHidden property
 2014-11-19 09:43:58 -08:00
Andrew Meadows
82bf0f6210 menu item for "idle animations shift hips" hack 2014-11-19 09:38:10 -08:00
Ryan Huffman
d1d561b833 Initialize ToolWindow _selfHidden property 2014-11-19 09:18:17 -08:00
Andrew Meadows
6673d9d0c2 avatar stands on lowest toe 2014-11-19 09:13:24 -08:00
Andrew Meadows
7f4e0c206c cache indeces to toe joints 2014-11-19 09:13:03 -08:00