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

27848 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bing Shearer
6080ec4509 Air Hockey UI now follows window border 2015-07-08 16:29:43 -07:00
Bing Shearer
25a1108b61 Fixed spelling error 2015-07-08 16:24:23 -07:00
Niraj Venkat
1894b42773 Added EXT support for Mac GL Query calls 2015-07-08 16:11:36 -07:00
Philip Rosedale
82cad5dab3 Merge pull request #5279 from howard-stearns/sword-toolbar 
Sword:
 2015-07-08 15:34:48 -07:00
Niraj Venkat
4478d76618 attempt #3 - fixing ubuntu build 2015-07-08 15:28:25 -07:00
Howard Stearns
6813a3afe1 Sword: 
+ init hands.
+ toolbar of brandishToggle/makeTarget/cleanup.
+ initial hit flash using overlays instead of ogl "fade".
 2015-07-08 15:27:45 -07:00
Niraj Venkat
250d2e9e2c attempt #2 to fix jenkins build error 2015-07-08 15:14:28 -07:00
ZappoMan
6a9344a3f6 fix bug in old version of decode 2015-07-08 15:14:24 -07:00
Sam Gateau
4c44eb63da Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-08 14:25:41 -07:00
Sam Gateau
f992e875b4 Adding intrsumentation for nsight and hiding the nsight specific code in cpp 2015-07-08 14:25:13 -07:00
Niraj Venkat
a6ec668b2e attempt #1 to fix jenkins build error 2015-07-08 14:24:24 -07:00
Niraj Venkat
5ededf7515 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuquery 2015-07-08 13:42:31 -07:00
Sam Gondelman
dcaa294778 removed vive zooming 2015-07-08 13:38:48 -07:00
Sam Gondelman
64118d9118 started moving hydra to use UserInputMapper::Poses, needs testing 2015-07-08 13:38:48 -07:00
Anthony J. Thibault
07141fd1e3 rotation and thrust work in both 2d and hmd mode 
known issue, hmd does thrust doesnt work when avatar collisons are disabled.
 2015-07-08 12:25:57 -07:00
Philip Rosedale
afdd4c862c Merge pull request #5275 from howard-stearns/sword-button-away-hit-points 
Add a button to create/toggle-away sword.
 2015-07-08 12:11:51 -07:00
Howard Stearns
ef4620cabb Add a button to create/toggle-away sword. 
When brandished, display hit points (in overlay for this user).
 2015-07-08 11:52:37 -07:00
Philip Rosedale
49baa711eb Merge pull request #5273 from cozza13/20609 
CR for Job #20609 - Remove lobby.js from default scripts
 2015-07-08 11:42:11 -07:00
Philip Rosedale
574758eae9 Merge pull request #5252 from ctrlaltdavid/20601 
DO NOT MERGE - QA for #20601 - Fix and improve eye gaze
 2015-07-08 11:37:40 -07:00
Andrew Meadows
58c32dbf20 remove whitespace from end of lines 2015-07-08 11:30:04 -07:00
Chris Collins
16e79cc85f Remove lobby.js from the default scripts 
Lobby.js has some bugs that are not going to be fixed in the short
term. Therefore we are removing it from default scripts.
 2015-07-08 11:17:03 -07:00
Niraj Venkat
d2af313adf Merge branch 'master' of https://github.com/highfidelity/hifi into gpuquery 2015-07-08 10:01:47 -07:00
Niraj Venkat
7e59be6196 First take oon the query for the gpu 2015-07-08 10:00:58 -07:00
Andrew Meadows
a0a1b01ea9 coalesce dupe action data members: _id and _type 2015-07-07 17:50:08 -07:00
Andrew Meadows
e9df8cacc7 make some arguments const, cleanup some #includes 2015-07-07 17:50:08 -07:00
Andrew Meadows
77bd7b2821 some ObjectAction methods should be const 2015-07-07 17:50:08 -07:00
Anthony J. Thibault
754e55553a modified rotation in MyAvatar::updatePosition, reenabled trackpad input 2015-07-07 17:29:46 -07:00
Anthony J. Thibault
15cf008f13 hand controllers and arrow keys now work 2015-07-07 17:29:45 -07:00
David Rowe
abc54f2e3f Polished fonts, colors, etc. 2015-07-07 17:08:02 -07:00
David Rowe
b123e280d6 Add release numbers to associated text 2015-07-07 16:22:01 -07:00
David Rowe
cd258262d2 Use proper Interface logo 2015-07-07 16:21:24 -07:00
Andrew Meadows
30dd9728eb Merge pull request #5271 from howard-stearns/fight-club-scripts 
Baseline versions of the scripts we've been handing around for fight-club.
 2015-07-07 16:13:07 -07:00
Andrew Meadows
f1b505d46b Merge pull request #5266 from howard-stearns/expose-avatar-collisions-to-scripts 
Expose avatar collisions to scripts, ...
 2015-07-07 16:12:18 -07:00
David Rowe
1774ad9c53 Rework buttons 2015-07-07 15:59:34 -07:00
Andrew Meadows
e4ec049f50 Merge pull request #5265 from jherico/oglplus 
Updating oglplus version and switching to url based dist
 2015-07-07 15:49:36 -07:00
David Rowe
98cd706528 Add border around update details 2015-07-07 15:48:39 -07:00
Anthony J. Thibault
4f8cf0af8c moved sdl2manager to input-plugins 2015-07-07 15:24:39 -07:00
David Rowe
0994cd97dc Rework header and add logo 
Use HiFi logo as placeholder for now until Interface SVG is available.
 2015-07-07 15:14:15 -07:00
Howard Stearns
11e52c8ae0 Baseline versions of fight club scripts. 2015-07-07 14:41:03 -07:00
Anthony J. Thibault
d75353eeb2 added left/right hand click actions, vive controller should be able to emulate mouse events 2015-07-07 14:35:55 -07:00
Andrew Meadows
247a329010 Merge pull request #5264 from ZappoMan/inBoundStats 
remove some log spam
 2015-07-07 14:19:45 -07:00
David Rowe
085d87e035 Make background squared, white, and dragable 2015-07-07 14:16:45 -07:00
David Rowe
46e58cd106 Rework dialog container and layout 2015-07-07 13:56:47 -07:00
ZappoMan
20a9227070 Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats 2015-07-07 13:16:42 -07:00
Stephen Birarda
87e5133a06 Merge branch 'master' of github.com:highfidelity/hifi 2015-07-07 13:08:15 -07:00
Howard Stearns
1c2972bd7c Expose avatar collisions to scripts, and include velocityChange in exposed collision data. 2015-07-07 11:49:55 -07:00
Brad Davis
0a389a9daa Updating oglplus version and switching to url based dist 2015-07-07 11:11:52 -07:00
Brad Davis
a04921e74b Merge branch 'master' into plugins 2015-07-07 11:10:51 -07:00
samcake
5557dc4da2 clean and release the new deferredLIghtingEffect 2015-07-07 10:00:05 -07:00
ZappoMan
a59fd44014 quiet some log spam 2015-07-07 09:04:20 -07:00