Code

Sprites Take 2#264

Code

Closed

alecpm wants to merge 110 commits intomasterDallinger/Griduniverse:masterfrom one-hour-one-lifeDallinger/Griduniverse:one-hour-one-lifeCopy head branch name to clipboard

+24,305-23,810

Commits

Commits on Jul 19, 2023

• Add support for YAML configuration of game details.

  alecpm

  committed
  8712acf

  Copy full SHA for 8712acf

• Merge pull request #244 from Dallinger/yaml-game-config

  Show description for 5d96b83
  jessesnyder

  authored
  5d96b83

  Copy full SHA for 5d96b83

Commits on Jul 20, 2023

• Fix game_config file lookup path.

  alecpm

  committed
  217ecec

  Copy full SHA for 217ecec

• Make object and transition config accessible to client side

  jessesnyder

  committed
  5805389

  Copy full SHA for 5805389

• Remove unsused var

  jessesnyder

  committed
  1aacbf7

  Copy full SHA for 1aacbf7

Commits on Jul 21, 2023

• Hard-code a type_id for food, for now

  jessesnyder

  committed
  61936c2

  Copy full SHA for 61936c2

• Replace Food with generic Resource

  jessesnyder

  committed
  9beb69d

  Copy full SHA for 9beb69d

• Add Food to game config

  jessesnyder

  committed
  e9654de

  Copy full SHA for e9654de

• Add some notes

  jessesnyder

  committed
  1757b62

  Copy full SHA for 1757b62

• incorporate objects defined in yaml configuration into gridworld

  cguardia

  committed
  2eabd8b

  Copy full SHA for 2eabd8b

• Only consume things immediately if they're non-interactive

  jessesnyder

  committed
  a2e7e90

  Copy full SHA for a2e7e90

• Merge branch 'issues/233-participants-see-objects' into issues/232-new-object-types

  jessesnyder

  committed
  6442db1

  Copy full SHA for 6442db1

• Bugfix: attribute name

  jessesnyder

  committed
  d2c809e

  Copy full SHA for d2c809e

• Add some logging on grid object spawning

  jessesnyder

  committed
  61730ae

  Copy full SHA for 61730ae

• Use YAML config for Food, and remove other objects for now

  jessesnyder

  committed
  43c5a73

  Copy full SHA for 43c5a73

• Update attr names in JS to match python

  jessesnyder

  committed
  130301c

  Copy full SHA for 130301c

• Commit compiled JS

  jessesnyder

  committed
  17b8f4c

  Copy full SHA for 17b8f4c

Commits on Jul 22, 2023

• Use item rather than object or resource

  cguardia

  committed
  fe9ef39

  Copy full SHA for fe9ef39

Commits on Jul 24, 2023

• Commit compiled JS

  jessesnyder

  committed
  4f88723

  Copy full SHA for 4f88723

• tablib is no longer a dependency, so remove related test

  jessesnyder

  committed
  ef257ff

  Copy full SHA for ef257ff

• Mechanical changes to get most tests passing again

  jessesnyder

  committed
  03b09e7

  Copy full SHA for 03b09e7

• Use a shared reference to item_config across Item instances

  jessesnyder

  committed
  02cbb59

  Copy full SHA for 02cbb59

Commits on Jul 25, 2023

• Move from hard-coding colors to using a "sprite" definition in game_config.yml

  jessesnyder

  committed
  6abf932

  Copy full SHA for 6abf932

• Add note about possibly avoidable copy of shared values

  jessesnyder

  committed
  a2494ee

  Copy full SHA for a2494ee

Commits on Jul 26, 2023

• Port maturation threshold and speed to item config

  jessesnyder

  committed
  4be6708

  Copy full SHA for 4be6708

• Attempt to blindly update grid item deserialization

  jessesnyder

  committed
  4789d8d

  Copy full SHA for 4789d8d

• add black; first black run updates

  cguardia

  committed
  44e8614

  Copy full SHA for 44e8614

• add default item config; use item count and calories instead of global config

  cguardia

  committed
  24a775a

  Copy full SHA for 24a775a

• Fix some bugs with replenish_items(), but some still remain

  jessesnyder

  committed
  8ddd3fe

  Copy full SHA for 8ddd3fe

Commits on Jul 27, 2023

• move away form grid based to item based config and evaluation

  cguardia

  committed
  b44192a

  Copy full SHA for b44192a

• fix merge conflict

  cguardia

  committed
  2b86e49

  Copy full SHA for 2b86e49

Commits on Jul 28, 2023

• Update supported python versions

  jessesnyder

  committed
  2d9e251

  Copy full SHA for 2d9e251

• Make Item immutable(ish)

  jessesnyder

  committed
  c768385

  Copy full SHA for c768385

• Better test isolation

  jessesnyder

  committed
  b831c99

  Copy full SHA for b831c99

