Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 16:54:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
27554 commits 71 branches 56 tags 1.2 GiB
Commit graph

27554 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
fb07956689 Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix 
fix for mirror rendering on windows
 2015-07-09 08:38:55 -07:00
Anthony J. Thibault
1be0e7ebc3 fix for mirror rendering on windows 
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
  I think this was working on Mac due to the different code paths in
  GLBackendTransform::updateTransform for core vs legacy gl profile.
 2015-07-08 21:33:27 -07:00
Brad Hefta-Gaub
02c3b63f45 Merge pull request #5282 from jherico/entity_parsing 
Working on fixing entity item parsing
 2015-07-08 21:02:23 -07:00
Brad Davis
b173ac397c Merge pull request #5278 from samcake/yellow 
Adding more NSight instrumentation
 2015-07-08 20:28:18 -07:00
Brad Davis
f2beb79d23 Updating buffer parser to use new heapless API 2015-07-08 18:54:38 -07:00
Brad Davis
49a14e3446 Merge remote-tracking branch 'upstream/master' into entity_parsing 2015-07-08 18:37:41 -07:00
Brad Davis
625cc86f83 Merge pull request #5283 from ZappoMan/optimizeByteCountCoded 
Optimize ByteCountCoded<> to not do extra heap allocations
 2015-07-08 18:35:02 -07:00
ZappoMan
7790e35d24 added bytes consumed result to decode, and exit early after bytes consumed 2015-07-08 18:19:12 -07:00
Brad Davis
600e9cbf52 Fixing template specialization compilation error on gcc/clang 2015-07-08 18:17:03 -07:00
Seth Alves
7bea4a54a3 Merge pull request #5274 from AndrewMeadows/argon 
cleanup of EntityActionInterface and friends
 2015-07-08 17:54:52 -07:00
ZappoMan
c0cdf3256c comment and dead code 2015-07-08 17:34:36 -07:00
ZappoMan
e885ac1821 improved performance of ByteCountCoding<> decode 2015-07-08 17:32:51 -07:00
Brad Davis
98e0688e98 Reducing heap allocation in network packet parsing 2015-07-08 17:21:38 -07:00
Philip Rosedale
61be0beba1 Merge pull request #5281 from howard-stearns/sword-offset-only-for-mosue 
sword-offset-only-for-mouse
 2015-07-08 17:13:45 -07:00
Howard Stearns
c8da325213 Fudge the offset so that operates only when using the mouse. 2015-07-08 16:59:54 -07:00
Philip Rosedale
82cad5dab3 Merge pull request #5279 from howard-stearns/sword-toolbar 
Sword:
 2015-07-08 15:34:48 -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
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
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
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
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
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