240 Commits

Author SHA1 Message Date
048e947763 tradesuccessful
All checks were successful
continuous-integration/drone/push Build is passing
2021-11-23 00:56:03 -07:00
3212017511 these features are stabilized now 2021-10-13 20:37:37 -06:00
8e87a8df3b Merge pull request 'append null to avoid message artifacts' (#9) from small_dialog into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #9
Reviewed-by: jake <jake@sharnoth.com>
2021-06-22 22:14:25 -04:00
faab6e8fd6 append null to avoid message artifacts
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-06-22 23:22:41 +00:00
90c990e632 Merge pull request 'Vec-ing is hard' (#6) from combo_targets into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #6
2021-06-21 18:36:07 -04:00
a2822b17ae Vec-ing is hard
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-06-20 21:04:07 +00:00
ad1dc584ab Merge pull request 'traps' (#5) from traps into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #5
Reviewed-by: jake <jake@sharnoth.com>
2021-06-20 11:35:16 -04:00
cd2af79091 why do i need to pull man
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-06-20 04:29:06 +00:00
43b37e985c rebase - trap trigger packet 2021-06-20 04:22:01 +00:00
69ddebdc45 Merge pull request 'pbs' (#2) from pbs into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #2
2021-06-20 00:16:24 -04:00
505ec2188d add to enum oops
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2021-06-20 04:12:34 +00:00
6e6c7c494f shop_sell (#4)
All checks were successful
continuous-integration/drone/push Build is passing
oops sold my 95h calibur

Reviewed-on: #4
Co-authored-by: andy <andynewjack@protonmail.com>
Co-committed-by: andy <andynewjack@protonmail.com>
2021-06-19 23:52:43 -04:00
3f0f4886cb shiny_mobs (#3)
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #3
Co-authored-by: andy <andynewjack@protonmail.com>
Co-committed-by: andy <andynewjack@protonmail.com>
2021-06-19 23:51:54 -04:00
e2c54986f7 rebasing still difficult in 2021
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-06-20 02:24:01 +00:00
2debc015b7 rebased
Some checks failed
continuous-integration/drone/push Build is failing
2021-06-20 01:00:38 +00:00
e959fc3094 pb structs 2021-06-20 00:57:46 +00:00
e698ad993c Merge pull request 'techs' (#1) from techs into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #1
2021-06-19 00:25:04 -04:00
65532db884 sloppy spacing
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-06-17 21:07:49 +00:00
dbfb396643 trap trigger packet
All checks were successful
continuous-integration/drone/push Build is passing
2021-05-30 05:41:53 +00:00
799a9e6880 pb structs
All checks were successful
continuous-integration/drone/push Build is passing
2021-05-24 20:48:25 +00:00
ef69b2064d make the compiler happy
All checks were successful
continuous-integration/drone/push Build is passing
2021-05-23 21:22:48 +00:00
77f657dbc0 dont forget to check this later 2021-05-23 20:55:22 +00:00
cb219d807d fix tech packet lengths. now everyone can get s/d yay 2021-05-23 20:54:35 +00:00
2c00b5999a telepipe owner 2021-05-23 19:16:43 +00:00
68080eff4b add telepipe struct 2021-05-23 19:10:31 +00:00
a58191833f random struct updates 2021-05-20 01:38:26 +00:00
e02e3dff29 update tech packet struct, and some random comments 2021-05-15 23:29:06 +00:00
a2ecb14d82 trade packets
All checks were successful
continuous-integration/drone/push Build is passing
2020-12-12 19:55:53 -07:00
40845b7bd8 Merge pull request 'tekking' (#42) from tekking into master 2020-11-30 15:51:34 -05:00
f71f463144 request ship/block list 2020-11-22 09:37:55 -07:00
ce5d37aff8 small left dialog 2020-11-18 18:48:22 -07:00
3a1337cd12 pub 2020-11-14 14:57:05 -04:00
fe1fa0ec65 tek packets 2020-11-11 15:52:16 -04:00
a6c1115850 Merge pull request 'item ids are u32' (#41) from sorting_items into master 2020-10-31 00:36:20 -04:00
andy
f3b80df769 item ids are u32 2020-10-31 01:26:41 -03:00
da85ce0baf handle case where no ships in list 2020-10-25 18:10:40 -06:00
ef8b80bfa8 helper function vec_to_array 2020-10-07 00:04:24 -06:00
6b1dfa4feb Merge pull request 'need packet to send packet' (#40) from save_options into master 2020-10-07 01:49:58 -04:00
29bae2f798 need packet to send packet 2020-10-02 22:19:01 -03:00
a89390f647 fullcharacter packet 2020-10-01 16:57:12 -06:00
7472e132bf shop actions 2020-09-27 18:12:41 -06:00
d0f1de9b0c length_is/length_of 2020-09-24 19:37:45 -06:00
cccb8b1439 PlayerSplitItemStack -> PlayerNoLongerHasItem 2020-07-29 08:09:23 -06:00
0ef5e6a1ba Merge pull request 'map_area' (#37) from map_area into master
Reviewed-by: jake <jake@sharnoth.com>
2020-07-28 00:40:02 -04:00
bdd9cdaa2f Merge pull request 'fix packet sizes' (#38) from sync_map_events into master
Reviewed-by: jake <jake@sharnoth.com>
2020-07-28 00:18:58 -04:00
0a524e7b18 fix packet sizes 2020-07-27 19:11:50 -03:00
f19eecb7d3 clean up comments 2020-07-25 22:28:34 -03:00
38d47f93f3 this isnt the map value 2020-07-25 22:24:03 -03:00
cb8c8ac600 rename area to map_area and change from u32 to u16 2020-07-25 15:16:37 -03:00
cdc4ee0bb2 bank packets 2020-07-19 14:22:29 -06:00