• Blacken tests

  jessesnyder

  committed
  a2fcae5

  Copy full SHA for a2fcae5

• Make instruction test very basic for now

  jessesnyder

  committed
  7b09115

  Copy full SHA for 7b09115

• Greatly reduce mocking and make sure @Property patches are removed on tear-down

  jessesnyder

  committed
  31e06c6

  Copy full SHA for 31e06c6

• Restore docstring

  jessesnyder

  committed
  e795dc7

  Copy full SHA for e795dc7

Commits on Jul 31, 2023

• Restore config.txt, add docstring, remove spurious comment

  jessesnyder

  committed
  3d1419b

  Copy full SHA for 3d1419b

• Optimize replenish_items

  jessesnyder

  committed
  395f571

  Copy full SHA for 395f571

• Add player config with distribution config.

  alecpm

  committed
  2410991

  Copy full SHA for 2410991

• Merge pull request #248 from /issues/232-new-object-types

  Show description for 64d7583
  alecpm

  authored
  64d7583

  Copy full SHA for 64d7583

• Blacken

  jessesnyder

  committed
  87a2a32

  Copy full SHA for 87a2a32

• Test fixes.

  alecpm

  committed
  bfdf457

  Copy full SHA for bfdf457

• Add pre-commit hooks and blacken everything.

  alecpm

  committed
  68bc57b

  Copy full SHA for 68bc57b

• Make pytest work

  

  silviot

  authored and

  alecpm

  committed
  298acba

  Copy full SHA for 298acba

• Initial CI workflow definition

  

  silviot

  authored and

  alecpm

  committed
  81d3d02

  Copy full SHA for 81d3d02

• Add cache and test reporting

  

  silviot

  authored and

  alecpm

  committed
  fc57417

  Copy full SHA for fc57417

• Start dallinger services before running tests

  

  silviot

  authored and

  alecpm

  committed
  b8a7d87

  Copy full SHA for b8a7d87

• Naively fix tests

  

  silviot

  authored and

  alecpm

  committed
  ca0a9ce

  Copy full SHA for ca0a9ce

• Add tablib to griduniverse dependencies

  

  silviot

  authored and

  alecpm

  committed
  250d6da

  Copy full SHA for 250d6da

• Remove no longer used travis config file

  

  silviot

  authored and

  alecpm

  committed
  f1ff539

  Copy full SHA for f1ff539

• Install dependencies in the versions specified by dallinger

  

  silviot

  authored and

  alecpm

  committed
  25f6511

  Copy full SHA for 25f6511

• Symlink game_config.yml to make tests pass

  

  silviot

  authored and

  alecpm

  committed
  0da3116

  Copy full SHA for 0da3116

• Try to fix a couple of hacks in the CI setup.

  alecpm

  committed
  f5587cc

  Copy full SHA for f5587cc

• Mark replay test as xfail and add pre-commit to CI.

  alecpm

  committed
  df3738f

  Copy full SHA for df3738f

• Merge pull request #246 from /issues/236-transitions

  Show description for 8e697b5
  alecpm

  authored
  8e697b5

  Copy full SHA for 8e697b5

• Badge update

  alecpm

  committed
  0523685

  Copy full SHA for 0523685

• Another readme update.

  alecpm

  committed
  d62176b

  Copy full SHA for d62176b

Commits on Aug 2, 2023

• Update pre-commit.

  alecpm

  committed
  8d074de

  Copy full SHA for 8d074de

• WIP transition support.

  alecpm

  committed
  f9a8b25

  Copy full SHA for f9a8b25

• Test fix.

  alecpm

  committed
  479ea35

  Copy full SHA for 479ea35

• Immutability fix. Test fix.

  alecpm

  committed
  e726094

  Copy full SHA for e726094

• Fix formatting issue.

  alecpm

  committed
  7bb0064

  Copy full SHA for 7bb0064

• Fix formatting issues.

  alecpm

  committed
  b555533

  Copy full SHA for b555533

• Fix Item.remaining_uses default issue, add some docstrings and tests.

  alecpm

  committed
  4cbf055

  Copy full SHA for 4cbf055

• Make some of the transition logic a little clearer.

  alecpm

  committed
  a83d656

  Copy full SHA for a83d656

Commits on Aug 3, 2023

• Merge pull request #253 from /issues/236-241-transitions

  Show description for afb6e07
  alecpm

  authored
  afb6e07

  Copy full SHA for afb6e07

• Add tests for object pickup

  silviot

  committed
  0cbcb2c

  Copy full SHA for 0cbcb2c

• Add tests for object drop

  silviot

  committed
  fbf5858

  Copy full SHA for fbf5858

• Add ItemCollection, and move it and Item to separate module

  jessesnyder

  committed
  a6da6d3

  Copy full SHA for a6da6d3

• Compiled JS

  jessesnyder

  committed
  1168ea0

  Copy full SHA for 1168ea0

