Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 16:20:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17202 commits 71 branches 59 tags 1.2 GiB
Commit graph

17202 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
2cfa14d5ad changed to only collide with moving entities 2014-09-24 18:06:08 -07:00
ZappoMan
4b52fddffd collions with voxels and avatars 2014-09-24 17:37:56 -07:00
Philip Rosedale
fbfaf43646 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-24 17:16:20 -07:00
Philip Rosedale
646abfaf4c Merge pull request #3480 from Atlante45/radio_js 
Make radio show up in front of you
 2014-09-24 17:14:34 -07:00
Atlante45
2766b6a4d7 Make radio show up in front of you 2014-09-24 17:12:49 -07:00
Philip Rosedale
fcc5eb9d0a Tuning of audio-driven mouths and brows to look better and not stay open 2014-09-24 16:37:55 -07:00
Atlante45
2ba946f47e Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-24 16:20:30 -07:00
Atlante45
75dc26c9ff Slider can moved when recording paused or stoped 2014-09-24 16:19:47 -07:00
ZappoMan
6b8c9bba42 improved debug in entity renderer 2014-09-24 16:05:04 -07:00
ZappoMan
8d9a923add fix the collision last edited behavior correctly, delete collision sound code 2014-09-24 16:04:39 -07:00
Philip Rosedale
8e60323177 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-24 15:49:55 -07:00
Atlante45
94edf2c900 Defaulted penumbra filter to true 2014-09-24 15:45:43 -07:00
ZappoMan
10865944f0 removed some debug 2014-09-24 15:44:09 -07:00
ZappoMan
f43ba4a68b first cut at getting entities to collide 2014-09-24 15:28:04 -07:00
Atlante45
11e60c864a Changed recording file format 2014-09-24 15:17:23 -07:00
Stephen Birarda
0b83795a13 simplify the domain setup page to just handle domain ID 2014-09-24 14:43:28 -07:00
Stephen Birarda
62e0d98d6b add username and password to domain setup page 2014-09-24 14:39:10 -07:00
Philip Rosedale
75e536235c Avatars look at your camera, not your avatar. Improvements to lookAt code 2014-09-24 14:38:44 -07:00
Stephen Birarda
4a040b3f5e add base of modal to choose from user domains 2014-09-24 14:36:08 -07:00
stojce
039deb8b42 added go button active state icon 2014-09-24 23:26:34 +02:00
Stephen Birarda
25150b9285 update to newer bootstrap, add stub of setup form 2014-09-24 13:56:15 -07:00
Stephen Birarda
3ab24d6ea5 add a missing HAVE_SDL block 2014-09-24 11:59:44 -07:00
Stephen Birarda
875c1dba72 change name in header comment to match new class name 2014-09-24 08:40:39 -07:00
stojce
92cb17cbbe Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 
Conflicts:
	interface/src/Menu.h
 2014-09-24 09:25:04 +02:00
Stephen Birarda
9348888ae5 map PrioVR to new JoystickScriptingInterface 2014-09-23 17:42:48 -07:00
Stephen Birarda
13d3eb02e3 report the 360 axis values in xbox.js 2014-09-23 17:19:57 -07:00
Andrzej Kapolka
9a27d6b32f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-23 17:11:04 -07:00
Stephen Birarda
d50c81e4a1 add a property for number of buttons in Joystick 2014-09-23 17:10:25 -07:00
Stephen Birarda
00b0806c4d move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick 2014-09-23 17:09:46 -07:00
Philip Rosedale
e485b278ef Merge pull request #3475 from Atlante45/reduce_penumbra_filter 
Decreased penumbra filter values
 2014-09-23 15:33:59 -07:00
stojce
8031454f61 use backslash to activate chat 2014-09-24 00:22:51 +02:00
Atlante45
22b39fd62a Decreased penumbra filter values 2014-09-23 15:17:46 -07:00
stojce
c14bf84af8 layout fix 2014-09-24 00:14:00 +02:00
Atlante45
f536e33d13 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-23 14:54:49 -07:00
Stephen Birarda
900daf48eb initial working connection of an xbox gamepad 2014-09-23 14:48:44 -07:00
Atlante45
7ab8c7750c Extra spaces 2014-09-23 14:37:43 -07:00
Atlante45
af341247af Recorder.js UI + pause and slider bar implementation 2014-09-23 14:29:00 -07:00
Atlante45
3b33db9a6b Added pause/setCurrentTime/setCurrentFrame JShooks 2014-09-23 14:19:16 -07:00
Atlante45
95c00b1d4e Added pause behavior + change frame computation 2014-09-23 14:18:54 -07:00
Ryan Huffman
1ee01fdab3 Merge branch 'master' of github.com:highfidelity/hifi into 20024 2014-09-23 14:10:00 -07:00
Andrzej Kapolka
fdf64d6f3a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-23 13:28:29 -07:00
Andrzej Kapolka
16cfaa6ea5 Use cubic texture coordinate generation for the dual contour surfaces. 2014-09-23 13:28:00 -07:00
Philip Rosedale
729d3cf9bc Merge branch 'master' of https://github.com/worklist/hifi 2014-09-23 12:50:52 -07:00
Philip Rosedale
21a15cff2a Avatar can look at corrected position when looking at me 2014-09-23 12:50:47 -07:00
Atlante45
fb982870c6 Added passive play bar to Recorder.js 2014-09-23 11:51:19 -07:00
Clément Brisset
c535d0170d Merge pull request #3473 from AndrewMeadows/ragdoll 
remove build warnings
 2014-09-23 11:07:23 -07:00
Atlante45
33236b6c40 Removed extra space 2014-09-23 11:02:25 -07:00
Atlante45
13a5dbf489 Added frame computation and JS hooks 2014-09-23 11:01:21 -07:00
Andrew Meadows
58bcb98dd6 remove virtual for ListShape::findRayIntersection() 2014-09-23 10:04:36 -07:00
Brad Hefta-Gaub
b7245f8259 Merge pull request #3469 from ctrlaltdavid/20054 
Code Review for Job #20054
 2014-09-23 09:57:31 -07:00