fix: rebase issues

pull/101/head
Erick Zanardo 4 years ago
parent 9c11113c58
commit 33724f7469

@ -5,7 +5,6 @@ import 'dart:math' as math;
import 'package:flame/extensions.dart'; import 'package:flame/extensions.dart';
import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:pinball/flame/blueprint.dart';
import 'package:pinball/game/game.dart'; import 'package:pinball/game/game.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';

@ -5,7 +5,6 @@ import 'dart:math' as math;
import 'package:flame/extensions.dart'; import 'package:flame/extensions.dart';
import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:pinball/flame/blueprint.dart';
import 'package:pinball/game/game.dart'; import 'package:pinball/game/game.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';

@ -4,13 +4,13 @@ import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';
/// {@template ramp_orientation} /// {@template ramp_orientation}
/// Determines if a ramp is facing [up] or [down] on the [Board]. /// Determines if a ramp is facing [up] or [down] on the Board.
/// {@endtemplate} /// {@endtemplate}
enum RampOrientation { enum RampOrientation {
/// Facing up on the [Board]. /// Facing up on the Board.
up, up,
/// Facing down on the [Board]. /// Facing down on the Board.
down, down,
} }
@ -109,4 +109,3 @@ class RampOpeningBallContactCallback<Opening extends RampOpening>
} }
} }
} }

@ -142,6 +142,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.1.0"
geometry:
dependency: transitive
description:
path: "../../geometry"
relative: true
source: path
version: "1.0.0+1"
js: js:
dependency: transitive dependency: transitive
description: description:

Loading…
Cancel
Save