• Display info about interactive item player shares square with

  jessesnyder

  committed
  dee51ef

  Copy full SHA for dee51ef

• Remove unused code

  jessesnyder

  committed
  39628a9

  Copy full SHA for 39628a9

• Oops... actually add the new items.js file

  jessesnyder

  committed
  7000cec

  Copy full SHA for 7000cec

• Update gitignore

  jessesnyder

  committed
  a69aed9

  Copy full SHA for a69aed9

• Commit compiled JS

  jessesnyder

  committed
  4b88145

  Copy full SHA for 4b88145

• Savepoint: get things working after rebase

  jessesnyder

  committed
  fe15c7e

  Copy full SHA for fe15c7e

• Savepoint

  jessesnyder

  committed
  d3847e7

  Copy full SHA for d3847e7

• Missed remainingUses attribute

  jessesnyder

  committed
  a80a550

  Copy full SHA for a80a550

• Single point of truth for Item grid positions

  jessesnyder

  committed
  1bf354c

  Copy full SHA for 1bf354c

• Merge branch 'issues/234-player-item-interaction__pos-single-point-of-truth' into issues/234-player-item-interaction

  jessesnyder

  committed
  c259e9a

  Copy full SHA for c259e9a

• Commit compiled JS

  jessesnyder

  committed
  7aaefe3

  Copy full SHA for 7aaefe3

• Docstring

  jessesnyder

  committed
  65a06f3

  Copy full SHA for 65a06f3

• Better API for iterating grid items

  jessesnyder

  committed
  31ac077

  Copy full SHA for 31ac077

• Missed a case

  jessesnyder

  committed
  5068ed4

  Copy full SHA for 5068ed4

• Use strings for item IDs, for sanity

  jessesnyder

  committed
  36c299f

  Copy full SHA for 36c299f

Commits on Aug 4, 2023

• Use strings for item IDs, for sanity

  jessesnyder

  committed
  8895400

  Copy full SHA for 8895400

• Show transition options

  jessesnyder

  committed
  1a736b5

  Copy full SHA for 1a736b5

• Test fixes

  jessesnyder

  committed
  cb3091f

  Copy full SHA for cb3091f

• Add trasition test

  silviot

  committed
  5fed0b0

  Copy full SHA for 5fed0b0

• Refactor test fixtures

  silviot

  committed
  4e4cb46

  Copy full SHA for 4e4cb46

• PR review fixes

  jessesnyder

  committed
  9391950

  Copy full SHA for 9391950

• Bug fixes

  jessesnyder

  committed
  04b75d1

  Copy full SHA for 04b75d1

• Merge pull request #255 from /issues/234-player-item-interaction-fixes-jms

  Show description for 405404a
  jessesnyder

  authored
  405404a

  Copy full SHA for 405404a

• Fix linting error.

  alecpm

  committed
  23e6beb

  Copy full SHA for 23e6beb

• Merge pull request #254 from /issues/236-241-transitions-tests

  Show description for 701aa5f
  alecpm

  authored
  701aa5f

  Copy full SHA for 701aa5f

• Merge pull request #252 from /issues/234-player-item-interaction

  Show description for e5c1d7d
  jessesnyder

  authored
  e5c1d7d

  Copy full SHA for e5c1d7d

• Additional transition and consumption tests. Fixes.

  alecpm

  committed
  bb6bfc2

  Copy full SHA for bb6bfc2

• Use consistent checks for undefined. Explicitly require lodash. Cleanup miscellaneous JS issues and deprecations.

  alecpm

  committed
  554f3a3

  Copy full SHA for 554f3a3

• Need to install the JS deps to test the JS build.

  alecpm

  committed
  a9de96d

  Copy full SHA for a9de96d

• Make sure we install yarn.

  alecpm

  committed
  322cfd9

  Copy full SHA for 322cfd9

• Allow the build to run on linux.

  alecpm

  committed
  c439c97

  Copy full SHA for c439c97

• Merge pull request #257 from Dallinger/miscellaneous-js-build-cleanup

  Show description for 293390c
  alecpm

  authored
  293390c

  Copy full SHA for 293390c

• Implement transition visibility. Update some variable names. More complex single player game by default.

  alecpm

  committed
  dbfee86

  Copy full SHA for dbfee86

• Tweak some variable names.

  alecpm

  committed
  53dad97

  Copy full SHA for 53dad97

• Change up emoji

  alecpm

  committed
  abf6d6a

  Copy full SHA for abf6d6a

• Small documentation update.

  alecpm

  committed
  3399e11

  Copy full SHA for 3399e11

• Misc fixes.

  alecpm

  committed
  92f1bf4

  Copy full SHA for 92f1bf4

• Merge pull request #258 from /issues/256-transition-visibility

  Show description for 0e05a3a
  alecpm

  authored
  0e05a3a

  Copy full SHA for 0e05a3a