Commit Graph

Select branches

Hide Pull Requests

enemy-movement

master

monster-collisions

pathing

sprite-usage

workflow

#1

#10

#15

#16

#18

#19

#2

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#36

#37

#38

#39

#4

#40

#41

#42

#43

#5

Mono Color

• 1a80bd538c Merge pull request #43 from n0remac/Xevion-patch-1 master Xevion 2020-04-26 14:41:46 -05:00
• bbcfa0c5c0 Delete pep8.yml Xevion 2020-04-26 14:34:50 -05:00
• 3e1c52f7b9 Merge pull request #42 from n0remac/armor Lief9100 2020-04-26 02:27:22 -07:00
• b3b5dc1790 Reset starting health to be full Lief9100 2020-04-26 02:26:18 -07:00
• d5effa5408 Updated readme Cameron Smart 2020-04-26 02:22:30 -07:00
• ee828af084 Took armor into account when dealing damage. Cameron Smart 2020-04-26 02:21:09 -07:00
• b84efd31b4 Added monster damage. Cameron Smart 2020-04-26 02:08:25 -07:00
• ef78606bce Fixed erroneous changes to stat increases. Cameron Smart 2020-04-26 01:59:54 -07:00
• 8ba737a7da update readme Cameron Smart 2020-04-26 01:15:54 -07:00
• 31d5ef8029 incresed speed boost on kills Cameron Smart 2020-04-26 01:11:15 -07:00
• f346a166dd Update README.md Cameron 2020-04-26 00:46:44 -07:00
• ced2fbd4b5 removed unused resources Cameron Smart 2020-04-26 00:43:59 -07:00
• a91a0f4a73 final touches Cameron Smart 2020-04-26 00:42:22 -07:00
• b557111ab7 Merge pull request #41 from n0remac/stats-upgrades Cameron 2020-04-25 23:00:25 -07:00
• 633e1e6450 capped healing to max_health Lief9100 2020-04-24 20:06:15 -07:00
• 173fb84f07 turned off debug Lief9100 2020-04-24 19:59:06 -07:00
• dfff002929 removed unused attribute Lief9100 2020-04-24 19:55:07 -07:00
• bf87c8196c added kill list display and removed kill tracking in player Lief9100 2020-04-24 19:53:57 -07:00
• 5642174af5 added speed boon with additional recipe Lief9100 2020-04-24 18:11:07 -07:00
• 061d688701 added basic health and armor info and boon calls Lief9100 2020-04-24 16:49:13 -07:00
• 9da3faac8f added boon functions and returns from kill funcitons Lief9100 2020-04-24 16:47:58 -07:00
• 9de313f440 added boon amounts and name list Lief9100 2020-04-24 16:44:18 -07:00
• ad04d2a6e1 move everything into init and use restart kwarg, remove setup function sprite-usage Xevion 2020-04-24 17:21:35 -05:00
• 67677eb6ce create new random tile choice function Xevion 2020-04-24 16:59:18 -05:00
• 91167ee35e arbitrary tile Xevion 2020-04-24 16:43:28 -05:00
• 484e5ce285 change all direct paths to SpritePath built paths Xevion 2020-04-24 16:43:10 -05:00
• 4b453e542c add docstrings and typehints to all functions Xevion 2020-04-24 16:36:10 -05:00
• 5e9f2e3fa1 fix docstrings, use Enums for Recipe class, rename recipe/kill funcs in ActiveRecipe, optimize sprite color func Xevion 2020-04-24 16:29:28 -05:00
• 251eef0a46 Merge pull request #40 from n0remac/enemy-movement Lief9100 2020-04-24 11:27:38 -07:00
• dd45c32283 Monsters on screen move randomly when not active. enemy-movement Cameron Smart 2020-04-24 01:36:44 -07:00
• 8fc41803f4 Moved all mob update code from main to MobHandler Cameron Smart 2020-04-23 22:13:19 -07:00
• d9ed451849 fix activateGhost and Frog functions, refactor & cleanup Xevion 2020-04-23 23:49:12 -05:00
• 6e6d4a6241 fix activateGhost and Frog functions, refactor & cleanup Xevion 2020-04-23 23:29:25 -05:00
• f24a4c5c21 Merge pull request #39 from n0remac/monster-collisions Lief9100 2020-04-23 19:25:51 -07:00
• 127738743b Moved physics engines to Mob. monster-collisions Cameron Smart 2020-04-23 18:50:40 -07:00
• 43ddaadc32 Moved monster logic from main to MonsterHandler. Cameron Smart 2020-04-23 16:38:23 -07:00
• 8db7fcc0ae Added monster collisions Cameron Smart 2020-04-22 23:46:38 -07:00
• 21ba3c73cf Merge pull request #38 from n0remac/monster-kill-combos Lief9100 2020-04-22 23:25:47 -07:00
• 9c26aa156f Shift key to cycle recipes Cameron Smart 2020-04-22 23:11:36 -07:00
• e9c8afa758 Added frogs. Linting. Cameron Smart 2020-04-22 22:17:37 -07:00
• 05a9900687 Active recipe in top right corner. Shift cycles recipes. Cameron Smart 2020-04-22 21:58:33 -07:00
• 68f572124a Added kill list and recipes. Checks every three kills. Cameron Smart 2020-04-22 20:18:00 -07:00
• 11ffacef01 add and implement active monster list Lief9100 2020-04-22 13:38:35 -07:00
• 7e213e7c59 added more monsters to test lag. Cameron Smart 2020-04-22 11:16:27 -07:00
• c684f0fdcc Merge pull request #37 from n0remac/rouge-like-sprites Lief9100 2020-04-22 01:50:13 -07:00
• c80cc9e78a complete assets with tiles, character, and mob sprites from same pack Cameron Smart 2020-04-22 01:29:53 -07:00
• 3d5b0f636c fix mob movement pathing Xevion 2020-04-21 18:44:54 -05:00
• 9b133749af add tick function for mob movement Xevion 2020-04-21 18:18:25 -05:00
• 02a650d72b add grid cleanup so pathing works more than once, fix matrix reverse obstacle/clear Xevion 2020-04-21 18:06:53 -05:00
• 50f56e4190 get path work and printing Xevion 2020-04-21 17:53:00 -05:00
• 7948662459 fix draw path function Xevion 2020-04-21 14:09:56 -05:00
• b65d12be16 create draw and get path methodology Xevion 2020-04-21 14:04:45 -05:00
• 2a1d1bce6e skeleton functions for pathing in Mobs using target attribute and target and dungeon references, create new TILE_SIZE config option Xevion 2020-04-21 13:50:17 -05:00
• 1d88c6b985 create dungeon matrix for pathfinding Xevion 2020-04-21 13:32:15 -05:00
• 6650da1172 use pipenv to run tests and linting workflow Xevion 2020-04-21 12:55:19 -05:00
• d4d519c398 fix CI workflow since move occured, cd back Xevion 2020-04-21 12:51:55 -05:00
• 0a818742bd delete old workflow, move new ci workflow into proper directory Xevion 2020-04-21 12:50:20 -05:00
• 5b53a8e227 Merge pull request #33 from n0remac/tests Xevion 2020-04-21 03:53:50 -05:00
• 8eb8db7e84 remove left over cd Xevion 2020-04-21 03:33:08 -05:00
• e87a259c46 Merge remote-tracking branch 'origin/tests' into tests Xevion 2020-04-21 03:18:14 -05:00
• 098972d787 add new continuous integration file Xevion 2020-04-21 03:15:48 -05:00
• 28fb2fc761 add new continuous integration file Xevion 2020-04-21 03:15:48 -05:00
• 7f8fd0ee04 add x, y tile debug rectangle Xevion 2020-04-21 03:11:20 -05:00
• 963a06d227 organize imports, less of a clusterfuck Xevion 2020-04-21 00:51:07 -05:00
• 7896210806 use minimize and run for fewer frames on test Xevion 2020-04-21 00:47:37 -05:00
• 3201e7c376 fix using primary instead of secondary for primary sprite holding folders, fix pattern string without comma breaking pattern list, smarter pytest fail statement Xevion 2020-04-21 00:38:51 -05:00
• 07c9126ae7 cleanup imports, improve typehints in sprites.py Xevion 2020-04-21 00:19:06 -05:00
• c5944dbb16 cleanup Game init Xevion 2020-04-21 00:13:55 -05:00
• fa50a28411 fix debug messages not under a DEBUG mode check Xevion 2020-04-21 00:11:38 -05:00
• 5744076dad create levels fixture for class; move out of level load test func Xevion 2020-04-21 00:09:47 -05:00
• 59c67f1d57 finish level loading function Xevion 2020-04-21 00:07:11 -05:00
• c6a8142358 fix sprite file finding and loading, prepare level loading test function Xevion 2020-04-21 00:05:11 -05:00
• 9bace25b93 add pytest cache folder to .gitignore Xevion 2020-04-20 23:57:23 -05:00
• 6c5c1e735c fix sprites fixture with simpler nested for loops Xevion 2020-04-20 23:53:39 -05:00
• a73b858474 add more typing, fix patterns and docstring, simplify patterns fixture, work on secondary/primary folders chain Xevion 2020-04-20 23:49:53 -05:00
• f53c977432 new sprite testing functions including regex based schema tests and sprite loading Xevion 2020-04-20 23:33:36 -05:00
• 8bac3a50d2 fix class names for pytest, add simple Game test Xevion 2020-04-20 22:47:13 -05:00
• b1795d3dac add pytest to Pipfile and Pipfile.lock Xevion 2020-04-20 22:46:56 -05:00
• 1a96b55e12 simplify docstrings, add misc test class Xevion 2020-04-20 22:17:03 -05:00
• 0ebb4ee59d Merge branch 'master' of github.com:n0remac/game-jam-2020 into tests Xevion 2020-04-20 22:15:21 -05:00
• 1c3a537ad1 basic class skeleton for tests file Xevion 2020-04-20 22:14:24 -05:00
• 1451260dce Merge pull request #32 from n0remac/perf Cameron 2020-04-20 20:13:33 -07:00
• a6003aaf9e send size 8 dungeon instead (64 levels) Xevion 2020-04-20 22:10:36 -05:00
• 48e48d4ae4 use Arial font for draw_text functions Xevion 2020-04-20 22:06:02 -05:00
• d1dfd908b7 Merge branch 'master' into perf Xevion 2020-04-20 21:54:16 -05:00
• 2feb1d98b3 add new debug config, create and implement FPSCounter class Xevion 2020-04-20 21:43:07 -05:00
• 625fe85527 make all wall and floor spritelists static, fix docstrinng Xevion 2020-04-20 20:53:18 -05:00
• c729ba9167 Merge pull request #31 from n0remac/positions-fix Cameron 2020-04-20 17:11:14 -07:00
• 294c86010b Merge branch 'master' into positions-fix Xevion 2020-04-20 19:03:12 -05:00
• 26fe091a10 Merge pull request #30 from n0remac/projectiles Lief9100 2020-04-20 16:24:54 -07:00
• 214f99cb8b Merge pull request #29 from n0remac/pathing-rebase Lief9100 2020-04-20 16:22:30 -07:00
• a6d24d1690 change to bottomLeft helper method Xevion 2020-04-20 16:55:36 -05:00
• b41ef318d6 fixed player placement Xevion 2020-04-20 16:53:49 -05:00
• b74b8f87c1 fix text rendering, get rid of unused wall and floor spriteLists Xevion 2020-04-20 16:18:51 -05:00
• a074706cd2 more attempts at fixing player placement Xevion 2020-04-20 16:15:53 -05:00
• 03d4cd7743 Fix formatting on condition main:212 Cameron Smart 2020-04-20 14:03:59 -07:00
• 6b74629a57 changed bullet speed and size, final format check Cameron Smart 2020-04-20 13:50:05 -07:00
• dff882770d removed whitespace and other formatting. Cameron Smart 2020-04-20 13:45:49 -07:00
• c051414870 remove config excess, add projectiles folder and temp classes Lief9100 2020-04-20 02:58:32 -07:00
• b06fcaf0f8 screen-projectile deletion fix, comment updates to note TEMP features Lief9100 2020-04-20 01:47:48 -07:00