Commit Graph

Select branches

Hide Pull Requests

map_generation

master

test

webserver

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#123

#124

#125

#126

#127

#128

#129

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#160

#161

#162

#82

#83

#84

#85

#86

#87

#88

#89

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

v23.14

v3.14

v3.14.1

Mono Color

• d49c138257 Merge branch 'master' into 'ladders' ynerant 2021-01-06 17:29:26 +01:00
• 0c2b10b031 Use ternary conditions to gain coverage Yohann D'ANELLO 2021-01-06 17:21:17 +01:00
• 887a190f11 Less complexity on the handle key function Yohann D'ANELLO 2021-01-06 17:00:43 +01:00
• 41548504de Test ladders Yohann D'ANELLO 2021-01-06 16:09:53 +01:00
• a48e6325fe Add log message when the player switches floor Yohann D'ANELLO 2021-01-06 15:55:44 +01:00
• 15ef6af998 Put the texturepack in alphabetical order again. Eichhornchen 2021-01-06 15:49:54 +01:00
• 4cd4bc9005 Display the current floor in the StatsDisplay Yohann D'ANELLO 2021-01-06 15:17:02 +01:00
• d06a405120 Use a key to use ladders Yohann D'ANELLO 2021-01-06 14:55:16 +01:00
• 2dc178d67c Merge branch 'equipment' into doc Eichhornchen 2021-01-06 14:49:09 +01:00
• 77d501c389 Merge branch 'master' into doc Eichhornchen 2021-01-06 14:39:23 +01:00
• 10788a24ec Pin Sphinx version Yohann D'ANELLO 2021-01-06 13:53:42 +01:00
• 4ad7d6c37c Added rings that can augment the player's statistics. Also added a new statistic : xp_buff, which helps the player level up sooner. eichhornchen 2021-01-06 11:44:52 +01:00
• a9aeb9ca3a Repaired the use functionnality of the main item, as well as the load system for Armor items. eichhornchen 2021-01-06 11:13:17 +01:00
• f3fe04e13a The player now has two hands and a slot for a helmet and a chestplate. Accordingly, new classes of items have been added. eichhornchen 2021-01-06 10:46:36 +01:00
• 601062237d Repairing part of the tests. eichhornchen 2021-01-05 19:50:25 +01:00
• 424044a5e4 Added an overpowered eagle boss. To avoid seing it too often, entities now have a certain chance of being spawned. Closes #19. eichhornchen 2021-01-05 19:40:11 +01:00
• 3ace133037 Critical hit chance is now displayed along with the other stats. eichhornchen 2021-01-05 19:23:25 +01:00
• 4bddf076ea Fighting now takes into account the constitution. Closes #51 eichhornchen 2021-01-05 19:18:25 +01:00
• 9b8dfb00da Added critical hit system: the player and rabbit entities have a chance of making x4 damage! Closes #52 eichhornchen 2021-01-05 19:07:15 +01:00
• 2f95ce3d5f Merge branch 'familiars' into 'master' eichhornchen 2021-01-05 11:03:39 +01:00
• 9cb5c9157f Linting eichhornchen 2021-01-05 10:59:17 +01:00
• bb77dab628 Fixed a error induced by the merge: creditsdisplay did not have an update function eichhornchen 2021-01-05 10:49:04 +01:00
• 7f63ab2357 Merge branch 'master' into 'familiars' eichhornchen 2021-01-05 10:27:39 +01:00
• 6341f39fb0 Linting eichhornchen 2021-01-05 10:20:55 +01:00
• c378eead74 Fixed the game loading tests : removed trumpets from the test. eichhornchen 2021-01-05 10:11:55 +01:00
• f821fef430 added tests eichhornchen 2021-01-05 09:38:49 +01:00
• c329150aac Linting again eichhornchen 2020-12-31 17:15:24 +01:00
• 73952a42f3 Added tests for familiars eichhornchen 2020-12-31 15:43:38 +01:00
• 8e0b8d4fee Added a test for lines 106-107 of game.py eichhornchen 2020-12-31 15:16:40 +01:00
• 7cd4721daa linting eichhornchen 2020-12-31 15:00:20 +01:00
• de3aba396d Re-changed familiar's inheritance from friendlyEntity to FightingEntity (just a leftover from debug) eichhornchen 2020-12-31 14:51:17 +01:00
• 663fc0eecd Better teleport Yohann D'ANELLO 2020-12-26 21:13:17 +01:00
• 6b7f8867fa Tile colors can be overwritten Yohann D'ANELLO 2020-12-26 14:02:35 +01:00
• 9a56b4d7e9 Navigate through different maps while climbing ladders Yohann D'ANELLO 2020-12-26 01:08:43 +01:00
• 8636d571b5 Add ladders in the map Yohann D'ANELLO 2020-12-26 00:52:47 +01:00
• ad5ae22e5f Manage multiple maps in one game Yohann D'ANELLO 2020-12-26 00:45:17 +01:00
• 505e0a4efb Fixes issue #54, repaired the attribution of the familiars' target eichhornchen 2020-12-21 14:23:58 +01:00
• 8afa082708 Add Python 3.6 and 3.10 support, fixes #53 Yohann D'ANELLO 2020-12-20 17:54:33 +01:00
• 0b9606cbfe Update entities documentation Yohann D'ANELLO 2020-12-20 17:52:44 +01:00
• 32072ade42 Fix some documentation issues Yohann D'ANELLO 2020-12-19 13:37:28 +01:00
• ed6457e94d Test credits menu Yohann D'ANELLO 2020-12-18 23:39:56 +01:00
• 4b174f26e4 Better colors Yohann D'ANELLO 2020-12-18 23:36:08 +01:00
• 411744bf10 Add credits menu, see #42 Yohann D'ANELLO 2020-12-18 22:24:41 +01:00
• ea5f5c1428 Added an original text art to serve as the project's logo. eichhornchen 2020-12-18 21:30:16 +01:00
• 762bed888a Working visibility (at least relatively good), but a few lines untested Nicolas Margulies 2020-12-18 21:21:00 +01:00
• f5e5e365d4 Starting the implementation of the new map generator Charles Peyrat 2020-12-18 20:02:37 +01:00
• c01307202a Add shields to be more protected, see #48 Yohann D'ANELLO 2020-12-18 20:01:52 +01:00
• b876dab156 Register Trumpet as savable entity Yohann D'ANELLO 2020-12-18 18:13:39 +01:00
• ba3d979f9c Fix syntax error Charles Peyrat 2020-12-18 18:10:52 +01:00
• 9aa684fb77 Use directly equipped items outside the inventory Yohann D'ANELLO 2020-12-18 17:57:42 +01:00
• 9475725228 Save equipped item and armor Yohann D'ANELLO 2020-12-18 17:50:26 +01:00
• 0394c5d15d Linting Yohann D'ANELLO 2020-12-18 17:46:38 +01:00
• e1918ab066 tick function takes the player as argument Yohann D'ANELLO 2020-12-18 17:40:52 +01:00
• 1b4612afd0 Swords add strength Yohann D'ANELLO 2020-12-18 17:39:11 +01:00
• fe769c4488 We can equip items Yohann D'ANELLO 2020-12-18 17:30:03 +01:00
• dadafc84eb Added a familiar class that follows the player around and hits monsters when it sees one. Added a trumpet, an instance of familiar. Closes #46. eichhornchen 2020-12-18 17:29:59 +01:00
• 5fbb918132 Add walls even to map borders Charles Peyrat 2020-12-18 17:05:50 +01:00
• 86628fdea6 Working visibility and displaying it, still need to hide things that aren't visible Nicolas Margulies 2020-12-18 17:04:45 +01:00
• 330d78702a Merge branch 'capitalism' into 'master' ynerant 2020-12-18 16:44:55 +01:00
• 77f52b6276 Screen is refreshed only when pads are all refreshed, fixes #50 Yohann D'ANELLO 2020-12-18 16:40:52 +01:00
• 5ae49e71ff Display the amount of hazels in the store menu, closes #49 Yohann D'ANELLO 2020-12-18 15:36:25 +01:00
• 8ecbf13eae Being able to calculate paths is now a property of fighting entities. eichhornchen 2020-12-18 15:31:23 +01:00
• 46ce7c33bf Merchant menu is updated through its update function, and does not access globally to the Game instance Yohann D'ANELLO 2020-12-18 15:15:47 +01:00
• 85870494a0 More generic display update Yohann D'ANELLO 2020-12-18 15:07:09 +01:00
• b8d32b29c8 Test selling items Yohann D'ANELLO 2020-12-18 02:17:06 +01:00
• c55a7451e7 Display more precisely where we are in the store menu Yohann D'ANELLO 2020-12-18 01:50:11 +01:00
• 9a556ba669 We can now buy items to merchants, closes #47 Yohann D'ANELLO 2020-12-18 01:05:50 +01:00
• a5890a341d Display inventory menu next to the merchant menu Yohann D'ANELLO 2020-12-17 23:46:20 +01:00
• 62ce2b5c71 Merge remote-tracking branch 'origin/master' into lighting Nicolas Margulies 2020-12-17 21:24:32 +01:00
• a3e059a97b Some required code mysteriously disappeared Yohann D'ANELLO 2020-12-15 17:37:23 +01:00
• 646e0063be Fixed grammar, unified the docstring's format and added documentation to some classes that did not have any. Closes #32. eichhornchen 2020-12-13 21:29:25 +01:00
• 3f62fbaa2b Merge branch 'erase-pads' into 'master' ynerant 2020-12-12 21:20:45 +01:00
• 599f75b676 Erase pad before resizing, fixes #45 Yohann D'ANELLO 2020-12-12 21:19:55 +01:00
• cd5b7086f2 Merge branch 'wait' into 'master' ynerant 2020-12-12 18:16:31 +01:00
• 7971a1f70e Add waiting key, fixes #16 Yohann D'ANELLO 2020-12-12 18:12:37 +01:00
• 5eefe1937a Merge branch 'pretty_boxes' into 'master' ynerant 2020-12-12 17:42:38 +01:00
• 288a6ac2c9 Some translations were missing concerning sunflowers, fixes #44 Yohann D'ANELLO 2020-12-12 17:39:12 +01:00
• 73e1fac89a Add title to boxes to have pretty boxes, fixes #28 Yohann D'ANELLO 2020-12-12 17:15:08 +01:00
• 158338637a Merge branch 'exploding_bomb' into 'master' ynerant 2020-12-12 16:53:26 +01:00
• 8608ce346f Add a small bomb exploding animation, fixes #31 Yohann D'ANELLO 2020-12-12 16:50:01 +01:00
• 1986630da1 Merge branch 'change_image_color' into 'master' ynerant 2020-12-12 13:53:04 +01:00
• 04ae56e451 Higher abstraction level on addmsg, fixes #43 Yohann D'ANELLO 2020-12-12 13:46:45 +01:00
• 48318a91fe Give more hazels to the player when testing the interaction with merchants Yohann D'ANELLO 2020-12-11 21:18:50 +01:00
• 777668848e Clicking on the main image changes its color Yohann D'ANELLO 2020-12-11 21:17:21 +01:00
• fb926f8c84 Always use predefined map in game unit tests Yohann D'ANELLO 2020-12-11 19:27:57 +01:00
• 1cf5e7bd8b First implementation of visibility, not tested, nor used for now Nicolas Margulies 2020-12-11 19:23:21 +01:00
• 209bde5b5c Fix sunflowers and merchants since the position of the player is no longer fixed Yohann D'ANELLO 2020-12-11 19:21:02 +01:00
• 895abe88ad Ensure that the neighboorhood is walkable in movement tests Yohann D'ANELLO 2020-12-11 19:14:25 +01:00
• 3d7667573e Add testing for the no_lone_walls option Charles Peyrat 2020-12-11 19:14:28 +01:00
• fe9dfdf242 Syntax change in randomwalk.Generator.__init__ Charles Peyrat 2020-12-11 19:13:15 +01:00
• deb52d7350 Adding a missing parenthesis Charles Peyrat 2020-12-11 19:05:26 +01:00
• e91deccb6f Merge branch 'master' into map_generation Yohann D'ANELLO 2020-12-11 19:02:45 +01:00
• 18ca083ba2 Added a connexity test Charles Peyrat 2020-12-11 18:59:07 +01:00
• 81de0d8eb0 Merge branch 'mouse_interaction' into 'master' ynerant 2020-12-11 18:47:20 +01:00
• a4a10e340d Test clicking on the merchant pad Yohann D'ANELLO 2020-12-11 18:44:05 +01:00
• 53d090a9c8 Merge branch 'master' into 'mouse_interaction' ynerant 2020-12-11 18:38:13 +01:00
• f453b82a58 Test clicking on the screen Yohann D'ANELLO 2020-12-11 18:33:47 +01:00
• 7667079aa3 Changed Map.large_neighbourhood so we can also request only immediate neighbours, ignoring diagonals Charles Peyrat 2020-12-11 18:33:16 +01:00
• 9d3e8a9822 Merge branch 'village' into 'master' eichhornchen 2020-12-11 18:23:10 +01:00
• d9912cacad Listen to mouse clicks in the main loop Yohann D'ANELLO 2020-12-11 18:17:59 +01:00