Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 15:13:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27527 commits 71 branches 56 tags 1.2 GiB
Commit graph

27527 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
ZappoMan
20a9227070 Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats 2015-07-07 13:16:42 -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
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
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
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
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
Sam Gateau
2bbffff22f Fixing typos 2015-07-06 10:22:25 -07:00
Clément Brisset
c5a043f2e1 Merge pull request #5253 from ZappoMan/inBoundStats 
add edit update stats
 2015-07-04 21:11:48 -07:00
ZappoMan
c4a5160b89 CR feedback 2015-07-04 19:13:35 -07:00
Atlante45
85df510b4b Use depth bias to avoid z-fighting on text3d overlays 2015-07-04 18:40:37 -07:00
Atlante45
c61bf34200 Use depth bias to avoid z-fighting on text entities 2015-07-04 18:35:00 -07:00
Atlante45
9bf6c439aa Use depth bias to avoid z-fighting on display name 2015-07-04 18:34:19 -07:00
Atlante45
0093403bba Add depth bias option to simple programs 
Simple programs are now lazily generated and stored in a hash
 2015-07-04 18:33:03 -07:00
Atlante45
d243190caf Coding standard 2015-07-04 16:06:39 -07:00
Atlante45
32cf4dac78 Fix displayname z-fighting 2015-07-04 16:06:38 -07:00
Atlante45
0eb89efb34 Fix text entity billboarding 2015-07-04 16:06:38 -07:00
ZappoMan
74733452da some tweaks to make stats dialog more readable 2015-07-04 11:25:27 -07:00
ZappoMan
40cdd8646e add packets per second to octree processing stats 2015-07-03 15:53:53 -07:00
ZappoMan
2aa345dfc6 Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats 2015-07-03 15:04:59 -07:00
David Rowe
3f38a835d8 Fix look-at vectors not rendering if not looking at me 2015-07-03 13:49:10 -07:00
Eric Levin
3d06b011aa adding batch to renderHUD 2015-07-03 13:27:00 -07:00
samcake
c6a613eaa9 Merge pull request #5260 from ZappoMan/deadCodeRemovalMachine 
remove dead code
 2015-07-03 11:53:21 -07:00
ZappoMan
29a7584ee6 remove dead code 2015-07-03 11:29:59 -07:00
Eric Levin
9d3995ae25 Merge branch 'nakedGLStripping' of https://github.com/ericrius1/hifi into nakedGLStripping 2015-07-03 09:42:19 -07:00
Sam Gateau
e3c06a30a1 removing dead code 2015-07-02 19:29:09 -07:00
ZappoMan
e1530b3ce9 added a FIXME STUTTER note 2015-07-02 18:15:24 -07:00
samcake
f9562bedd9 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-02 18:14:45 -07:00