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

18615 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
2250cdfcc2 have the domain-server unverifiably heartbeat the number of connected users 2014-11-03 14:50:45 -08:00
Brad Hefta-Gaub
00b365318b Merge pull request #3719 from samcake/tot 
Fix the problem of actual framerate target not being true to the value ...
 2014-11-03 14:48:52 -08:00
Sam Gateau
4d1fbc1cf9 Fix end of line in Application.cpp 2014-11-03 14:39:34 -08:00
Stephen Birarda
22f4e8ec70 cleanup heartbeat method names 2014-11-03 14:37:56 -08:00
Sam Gateau
a4bd0acc91 Fix the syntax issue with if blocks 2014-11-03 14:36:03 -08:00
Sam Gateau
ed067791f2 Fixing format for skin attributes float need to be NFloat 2014-11-03 14:29:11 -08:00
Andrzej Kapolka
ce3133b8d4 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-03 14:01:08 -08:00
Sam Gateau
eae604d77e Merged with upstream master 2014-11-03 13:37:17 -08:00
Sam Gateau
48769928c5 Trying to fix the skinning issue 2014-11-03 13:20:12 -08:00
Stephen Birarda
a6f358745b Merge pull request #3722 from highfidelity/revert-3717-network-timeout 
Revert "don't allow a HifiSockAddr lookup to block application"
 2014-11-03 12:54:33 -08:00
Stephen Birarda
fabc3aea57 Revert "don't allow a HifiSockAddr lookup to block application" 2014-11-03 12:54:28 -08:00
Brad Hefta-Gaub
09f20b00df Merge pull request #3721 from birarda/domain-tunnel 
have domain-server heartbeat to data-web for offline/online status
 2014-11-03 12:52:19 -08:00
Stephen Birarda
eb856095a9 fix the domain server heartbeat timer 2014-11-03 12:49:24 -08:00
Stephen Birarda
d50a8f6309 send a heartbeat to data server every 15s 2014-11-03 12:40:56 -08:00
Brad Hefta-Gaub
ee0d966abd Merge pull request #3720 from AndrewMeadows/bispinor 
simpler tuning system for walk velocities
 2014-11-03 12:38:49 -08:00
Brad Hefta-Gaub
c52b116ab1 Merge pull request #3717 from birarda/network-timeout 
don't allow a HifiSockAddr lookup to block application
 2014-11-03 12:38:05 -08:00
Stephen Birarda
e53ad09b3f rename the automatic networking update method to heartbeat 2014-11-03 12:24:17 -08:00
Andrzej Kapolka
4475bb89d5 Fix for 3DTV mode with non-unity render scale. 2014-11-03 12:13:08 -08:00
Stephen Birarda
9e1da64895 use different include style for QHostInfo 2014-11-03 12:03:10 -08:00
ZappoMan
252d05282b added example entity script that teleports your avatar to the entity when you click on it 2014-11-03 12:03:08 -08:00
ZappoMan
30c5451b87 added example of playing a sound on click 2014-11-03 11:52:16 -08:00
Stephen Birarda
e976942515 fix includes for HifiSockAddr 2014-11-03 11:44:15 -08:00
ZappoMan
f9bd954fbe typo 2014-11-03 11:43:30 -08:00
Brad Hefta-Gaub
e66a96b020 Merge pull request #3718 from ctrlaltdavid/hmd-leap-offset 
Better estimate of HMD offset for Leap-on-HMD
 2014-11-03 11:40:48 -08:00
ZappoMan
948f3a4c1f added an example entity script that makes the avatar do crazy legs when you click on an entity 2014-11-03 11:38:49 -08:00
Andrew Meadows
92a6609ac0 simpler tuning system for walk velocities 2014-11-03 11:31:04 -08:00
Sam Gateau
cecf79e580 Fix the problem of actual framerate target not beeing true to the value displayed in the menu, same for resolution scale. Removed the value in Application and relies exclusively on the menu state 2014-11-03 11:22:23 -08:00
David Rowe
d085be6c47 Better estimate of HMD offset 2014-11-03 11:14:04 -08:00
Brad Hefta-Gaub
9fb4f91f2a Merge pull request #3716 from ctrlaltdavid/20152 
CR for Job #20152 - Interface cache goes away when you close Interface.
 2014-11-03 11:07:36 -08:00
AndrewMeadows
43a33730ea Merge pull request #3713 from ey6es/metavoxels 
Allow heightfield color/material layers to be of different resolutions than the height layer.
 2014-11-03 11:00:58 -08:00
ZappoMan
49a389618e Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents 2014-11-03 10:54:19 -08:00
Stephen Birarda
2746733687 don't allow HifiSockAddr lookup to block application 2014-11-03 10:46:17 -08:00
Sam Gateau
ac02746587 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-03 09:56:54 -08:00
Sam Gateau
fba1526389 Migrating the model rendering code to use the new gpu api for input buffers and stream format 2014-11-03 09:56:14 -08:00
AndrewMeadows
b246af7511 Merge pull request #3712 from ctrlaltdavid/fix-log-file-eols 
Fix log file missing end of lines
 2014-11-03 08:44:23 -08:00
AndrewMeadows
8d02e64804 Merge pull request #3711 from ctrlaltdavid/20130 
CR for Job #20130 - Repeated inspect.js errors
 2014-11-03 08:43:53 -08:00
AndrewMeadows
80a385b23a Merge pull request #3710 from ZappoMan/lockAndMaterialProperties 
Improvements to Entities
 2014-11-03 08:41:55 -08:00
AndrewMeadows
61d12ba0a9 Merge pull request #3709 from huffman/entity-tool-updates 
Entity tool cleanup and fixes
 2014-11-03 08:37:01 -08:00
AndrewMeadows
aa726bdb56 Merge pull request #3708 from DaveDubUK/19996 
CR for Job #19996 - Applying the principles of animation to a procedural animation script
 2014-11-03 08:25:43 -08:00
ZappoMan
2ffe15c833 add example entity script for change color on hover 2014-11-01 11:43:40 -07:00
ZappoMan
4db5986625 support for url or text based scripts 2014-11-01 11:40:06 -07:00
ZappoMan
87a5423b35 support changing scripts on the fly and reloading them accordningly 2014-11-01 10:57:12 -07:00
Thijs Wenker
af74fc09b9 Adds AudioDevice mute functionality to ScriptEngine 2014-11-01 02:42:22 +01:00
ZappoMan
e8c694f02e args for more methods 2014-10-31 16:38:51 -07:00
ZappoMan
e7722dc692 pass args to object scripts for mouse events 2014-10-31 15:20:16 -07:00
David Rowe
a9040c1a53 Minor adjustment to Oculus pick ray calc 2014-10-31 15:15:44 -07:00
ZappoMan
a5088eece6 first cut at running scripts from entities 2014-10-31 14:03:30 -07:00
David Rowe
02f9bb489f Fix some build warnings while in the vicinity 2014-10-31 12:49:21 -07:00
David Rowe
8e58e6e3b0 Remove unused methods 2014-10-31 12:48:30 -07:00
David Rowe
170e328f5a Fix similar problem for HMD third person view 
getUprightHeadPosition() changes with avatar lean.
 2014-10-31 12:40:16 -07:00