Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 22:19:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17181 commits 75 branches 59 tags 1.2 GiB
Commit graph

17181 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Philip Rosedale
20b123b6fd Merge pull request #3472 from birarda/move-locations 
more location cleanup and options for editing and creation
 2014-09-23 09:17:52 -07:00
Andrew Meadows
7dd9587d20 remove warning about hidden virtual override 2014-09-23 09:07:23 -07:00
Andrew Meadows
ab53202003 remove warning about signed/unsigned comparison 2014-09-23 09:07:05 -07:00
Stephen Birarda
7bae88e996 fix for calls to glm sqrt with ints 2014-09-23 08:52:22 -07:00
stojce
5a7b7cca44 Add finish lookup event 2014-09-23 11:32:16 +02:00
Andrzej Kapolka
39e52babb1 CSG edit improvements. 2014-09-22 17:56:18 -07:00
Stephen Birarda
1007f528f0 Merge branch 'master' of https://github.com/highfidelity/hifi into move-locations 2014-09-22 17:42:59 -07:00
Stephen Birarda
65a557b71a don't change the NodeList auth URL 2014-09-22 16:59:32 -07:00
Stephen Birarda
5be045d612 remove LocationManager and NamedLocation, replace with DataWebDialog 2014-09-22 16:55:44 -07:00
Philip Rosedale
4733945300 Merge pull request #3470 from ey6es/master 
Fixes for billboards, Xcode warnings.
 2014-09-22 16:36:49 -07:00
Stephen Birarda
eb0f7da517 cleanup to snapshot class to reduce passing of variables 2014-09-22 16:14:06 -07:00
Andrzej Kapolka
18cb15ee7d Warning fixes. 2014-09-22 15:31:46 -07:00
David Rowe
f95e20153c Fix upright head model position calculation for avatar scale changes 2014-09-22 15:13:08 -07:00
Andrzej Kapolka
e6b0dc592b Don't save the billboard. 2014-09-22 15:03:25 -07:00
Andrzej Kapolka
aeb424cd71 Fix for billboards. 2014-09-22 15:01:39 -07:00
Stephen Birarda
e5a54116dc correctly return empty string for domain ID if it is null 2014-09-22 15:00:07 -07:00
Atlante45
c4105f61b5 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-22 14:12:17 -07:00
Atlante45
8393fcc6eb Frame computation + timerOffset member 
When jumping inside a recording
 2014-09-22 14:01:02 -07:00
Stephen Birarda
523a4e6ba2 allow moving of location from DataWebDialog for locations 2014-09-22 11:58:23 -07:00
stojce
cc83c2b2e0 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-09-22 20:52:17 +02:00
stojce
466dbdcee5 added address bar dialog 2014-09-22 20:51:19 +02:00