Commit Graph

Select branches

Hide Pull Requests

andy/add-patch-log-dir

andy/clamp-mag-feed

andy/directories

andy/map-objects

andy/update-rust

expsteal

fuckin_andy_making_me_do_this_now

kill_counters

map_objects

master

morfin/test

move_stuff_to_libpso

pbs

presents

sendgc

set_char_exp

teams

techs

traps

unitxt

#103

#104

#105

#107

#109

#112

#113

#116

#117

#118

#121

#122

#123

#124

#127

#128

#129

#130

#132

#134

#135

#139

#140

#141

#142

#143

#144

#34

#42

#43

#44

#45

#47

#49

#60

#64

#65

#80

#84

#86

#90

#91

Mono Color

• f499cc20dc Merge pull request 'join_room' (#107) from join_room into master jake 2020-04-21 20:57:57 -04:00
• 28b7d89b42 show dialog when trying to join room with a bursting player jake 2020-04-21 08:51:06 -06:00
• c208443d97 join rooms jake 2020-04-21 07:28:14 -06:00
• 1597722ed2 remove unneeded print jake 2020-04-21 07:25:49 -06:00
• 3d9e868183 add random seed to roomstate jake 2020-04-21 07:20:25 -06:00
• 58e8e52918 Merge pull request 'drop table works for sure now' (#104) from fix_droptable_forreal into master jake 2020-04-13 04:05:19 -04:00
• 6c84fb2f1e add drop table init test jake 2020-04-13 01:01:41 -07:00
• d59ec43f6e fix monster names jake 2020-04-13 01:01:25 -07:00
• f1841f6f7f properly load monster_dar.toml jake 2020-04-13 01:01:06 -07:00
• 07a1712f4d fix some item names jake 2020-04-13 01:00:19 -07:00
• 7b0f0e6b0f config corrections jake 2020-04-13 00:53:16 -07:00
• ebe93253a1 Merge pull request 'add droptable to roomstate' (#103) from fix_droptable_thing into master jake 2020-04-12 17:32:09 -04:00
• fd33fa751a problem: initializing the drop table blows up the stack no matter how large I make it solution: put it on the goddamn heap jake 2020-04-12 14:27:06 -07:00
• abd7cc26b6 update async+futures jake 2020-04-12 14:24:52 -07:00
• b92b118fc4 Merge pull request 'weapon_bytes' (#102) from weapon_bytes into master jake 2020-04-10 15:33:51 -04:00
• 332f22f34e weapon % fix v2 and give the level 199 guy a 100h hell gun Andy Newjack 2020-04-10 02:04:37 -03:00
• 895891fabc oops forgot to handle missing specials Andy Newjack 2020-04-08 20:02:06 -03:00
• a2dca1d5fe send all the weapon bytes Andy Newjack 2020-04-08 19:41:12 -03:00
• 806aab7d21 Merge pull request 'misc refactorings to make things easier' (#100) from refactor_some_things into master jake 2020-04-08 15:41:06 -04:00
• a6c8c959fc foreshadowing jake 2020-04-06 23:42:38 -07:00
• 9c643e2aae use ClientLocation refactor jake 2020-04-06 23:40:39 -07:00
• c846bca599 ClientLocation refactor jake 2020-04-05 22:56:48 -07:00
• 0cf0022bf9 StackedItem -> ItemInstance, add Meseta jake 2020-04-03 22:56:14 -07:00
• 1279fedfee MapVariantType -> MapArea jake 2020-04-03 22:51:55 -07:00
• c24161bfd4 Merge pull request 'mag feeding charts' (#99) from mag_feed into master jake 2020-04-01 00:18:23 -04:00
• 8d86cf3088 mag naming jake 2020-03-31 21:15:01 -07:00
• 7e7920d1f5 remove weird non-mags jake 2020-03-31 21:00:16 -07:00
• b21603c1d7 mag feeding charts jake 2020-03-31 20:47:49 -07:00
• ae9fdce663 apparently theres only 5 forest1s jake 2020-03-30 19:51:57 -07:00
• f0f125822f Merge pull request 'use New variants of entities for creation' (#98) from new_entities into master jake 2020-03-30 22:50:53 -04:00
• d9f88d55a2 use New variants of entities for creation jake 2020-03-30 19:28:49 -07:00
• eb2cefa868 Merge pull request 'changes to entities' (#97) from entity_renaming into master jake 2020-03-30 01:16:26 -04:00
• b39ee6c0f3 use Option for entity primary keys jake 2020-03-29 22:00:07 -07:00
• 6b1ef41bd0 UserAccount/UserSettings/GuildCardData -> *Entities jake 2020-03-29 16:11:14 -07:00
• 44c35f350d Item -> ItemEntity jake 2020-03-29 14:53:51 -07:00
• 0954d85e5a CharacterEntityId jake 2020-03-29 14:40:24 -07:00
• de8f44f269 andy what were you doing jake 2020-03-29 13:27:23 -07:00
• bf595f9693 Character -> CharacterEntity jake 2020-03-29 12:43:20 -07:00
• 2c74dad53d Merge pull request 'finish up item handling to get ready for drops' (#91) from active_item into master jake 2020-03-29 15:09:48 -04:00
• 620bcade7b itemdetail -> itemdroptype for drops jake 2020-03-29 11:54:58 -07:00
• a7434346db move equipped flag to itemlocation::inventory jake 2020-03-29 10:45:01 -07:00
• ed3048840e add box drop config files jake 2020-03-28 12:06:45 -07:00
• 0d42c0ede0 add box drops jake 2020-03-28 12:06:24 -07:00
• 89aab63f86 fix tool table config loading jake 2020-03-28 12:05:29 -07:00
• 979636a4c4 load map object files jake 2020-03-28 12:04:51 -07:00
• 2f2e9e5c5c add missing enemies jake 2020-03-28 12:03:08 -07:00
• b69d732343 rare drop config files jake 2020-03-28 12:02:24 -07:00
• 3e9cf6677f fix weapon names+extra spaces jake 2020-03-28 12:01:23 -07:00
• 3600197993 fix tool names jake 2020-03-28 11:59:27 -07:00
• 9cf2979777 fix case on unit names jake 2020-03-28 11:57:47 -07:00
• 193cf72cdb fix monster names in config files jake 2020-03-28 11:56:34 -07:00
• cfa31736c6 rare drops jake 2020-03-26 00:06:28 -07:00
• e41f79f41a tech drops jake 2020-03-22 00:13:31 -07:00
• 9a1feb8836 mags! jake 2020-03-21 21:46:52 -07:00
• 6a27d1b639 switch fomar/ramarl jake 2020-03-21 21:44:48 -07:00
• 359120de07 redo active item stuff jake 2020-03-21 17:47:28 -07:00
• a0e82c644c Merge pull request 'send_guildcard' (#94) from send_guildcard into master jake 2020-03-25 20:15:13 -04:00
• ee82f920b6 Merge pull request 'room_lists' (#88) from room_lists into master jake 2020-03-23 01:33:19 -04:00
• 648fdfc0ec rename function Andy Newjack 2020-03-21 13:41:01 -03:00
• 38b0cac09b get player counts for room lists Andy Newjack 2020-03-19 23:03:21 -03:00
• eef2178df8 cleanup and fix errors. still need to get room player counts andy 2020-03-18 21:46:13 -03:00
• 7f95f7e793 room list req/resp functions Andy Newjack 2020-03-18 01:36:46 -03:00
• f11ee7f53f wip. initial room list stuff Andy Newjack 2020-03-17 08:02:17 -03:00
• be1574afff HAHAHA WHAT AM I EVEN DOING RIGHT NOW jake 2020-03-22 22:18:55 -07:00
• 76b470cbb2 Revert "Revert "fix ci (#93)"" jake 2020-03-22 22:17:30 -07:00
• 19595121d4 Revert "fix ci (#93)" jake 2020-03-22 21:53:02 -07:00
• 85e67090c4 fix ci (#93) jake 2020-03-23 00:42:44 -04:00
• bc0ec04688 oops wrong file Andy Newjack 2020-03-22 22:45:08 -03:00
• 177b694870 initial guildcard send/recv Andy Newjack 2020-03-22 22:40:40 -03:00
• 2f158d8490 Merge pull request 'tech_table' (#89) from tech_table into master jake 2020-03-18 21:38:47 -04:00
• 51bfddb9e9 should probably include tech item file jake 2020-03-18 18:23:08 -07:00
• 5a6bc2c322 tech drop table config files jake 2020-03-18 18:21:57 -07:00
• afbd63ff6a tech table load config jake 2020-03-18 18:21:34 -07:00
• 2981b163c2 remove shield+unit midstruct jake 2020-03-16 21:48:26 -07:00
• e72caebbf8 remove armor midstruct jake 2020-03-16 20:57:19 -07:00
• 76829dd16d remove unused use statements jake 2020-03-16 20:43:20 -07:00
• 2e2f9c6c17 begin removing weird middleman item structs: weapons jake 2020-03-16 20:34:50 -07:00
• aa6e5bbafe BB Mags (#86) wilson 2020-03-16 23:06:11 -04:00
• 5e3834bc45 tool drop conf files jake 2020-03-16 18:47:52 -07:00
• dde3b1da1d tool drops (minus techs) jake 2020-03-16 18:47:30 -07:00
• e803c23ec3 Stackable Stuffs (#84) reason 2020-03-16 13:35:35 -04:00
• 8cddd1a1f1 only run 1 ci task at a time jake 2020-03-16 10:07:39 -07:00
• bdf9824662 add unit drops to drop table jake 2020-03-15 17:31:29 -07:00
• eea9511f4a config files for cool unique server features jake 2020-03-15 17:17:49 -07:00
• 4fb78048e5 cool unique server features jake 2020-03-15 17:17:29 -07:00
• 52e2b555b0 unit stat config file jake 2020-03-15 10:22:56 -07:00
• 15b1427951 shield stat config file jake 2020-03-15 10:19:35 -07:00
• 5b3a240aa1 add dfp/evp mods to generated armors/shields jake 2020-03-14 22:03:48 -07:00
• b0c6d10590 shield and unit item stats jake 2020-03-14 21:38:03 -07:00
• d33a74f9ac armor stats config file jake 2020-03-14 21:03:02 -07:00
• d0a84af1c3 load armor stats jake 2020-03-14 20:49:29 -07:00
• 0dbd588e3b mag item init jake 2020-03-14 20:26:12 -07:00
• 6e590d06f4 fill unittype enum jake 2020-03-14 20:00:32 -07:00
• ef479b2c09 shield drop config files jake 2020-03-14 18:20:23 -07:00
• 663eaf7f25 shield drop table jake 2020-03-14 18:19:41 -07:00
• 576a462364 armor drop rate config files jake 2020-03-14 17:38:59 -07:00
• 6370a11615 add armor drop table jake 2020-03-14 17:08:31 -07:00
• e2bc7a0de5 add use statements jake 2020-03-14 12:05:29 -07:00
• a1a468842c use derives for item enum to/from str functions jake 2020-03-14 11:25:06 -07:00
• 80a3999d1b Merge branch 'item_drops' of jake/elseware into master jake 2020-03-14 14:06:40 -04:00