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
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
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
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
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
Brad Hefta-Gaub
3842e748b5
Merge pull request #5256 from Atlante45/fix_billboard
...
Fix display name z-fighting
2015-07-06 19:08:08 -07:00
Atlante45
2ba6bd3afc
Double display name offset
2015-07-06 18:39:43 -07:00
Atlante45
687f9dda4a
Restore old offset behaviors
2015-07-06 18:21:17 -07:00
Atlante45
541d9ae431
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard
2015-07-06 18:05:43 -07:00
Brad Davis
bd938d5f4c
Merge pull request #5263 from ZappoMan/inBoundStats
...
Additional inbound entity stats
2015-07-06 17:12:19 -07:00
ZappoMan
05f28064bf
add stats for PPS for inbound from network into OctreePacketProcessor and processing out of OctreePacketProcessor
2015-07-06 16:03:42 -07:00
samcake
c090bd0bd7
Merge branch 'yellow' of https://github.com/samcake/hifi into daft
2015-07-06 15:46:21 -07:00
samcake
9649fe45e4
fix a bad paintRainbow function in the shader...
2015-07-06 15:45:26 -07:00
Brad Hefta-Gaub
96fecd093d
Merge pull request #5237 from samcake/yellow
...
Introducing the Status to the render::Scene & Engine, a per item information that can be displayed in 3D for debug
2015-07-06 15:41:58 -07:00
samcake
a8ddc71946
Merge pull request #5262 from bwent/cookies
...
Added checkbox functionality, double-click to reset panel
2015-07-06 15:09:16 -07:00
Sam Gateau
fe633cd545
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-06 15:04:02 -07:00
bwent
8b4398cd5a
Update cookies.js
2015-07-06 15:03:21 -07:00
bwent
2bdd2b8c2c
Update cookies.js
2015-07-06 15:02:51 -07:00
samcake
a2f6693bd7
getting the deferred lighting to work
2015-07-06 14:40:10 -07:00
Sam Gateau
4d48b98364
For a fistfull of magic numbers
2015-07-06 14:22:09 -07:00
bwent
5d91f1be83
Removed header comments
2015-07-06 13:26:16 -07:00
David Rowe
5046f4c1ac
Update upgrade dialog
...
- Strip out "<br />"s
- Show information for all new versions since current, not just latest
- Display scrollbar if content too long to show all at once
- "version" / "versions" behind depending on if one or more
- Align buttons with heading and text
- Darken text so that is more readable
2015-07-06 13:19:42 -07:00
Sam Gateau
95f5b14d45
CLenaing the interface of Item::Status to be more explicit and removing magic numbers
2015-07-06 12:47:35 -07:00
Sam Gateau
e63be58251
CLenaing the interface of Item::Status to be more explicit
2015-07-06 12:23:57 -07:00
bwent
93fbfcbff7
Added checkbox functionality, double-click to reset panel
2015-07-06 12:09:08 -07:00
Brad Davis
21562c0766
Merge pull request #5258 from ericrius1/nakedGLStripping
...
Removing naked GL calls from overlay code
2015-07-06 10:25:50 -07:00
