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

5948 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
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
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
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
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
a18a83d45c Update getEntityItemID() to check for id existence 2014-11-19 15:31:41 -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
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
Andrew Meadows
7f4e0c206c cache indeces to toe joints 2014-11-19 09:13:03 -08:00
Philip Rosedale
9afaf8f6d8 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-18 21:58:40 -08:00
Stephen Birarda
8c65c6c1c8 fix comment for actual time format 2014-11-18 17:02:28 -08:00
Stephen Birarda
705d3da089 cleanup time in log prefix 2014-11-18 17:00:33 -08:00
Stephen Birarda
2274b35d08 connect to sandbox domain by default 2014-11-18 15:35:11 -08:00
Philip Rosedale
79497586dd Merge branch 'master' of https://github.com/worklist/hifi 2014-11-18 10:15:32 -08:00
Andrew Meadows
2761409270 fix build error on linux 2014-11-18 08:55:01 -08:00
Andrew Meadows
47615ba9c2 changeEntityState() --> updateEntityState() 2014-11-17 17:38:26 -08:00
Andrew Meadows
af606f01a9 combined SimulationStates Moving and Changing 
also funnel entity updates by UDP packet through a single list
 2014-11-17 17:35:44 -08:00
Philip Rosedale
ce6464eaf0 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-17 17:19:08 -08:00
Andrew Meadows
114364e37a cleanup/optimization of Octree::readElementData() 2014-11-17 16:39:26 -08:00
Andrew Meadows
971804b98e name change shinkIfNeeded() -> shrinkIfNeeded() 2014-11-17 16:14:49 -08:00
AndrewMeadows
c2e80aed70 Merge pull request #3809 from Atlante45/mute_signal 
JS Mute signal
 2014-11-17 15:14:40 -08:00
Philip Rosedale
1836b5639e Merge branch 'master' of https://github.com/worklist/hifi 2014-11-17 11:59:27 -08:00
ZappoMan
bdfe02bbd0 Merge branch 'master' of https://github.com/highfidelity/hifi into persistThreadImprovements 
Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	libraries/octree/src/OctreePersistThread.cpp
	libraries/octree/src/OctreePersistThread.h
 2014-11-17 11:22:00 -08:00
ZappoMan
ec64bef951 revert debugging change 2014-11-17 11:18:38 -08:00
ZappoMan
ce54eda022 Merge branch 'master' of https://github.com/highfidelity/hifi into flightTimeDebugging 2014-11-17 10:31:26 -08:00
Atlante45
46eebe9d40 Give noisy mutes their own packet type 2014-11-17 10:26:47 -08:00
Atlante45
0507edf90f Merge branch 'master' of https://github.com/highfidelity/hifi into mute_signal 2014-11-17 09:56:55 -08:00
Atlante45
2585013615 JS signal when AM mutes client 2014-11-17 09:54:43 -08:00
ZappoMan
f44513ebe7 added support for rolling version numbers in backups 2014-11-15 22:55:12 -08:00
ZappoMan
59c13f3c38 coding standard cleanup, fix warning 2014-11-15 22:26:55 -08:00
ZappoMan
4adb4787cd added debugging of usecTimestampNow() in octree server to better understand flight times 2014-11-15 21:50:42 -08:00
ZappoMan
c70a7e0553 coding standard cleanup, fix warning 2014-11-15 20:46:30 -08:00
ZappoMan
05fa3c89a7 Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity 2014-11-15 20:38:07 -08:00
ZappoMan
28fc6d15f4 test 2014-11-14 22:53:29 -08:00
ZappoMan
f0cd258a13 test 2014-11-14 22:51:04 -08:00
ZappoMan
66f519d613 dry up EntityItemProperties with macros 2014-11-14 22:15:19 -08:00
ZappoMan
55ac9c8ef7 make sure properties include type for proper encoding 2014-11-14 21:16:50 -08:00
Philip Rosedale
9e5ad96bfe Merge branch 'master' of https://github.com/worklist/hifi 2014-11-14 17:55:25 -08:00
Clément Brisset
c80dff064f Merge pull request #3798 from ZappoMan/persistThreadImprovements 
Persist thread improvements/Backup support
 2014-11-14 17:25:17 -08:00