Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/flame/examples/lib/collision_detection.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:flame/collisions.dart';
import 'package:flame/components.dart';
import 'package:flame/effects.dart';
import 'package:flame/game.dart';
import 'package:flutter/material.dart' hide Image;
import 'package:material_ui/material_ui.dart' hide Image;

class CollisionDetectionGame extends FlameGame with HasCollisionDetection {
@override
Expand Down
2 changes: 1 addition & 1 deletion doc/flame/examples/lib/color_effect.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:doc_flame_examples/ember.dart';
import 'package:flame/components.dart';
import 'package:flame/effects.dart';
import 'package:flame/game.dart';
import 'package:flutter/animation.dart';
import 'package:flutter/cupertino.dart';

class ColorEffectExample extends FlameGame {
bool reset = false;
Expand Down
2 changes: 1 addition & 1 deletion doc/flame/examples/lib/glow_effect.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:flame/components.dart';
import 'package:flame/effects.dart';
import 'package:flame/game.dart';

import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

class GlowEffectExample extends FlameGame {
@override
Expand Down
2 changes: 1 addition & 1 deletion doc/flame/examples/lib/ray_cast.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:flame/components.dart';
import 'package:flame/game.dart';
import 'package:flame/geometry.dart';
import 'package:flame/palette.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

class RayCastExample extends FlameGame with HasCollisionDetection {
final origin = Vector2(20, 20);
Expand Down
2 changes: 1 addition & 1 deletion doc/flame/examples/lib/ray_trace.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:flame/events.dart';
import 'package:flame/game.dart';
import 'package:flame/geometry.dart';
import 'package:flame/palette.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

class RayTraceExample extends FlameGame
with HasCollisionDetection, TapCallbacks {
Expand Down
3 changes: 2 additions & 1 deletion doc/flame/examples/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ environment:
flutter: ">=3.44.0"

dependencies:
cupertino_ui: any
flame: ^1.38.0
flame_rive: ^1.11.2
flutter:
sdk: flutter
flutter_shaders:
material_ui: any
web: ^1.1.0

dev_dependencies:
flame_lint: ^1.4.3

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flame/components.dart';
import 'package:flame/input.dart';
import 'package:flame/text.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

class FlatButton extends ButtonComponent {
FlatButton(
Expand Down
1 change: 1 addition & 0 deletions doc/tutorials/klondike/app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ dependencies:
flame: ^1.38.0
flutter:
sdk: flutter
material_ui: any
web: ^1.1.0

dev_dependencies:
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/platformer/app/lib/ember_quest.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flame/components.dart';
import 'package:flame/events.dart';
import 'package:flame/game.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

import 'actors/ember.dart';
import 'actors/water_enemy.dart';
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/platformer/app/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flame/game.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

import 'ember_quest.dart';
import 'overlays/game_over.dart';
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/platformer/app/lib/objects/ground_block.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:math';

import 'package:flame/collisions.dart';
import 'package:flame/components.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

import '../ember_quest.dart';
import '../managers/segment_manager.dart';
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/platformer/app/lib/objects/star.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flame/collisions.dart';
import 'package:flame/components.dart';
import 'package:flame/effects.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

import '../ember_quest.dart';

Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/platformer/app/lib/overlays/game_over.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

import '../ember_quest.dart';

Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/platformer/app/lib/overlays/hud.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flame/components.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

import '../ember_quest.dart';
import 'heart.dart';
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/platformer/app/lib/overlays/main_menu.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

import '../ember_quest.dart';

Expand Down
1 change: 1 addition & 0 deletions doc/tutorials/platformer/app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies:
flutter:
sdk: flutter

material_ui: any
dev_dependencies:
flame_lint: ^1.4.3
flutter_test:
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/space_shooter/app/lib/step1/main.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flame/components.dart';
import 'package:flame/game.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

void main() {
runApp(GameWidget(game: SpaceShooterGame()));
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/space_shooter/app/lib/step2/main.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flame/components.dart';
import 'package:flame/events.dart';
import 'package:flame/game.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

void main() {
runApp(GameWidget(game: SpaceShooterGame()));
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/space_shooter/app/lib/step3/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:flame/components.dart';
import 'package:flame/events.dart';
import 'package:flame/game.dart';
import 'package:flame/parallax.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

void main() {
runApp(GameWidget(game: SpaceShooterGame()));
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/space_shooter/app/lib/step4/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:flame/components.dart';
import 'package:flame/events.dart';
import 'package:flame/game.dart';
import 'package:flame/parallax.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

void main() {
runApp(GameWidget(game: SpaceShooterGame()));
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/space_shooter/app/lib/step5/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:flame/events.dart';
import 'package:flame/experimental.dart';
import 'package:flame/game.dart';
import 'package:flame/parallax.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

void main() {
runApp(GameWidget(game: SpaceShooterGame()));
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/space_shooter/app/lib/step6/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'package:flame/events.dart';
import 'package:flame/experimental.dart';
import 'package:flame/game.dart';
import 'package:flame/parallax.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

void main() {
runApp(GameWidget(game: SpaceShooterGame()));
Expand Down
1 change: 1 addition & 0 deletions doc/tutorials/space_shooter/app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies:
flame: ^1.38.0
flutter:
sdk: flutter
material_ui: any
web: ^1.1.0

dev_dependencies:
Expand Down
2 changes: 1 addition & 1 deletion examples/games/crystal_ball/lib/crystal_ball.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'dart:ui';
import 'package:crystal_ball/src/game/game.dart';

import 'package:flame/game.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

class CrystalBallWidget extends StatefulWidget {
const CrystalBallWidget({super.key});
Expand Down
2 changes: 1 addition & 1 deletion examples/games/crystal_ball/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:crystal_ball/crystal_ball.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

void main() async {
runApp(const CrystalBallWidget());
Expand Down
1 change: 1 addition & 0 deletions examples/games/crystal_ball/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies:
flutter:
sdk: flutter

material_ui: any
dev_dependencies:
flame_lint: ^1.4.3

Expand Down
2 changes: 1 addition & 1 deletion examples/games/padracing/lib/car.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'dart:ui';
import 'package:flame/components.dart';
import 'package:flame/extensions.dart';
import 'package:flame_forge2d/flame_forge2d.dart' hide World;
import 'package:flutter/material.dart' hide Image, Gradient;
import 'package:material_ui/material_ui.dart' hide Image, Gradient;
import 'package:padracing/game_colors.dart';
import 'package:padracing/lap_line.dart';
import 'package:padracing/padracing_game.dart';
Expand Down
2 changes: 1 addition & 1 deletion examples/games/padracing/lib/game_colors.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flame/extensions.dart';
import 'package:flutter/material.dart' hide Image, Gradient;
import 'package:material_ui/material_ui.dart' hide Image, Gradient;

enum GameColors {
green,
Expand Down
2 changes: 1 addition & 1 deletion examples/games/padracing/lib/game_over.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:flutter/material.dart' hide Image, Gradient;
import 'package:material_ui/material_ui.dart' hide Image, Gradient;
import 'package:padracing/menu_card.dart';
import 'package:padracing/padracing_game.dart';

Expand Down
2 changes: 1 addition & 1 deletion examples/games/padracing/lib/lap_line.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'dart:ui';
import 'package:flame/extensions.dart';
import 'package:flame/palette.dart';
import 'package:flame_forge2d/flame_forge2d.dart' hide World;
import 'package:flutter/material.dart' hide Image, Gradient;
import 'package:material_ui/material_ui.dart' hide Image, Gradient;

import 'package:padracing/car.dart';
import 'package:padracing/game_colors.dart';
Expand Down
3 changes: 1 addition & 2 deletions examples/games/padracing/lib/lap_text.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import 'package:flame/components.dart';
import 'package:flame/extensions.dart';
import 'package:flutter/material.dart' hide Image, Gradient;
import 'package:google_fonts/google_fonts.dart';

import 'package:material_ui/material_ui.dart' hide Image, Gradient;
import 'package:padracing/car.dart';
import 'package:padracing/padracing_game.dart';

Expand Down
2 changes: 1 addition & 1 deletion examples/games/padracing/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:flutter/material.dart' hide Image, Gradient;
import 'package:material_ui/material_ui.dart' hide Image, Gradient;
import 'package:padracing/padracing_widget.dart';

void main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/games/padracing/lib/menu.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart' hide Image, Gradient;
import 'package:material_ui/material_ui.dart' hide Image, Gradient;
import 'package:padracing/game_colors.dart';
import 'package:padracing/menu_card.dart';
import 'package:padracing/padracing_game.dart';
Expand Down
2 changes: 1 addition & 1 deletion examples/games/padracing/lib/menu_card.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:flutter/material.dart' hide Image, Gradient;
import 'package:material_ui/material_ui.dart' hide Image, Gradient;

import 'package:padracing/game_colors.dart';

Expand Down
2 changes: 1 addition & 1 deletion examples/games/padracing/lib/padracing_game.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import 'package:flame/effects.dart';
import 'package:flame/extensions.dart';
import 'package:flame/input.dart';
import 'package:flame_forge2d/flame_forge2d.dart' hide World;
import 'package:flutter/material.dart' hide Image, Gradient;
import 'package:flutter/services.dart';
import 'package:material_ui/material_ui.dart' hide Image, Gradient;
import 'package:padracing/ball.dart';
import 'package:padracing/car.dart';
import 'package:padracing/game_colors.dart';
Expand Down
3 changes: 1 addition & 2 deletions examples/games/padracing/lib/padracing_widget.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:flame/game.dart';
import 'package:flutter/material.dart' hide Image, Gradient;
import 'package:google_fonts/google_fonts.dart';

import 'package:material_ui/material_ui.dart' hide Image, Gradient;
import 'package:padracing/game_over.dart';
import 'package:padracing/menu.dart';
import 'package:padracing/padracing_game.dart';
Expand Down
2 changes: 1 addition & 1 deletion examples/games/padracing/lib/tire.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flame/palette.dart';
import 'package:flame_forge2d/flame_forge2d.dart' hide World;
import 'package:flutter/material.dart' hide Image, Gradient;
import 'package:flutter/services.dart';
import 'package:material_ui/material_ui.dart' hide Image, Gradient;
import 'package:padracing/car.dart';
import 'package:padracing/padracing_game.dart';
import 'package:padracing/trail.dart';
Expand Down
1 change: 1 addition & 0 deletions examples/games/padracing/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dependencies:
flutter:
sdk: flutter
google_fonts: ^8.0.2
material_ui: any
url_launcher: ^6.1.11

dev_dependencies:
Expand Down
2 changes: 1 addition & 1 deletion examples/games/trex/lib/trex_game.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import 'package:flame/flame.dart';
import 'package:flame/game.dart';
import 'package:flame/input.dart';
import 'package:flame/text.dart';
import 'package:flutter/material.dart' hide Image;
import 'package:flutter/services.dart';
import 'package:material_ui/material_ui.dart' hide Image;
import 'package:trex_game/background/horizon.dart';
import 'package:trex_game/game_over.dart';
import 'package:trex_game/player.dart';
Expand Down
2 changes: 1 addition & 1 deletion examples/games/trex/lib/trex_widget.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flame/game.dart';
import 'package:flutter/material.dart' hide Image, Gradient;
import 'package:material_ui/material_ui.dart' hide Image, Gradient;
import 'package:trex_game/trex_game.dart';

class TRexWidget extends StatelessWidget {
Expand Down
1 change: 1 addition & 0 deletions examples/games/trex/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ dependencies:
flutter:
sdk: flutter

material_ui: any
dev_dependencies:
flame_lint: ^1.4.3
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/lib/commons/rounded_rect_component.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flame/components.dart';
import 'package:flame/extensions.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

/// A rectangle whose corners are rounded with half of its height, so that
/// its short sides are semicircles.
Expand Down
3 changes: 1 addition & 2 deletions examples/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import 'package:examples/stories/tiled/tiled.dart';
import 'package:examples/stories/utils/utils.dart';
import 'package:examples/stories/widgets/widgets.dart';
import 'package:flame/game.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

void main() {
final page = PageProviderImpl().getPage();
Expand All @@ -63,7 +63,6 @@ void main() {
void runAsDashbook() {
final dashbook = Dashbook(
title: 'Flame Examples',
theme: ThemeData.dark(),
Comment thread
spydon marked this conversation as resolved.
);

// Some small sample games
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'package:examples/stories/bridge_libraries/flame_forge2d/utils/style.dart
import 'package:flame/components.dart';
import 'package:flame/effects.dart';
import 'package:flame/events.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

const TextStyle _textStyle = TextStyle(color: Colors.white, fontSize: 2);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:examples/stories/bridge_libraries/flame_forge2d/utils/boundaries
import 'package:examples/stories/bridge_libraries/flame_forge2d/utils/style.dart';
import 'package:flame/events.dart';
import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:flutter/material.dart' hide Draggable;
import 'package:material_ui/material_ui.dart' hide Draggable;

class DragCallbacksExample extends Forge2DExampleGame {
static const description = '''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:examples/stories/bridge_libraries/flame_forge2d/utils/style.dart
import 'package:flame/components.dart';
import 'package:flame/events.dart';
import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

class WeldJointExample extends Forge2DExampleGame {
static const description = '''
Expand Down
Loading
Loading