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

• 60f04597d1 if any of these sends fail the program should panic so unwrap is fine jake 2021-06-18 02:11:19 -0600
• d66a90c4cf Merge pull request 'get elseware working with a newer version of rust' (#34) from latestrust into master jake 2021-06-17 14:48:43 -0400
• cbe2b9a79a get it working with latest rust #34 jake 2021-06-17 12:06:36 -0600
• 1b9594dbec rename jake 2021-06-17 12:06:01 -0600
• b79c2b3ae6 update async-std to 1.9.0 jake 2021-06-17 02:56:41 -0600
• 19fd3426b5 try this version instead v2 jake 2021-06-17 00:23:23 -0600
• 675d9719a9 try this version instead jake 2021-06-17 00:21:13 -0600
• a3176380d9 didn't need to set that one jake 2021-06-16 23:14:38 -0600
• f38c791794 set serde version jake 2021-06-16 21:40:20 -0600
• de42ac4f9f disambiguate? jake 2021-06-16 20:09:34 -0600
• 45f0cc35dd clean this up a bit jake 2021-06-16 20:09:19 -0600
• b812e41168 this feature made its way in jake 2021-06-16 02:17:18 -0600
• a3f2cd8586 specify nightly version jake 2021-06-16 02:16:52 -0600
• f9be2596cf missed this const fix jake 2021-06-15 20:43:07 -0600
• 8cece2431f this isn't a valid thing anymore jake 2021-06-14 18:46:02 -0600
• 84fc27ceea map objects 1 map_objects andy 2021-06-07 16:42:55 +0000
• 1adf933060 some trap stuff traps andy 2021-05-30 15:59:18 +0000
• b0bc913f7f pb testing items pbs andy 2021-05-26 01:30:01 +0000
• 513ee408f7 more tech testing qol changes techs andy 2021-05-20 01:39:43 +0000
• 77068a79cf change char class for tech testing andy 2021-05-16 19:46:21 +0000
• 6cedc893c1 todo error? andy 2021-05-13 02:15:17 +0000
• 79a7caf126 fix asserts in bank tests andy 2021-05-11 01:50:36 +0000
• a038ac8c81 tell neighbours we are banking andy 2021-05-11 00:44:01 +0000
• c8b9564009 random formatting and ordering changes presents andy 2021-01-23 23:39:04 +0000
• b6cc50360a TOOD -> TODO andy 2021-01-23 04:58:20 +0000
• a238ae3846 add remaining modifiers for item types and fix presents? andy 2021-01-23 04:56:24 +0000
• b29bb473d5 more tests for unwrapping equips andy 2020-12-19 21:51:19 +0000
• 9e8e10d434 finally added a present test. rename item_actions to menu_actions andy 2020-12-18 05:02:45 +0000
• e774b9c950 oops forgot mags andy 2020-12-13 20:12:31 +0000
• fc84db5393 put armors in presents. apply modifiers for armors, shields, units, mags. remove prints andy 2020-12-13 18:46:28 +0000
• ba0b827c24 modifiers are for the boys andy 2020-12-12 15:47:30 +0000
• 637e182224 andy stop touching things pls andy 2020-12-07 02:12:49 +0000
• 98b2ebfdd8 wrap everything except armours andy 2020-12-07 02:12:24 +0000
• 7e9b989078 holy shit unwrapping presents finally works for weapons andy 2020-12-06 04:19:26 +0000
• c9160f177d fix tests andy 2020-12-04 02:47:02 +0000
• a77b9874ff initial present stuff andy 2020-12-04 02:35:30 +0000
• fe0f7ba41e initial wrapping stuff andy 2020-12-03 01:57:44 +0000
• 03aa41ef6a Merge pull request 'tekking!' (#271) from andy_is_unable_to_tek_properly into master jake 2020-12-03 17:34:43 -0500
• f4fae162f0 tekking! jake 2020-12-03 15:04:48 -0700
• b45a0ba1d5 clean up directmsg handler jake 2020-12-03 15:03:58 -0700
• b6ce6296d4 create_item takes generic item rather than floor item jake 2020-12-03 15:01:41 -0700
• d263bf4caa remove item from inventory by id jake 2020-12-03 15:01:00 -0700
• 5345939b1b IndividualInventoryItem::weapon jake 2020-12-03 15:00:38 -0700
• 5bdac4f6de postgres add_weapon_modifier jake 2020-12-03 14:58:17 -0700
• 6410042e48 fix grind modification jake 2020-12-03 14:57:17 -0700
• fb53ccd03a percents -> percent jake 2020-12-03 14:57:00 -0700
• c437c3da5b split this into individual/individual_mut jake 2020-12-02 22:51:36 -0700
• 3b2a7ec73d tekking also affects grind jake 2020-12-02 19:25:07 -0700
• e4cdd2b95a weapons can have tek modifiers jake 2020-12-02 19:20:33 -0700
• d9f52a73e4 thanksandy jake 2020-12-02 19:01:53 -0700
• 92c34b2d28 remove modifiers from weapon and armor jake 2020-12-01 23:17:07 -0700
• fb6eaeffd2 remove change_item jake 2020-12-01 22:56:22 -0700
• c22b23ef03 Merge pull request 'interserver stuff and ship/block transfering' (#268) from one_day_i'll_have_useful_branch_names_again into master jake 2020-11-26 01:28:04 -0500
• 11fecd5bda fix tests that care about rooms jake 2020-11-25 22:09:00 -0700
• ae696888e9 remove player from lobby before sending to another ship/block jake 2020-11-25 22:08:41 -0700
• fe03515871 basic multiple login check jake 2020-11-25 22:05:55 -0700
• f96ae557fd how did this ever work? jake 2020-11-25 22:02:16 -0700
• 78ed2101e5 I forgot blocks are a thing jake 2020-11-24 23:17:42 -0700
• 6f5aa5119f login requests users from ship jake 2020-11-21 23:53:01 -0700
• 5ca852260f only 1 block actually exists jake 2020-11-21 23:50:10 -0700
• 26be2757c9 add use jake 2020-11-21 23:48:02 -0700
• ffce662c95 transfer ship jake 2020-11-21 23:45:27 -0700
• ae7ba9e3fe start on misc interserver things like player counts and ship lists jake 2020-11-18 18:56:04 -0700
• 6686aee824 fix dumb thing jake 2020-11-17 19:02:56 -0700
• a3db5b65e2 add ability for servers to manually send messages to eachother jake 2020-11-17 18:25:01 -0700
• 75260c40a0 improve error handling in new character jake 2020-11-16 23:05:28 -0700
• cf7be2e5d0 Merge pull request 'fix mags and picking up invalid items' (#260) from misc_stuff into master jake 2020-11-17 00:27:44 -0500
• 4b78a110f0 anyhow the rest of the itemmanager jake 2020-11-16 21:55:24 -0700
• 463d623f16 fix tests jake 2020-11-16 21:27:14 -0700
• a3cc29b68f use anyhow for itemmanager jake 2020-11-16 21:27:03 -0700
• f7c6be48b2 don't try and say an item was picked up that the client doesn't know about jake 2020-11-13 19:04:09 -0700
• 9c91df6d2e fix mags jake 2020-11-12 23:47:21 -0700
• a25d400624 Merge pull request 'techs' (#264) from techs into master jake 2020-11-16 23:48:18 -0500
• 9b05e60ca6 add todo for cheating andy 2020-11-16 21:02:11 -0400
• 55c393b7a8 move the tech level adjustment to prevent underflow for new FOs. let characters use tech disks andy 2020-11-16 20:46:52 -0400
• 99f5f4eb5f Merge pull request 'professional rusting' (#257) from weapon_shop_ordering into master jake 2020-11-15 11:47:02 -0500
• 71ca309ab4 Merge pull request 'mag a e s t h e t i c s' (#252) from mag_colours into master jake 2020-11-15 11:43:18 -0500
• 30393edf20 Merge pull request 'save options to db' (#256) from save_options_pg into master jake 2020-11-15 11:42:47 -0500
• 73f0108d68 save options to db andy 2020-11-14 21:22:44 -0400
• 6611f2b3a8 professional rusting andy 2020-11-14 19:50:21 -0400
• fe1a85caec mag a e s t h e t i c s andy 2020-11-14 15:30:37 -0400
• 82c4c2a445 Merge pull request 'get_the_web_ui_working' (#251) from get_the_web_ui_working into master jake 2020-11-12 22:16:33 -0500
• c384b13453 actually save new character stuff jake 2020-11-12 19:05:46 -0700
• b34deba17f update sqlx jake 2020-11-12 19:05:30 -0700
• 4954dcb789 should probably split this since theres already live data jake 2020-11-12 17:13:42 -0700
• ceb632aec8 make equippedentity serializeable jake 2020-11-11 19:26:12 -0700
• c7a310391f make inv mod pub jake 2020-11-09 19:07:41 -0700
• 2d5f83fab6 make inv item stuff serializable jake 2020-11-09 18:54:44 -0700
• 9de04ad87b Merge pull request 'item_refactor' (#250) from item_refactor into master jake 2020-11-09 19:59:06 -0500
• 8fae8d11af fix equipping bought weapon jake 2020-11-09 16:47:35 -0700
• 6e2fab31f0 e q u i p r e f a c t o r jake 2020-11-09 16:35:47 -0700
• 10458baea0 shrink some structures, remove async from functions that didn't need it jake 2020-11-09 16:04:42 -0700
• 8ebbbb272a update some deps, remove unused ones jake 2020-11-09 15:00:48 -0700
• 7ae8976c10 i t e m r e f a c t o r jake 2020-11-05 16:36:39 -0700
• 898cb9064d Merge pull request 'misc shit' (#246) from cleaning_up into master jake 2020-11-02 14:36:37 -0500
• 87fa74ac1a Merge pull request 'bank_meseta' (#247) from bank_meseta into master jake 2020-11-02 02:04:26 -0500
• 3dd25c3222 merge conflict jake 2020-11-02 00:03:22 -0700
• 7157074419 remove comments andy 2020-11-01 23:27:47 -0400
• e1360e4958 bank doesn't spawn infinite money! andy 2020-11-01 23:14:38 -0400
• 73c24a5d20 cleanup jake 2020-11-01 18:05:09 -0700